Merge pull request #3305 from bartlettroscoe/3285-submit-only-to-test…

…ing-vm Submit only to testing-vm.sandia.gov/cdash/ (#3285)
trilinos · Aug 16, 2018 · ac885f4 · ac885f4
2 parents 3f5beee + e852a1b
commit ac885f4
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 28 deletions.
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
@@ -10,14 +10,9 @@ IF (NOT DEFINED CTEST_DROP_METHOD)
 ENDIF()
 
 IF (CTEST_DROP_METHOD STREQUAL "http" OR CTEST_DROP_METHOD STREQUAL "https")
-  SET_DEFAULT_AND_FROM_ENV(CTEST_DROP_SITE "testing.sandia.gov")
+  SET_DEFAULT_AND_FROM_ENV(CTEST_DROP_SITE "testing-vm.sandia.gov")
   SET_DEFAULT_AND_FROM_ENV(CTEST_PROJECT_NAME "Trilinos")
   SET_DEFAULT_AND_FROM_ENV(CTEST_DROP_LOCATION "/cdash/submit.php?project=Trilinos")
   SET_DEFAULT_AND_FROM_ENV(CTEST_TRIGGER_SITE "")
   SET_DEFAULT_AND_FROM_ENV(CTEST_DROP_SITE_CDASH TRUE)
-  # Temp secondary submit to experimental CDash site (see #1746)
-  SET_DEFAULT_AND_FROM_ENV(TRIBITS_2ND_CTEST_DROP_SITE
-    "testing-vm.sandia.gov")
-  SET_DEFAULT_AND_FROM_ENV(TRIBITS_2ND_CTEST_DROP_LOCATION
-    "/cdash/submit.php?project=Trilinos")
 ENDIF()
diff --git a/cmake/ctest/TrilinosCTestDriverCore.cmake b/cmake/ctest/TrilinosCTestDriverCore.cmake
@@ -15,7 +15,7 @@ SET(Trilinos_REPOSITORY_LOCATION_DEFAULT
 SET(Trilinos_REPOSITORY_LOCATION_NIGHTLY_DEFAULT
   "software.sandia.gov:/space/git/nightly/Trilinos")
 SET(CTEST_DROP_SITE_COVERAGE_DEFAULT
-  "testing.sandia.gov")
+  "testing-vm.sandia.gov")
 SET(CTEST_DROP_LOCATION_COVERAGE_DEFAULT
   "/extended/cdash/submit.php?project=Trilinos")
 

diff --git a/cmake/ctest/drivers/CTestConfig.cmake b/cmake/ctest/drivers/CTestConfig.cmake
@@ -57,6 +57,6 @@ set(CTEST_PROJECT_NAME "TrilinosDriver")
 set(CTEST_NIGHTLY_START_TIME "06:01:00 UTC")
 
 set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "testing.sandia.gov")
+set(CTEST_DROP_SITE "testing-vm.sandia.gov")
 set(CTEST_DROP_LOCATION "/cdash/submit.php?project=TrilinosDriver")
 set(CTEST_DROP_SITE_CDASH TRUE)
