Merge pull request #507 from bartlettroscoe/change-to-https-submit

Change from 'http' to 'https' for CDash submissions
TriBITSPub · Aug 6, 2022 · 813a644 · 813a644
2 parents 1f2024f + 2cc4506
commit 813a644
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
@@ -11,7 +11,7 @@ set(CTEST_NIGHTLY_START_TIME "04:00:00 UTC")  # Midnight EST
 # 00:00:00 EST.
 
 if (NOT DEFINED CTEST_DROP_METHOD)
-  set_default_and_from_env(CTEST_DROP_METHOD "http")
+  set_default_and_from_env(CTEST_DROP_METHOD "https")
 endif()
 
 if (CTEST_DROP_METHOD STREQUAL "http" OR CTEST_DROP_METHOD STREQUAL "https")

diff --git a/test/ctest_driver/TribitsExampleProject/CMakeLists.txt b/test/ctest_driver/TribitsExampleProject/CMakeLists.txt
@@ -1340,6 +1340,7 @@ function(generate_aao_tests)
         CTEST_PARALLEL_LEVEL=3
         CTEST_DO_SUBMIT=OFF  # Never submit this (see below note)
         CTEST_SITE="My Site"
+	CTEST_DROP_METHOD="http"
         CTEST_DROP_SITE="cdash.site.com"
         CTEST_PROJECT_NAME="CustomTribitsExProj"
         CTEST_DROP_LOCATION="/cdash/submit.php?project=CustomTribitsExProj"

diff --git a/tribits/examples/TribitsExampleMetaProject/CTestConfig.cmake b/tribits/examples/TribitsExampleMetaProject/CTestConfig.cmake
@@ -3,10 +3,10 @@ include(SetDefaultAndFromEnv)
 set(CTEST_NIGHTLY_START_TIME "04:00:00 UTC") # 10 PM MDT or 9 PM MST
 
 if (NOT DEFINED CTEST_DROP_METHOD)
-  set_default_and_from_env(CTEST_DROP_METHOD "http")
+  set_default_and_from_env(CTEST_DROP_METHOD "https")
 endif()
 
-if (CTEST_DROP_METHOD STREQUAL "http")
+if (CTEST_DROP_METHOD STREQUAL "http" OR CTEST_DROP_METHOD STREQUAL "https")
   set_default_and_from_env(CTEST_DROP_SITE "testing.sandia.gov/cdash")
   set_default_and_from_env(CTEST_PROJECT_NAME "TribitsExampleMetaProject")
   set_default_and_from_env(CTEST_DROP_LOCATION "/submit.php?project=TribitsExampleMetaProject")

diff --git a/tribits/examples/TribitsExampleProject/CTestConfig.cmake b/tribits/examples/TribitsExampleProject/CTestConfig.cmake
@@ -3,10 +3,10 @@ include(SetDefaultAndFromEnv)
 set(CTEST_NIGHTLY_START_TIME "04:00:00 UTC") # 10 PM MDT or 9 PM MST
 
 if (NOT DEFINED CTEST_DROP_METHOD)
-  set_default_and_from_env(CTEST_DROP_METHOD "http")
+  set_default_and_from_env(CTEST_DROP_METHOD "https")
 endif()
 
-if (CTEST_DROP_METHOD STREQUAL "http")
+if (CTEST_DROP_METHOD STREQUAL "http" OR CTEST_DROP_METHOD STREQUAL "https")
   set_default_and_from_env(CTEST_DROP_SITE "my.cdash.org")
   set_default_and_from_env(CTEST_PROJECT_NAME "TribitsExampleProject")
   set_default_and_from_env(CTEST_DROP_LOCATION "/submit.php?project=TribitsExampleProject")