diff --git a/cmake/ctest/drivers/continuous/ctest_linux_continuous_generic.cmake b/cmake/ctest/drivers/continuous/ctest_linux_continuous_generic.cmake
@@ -77,11 +77,6 @@ SET(BUILD_DIR_NAME CONTINUOUS_${COMM_TYPE}_${BUILD_TYPE}_${COMPILER_DIR}_${COMM_
 SET( CTEST_BUILD_FLAGS "-j16 -i" )
 SET( CTEST_PARALLEL_LEVEL "16" )
 
-SET(TRIBITS_2ND_CTEST_DROP_SITE
-  "testing.sandia.gov" )
-SET(TRIBITS_2ND_CTEST_DROP_LOCATION
-  "/extended/cdash/submit.php?project=Trilinos" )
-
 SET(Trilinos_ENABLE_SECONDARY_TESTED_CODE OFF)
 
 SET(Trilinos_BRANCH develop)

diff --git a/cmake/ctest/drivers/dorksaber/drakify-email.pl b/cmake/ctest/drivers/dorksaber/drakify-email.pl
@@ -327,7 +327,7 @@ sub extractLeadingNumber
   <body>
 
 Go to the <a
-href="http://testing.sandia.gov/cdash/index.php?project=Trilinos&subproject=MueLu&filtercount=1&showfilters=1&field1=site&compare1=63&value1=$cdashMachine&date=$cdashDate">full report</a>
+href="http://testing-vm.sandia.gov/cdash/index.php?project=Trilinos&subproject=MueLu&filtercount=1&showfilters=1&field1=site&compare1=63&value1=$cdashMachine&date=$cdashDate">full report</a>
 <br>
 
 

diff --git a/cmake/ctest/drivers/pu241/SubmitToTrilinos.cmake b/cmake/ctest/drivers/pu241/SubmitToTrilinos.cmake
@@ -1,7 +1,7 @@
 # Sumbit to Trilinos CDash server on casl-dev until can
 # address VRI Kanban story #2404
 #SET_DEFAULT(CTEST_DROP_SITE "casl-dev.ornl.gov")
-SET_DEFAULT(CTEST_DROP_SITE "testing.sandia.gov")
+SET_DEFAULT(CTEST_DROP_SITE "testing-vm.sandia.gov")
 SET_DEFAULT(CTEST_DROP_LOCATION "/cdash/submit.php?project=Trilinos")
 
 # Must overridde the Trilinos defaults to send to /extended/cdash

diff --git a/cmake/ctest/drivers/sadl30906/ctest_linux_continuous_mpi_opt_shared_sadl30906_jenkins.cmake b/cmake/ctest/drivers/sadl30906/ctest_linux_continuous_mpi_opt_shared_sadl30906_jenkins.cmake
@@ -69,11 +69,6 @@ SET(BUILD_DIR_NAME CONTINUOUS_${COMM_TYPE}_OPT_DEV_SHARED)
 SET( CTEST_BUILD_FLAGS "-j10 -i" )
 SET( CTEST_PARALLEL_LEVEL "10" )
 
-SET(TRIBITS_2ND_CTEST_DROP_SITE
-  "testing.sandia.gov" )
-SET(TRIBITS_2ND_CTEST_DROP_LOCATION
-  "/extended/cdash/submit.php?project=Trilinos" )
-
 SET(Trilinos_ENABLE_SECONDARY_TESTED_CODE OFF)
 
 SET(Trilinos_BRANCH develop)

diff --git a/cmake/ctest/drivers/sems_ci/ctest_linux_mpi_debug_shared_pt_ci_aao.sems.cmake b/cmake/ctest/drivers/sems_ci/ctest_linux_mpi_debug_shared_pt_ci_aao.sems.cmake
@@ -53,12 +53,6 @@
 # ************************************************************************
 # @HEADER
 
-#
-# This is a CI build that uses the new CMake/CTest/CDash all-at-once features
-# to submit to the Experimental track on the new testing-vm.sandia.gov/CDash/
-# site and also, at the same time, does a sumbit to the old
-# testing.sandia.gov/CDash/ site (where it is not displayed in an optional
-# way).
 #
 # NOTE: This requires an updated version of CMake/CTest to run or it will
 # crash!.

diff --git a/cmake/ctest/drivers/trappist/drakify-email.pl b/cmake/ctest/drivers/trappist/drakify-email.pl
@@ -327,7 +327,7 @@ sub extractLeadingNumber
   <body>
 
 Go to the <a
-href="http://testing.sandia.gov/cdash/index.php?project=Trilinos&subproject=MueLu&filtercount=1&showfilters=1&field1=site&compare1=63&value1=$cdashMachine&date=$cdashDate">full report</a>
+href="http://testing-vm.sandia.gov/cdash/index.php?project=Trilinos&subproject=MueLu&filtercount=1&showfilters=1&field1=site&compare1=63&value1=$cdashMachine&date=$cdashDate">full report</a>
 <br>
 
 

diff --git a/cmake/ctest/drivers/windows/README.md b/cmake/ctest/drivers/windows/README.md
@@ -69,7 +69,7 @@ C:\path\to\DebugPackageDir
    - trilinos-setup-12.3.zip   (Resulting ZIP package)
 ```
 
-[8]: https://testing.sandia.gov/cdash
+[8]: https://testing-vm.sandia.gov/cdash
 
 
 # Script File Summary
-Original file line number
+Diff line change
@@ Expand Up / @@ -327,7 +327,7 @@ sub extractLeadingNumber @@
       <body>
     Go to the <a
-    href="http://testing.sandia.gov/cdash/index.php?project=Trilinos&subproject=MueLu&filtercount=1&showfilters=1&field1=site&compare1=63&value1=$cdashMachine&date=$cdashDate">full report</a>
+    href="http://testing-vm.sandia.gov/cdash/index.php?project=Trilinos&subproject=MueLu&filtercount=1&showfilters=1&field1=site&compare1=63&value1=$cdashMachine&date=$cdashDate">full report</a>
     <br>
@@ Expand Down @@