From 2cc4506029a89bb64a57ab7b56515813b21c06d0 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Fri, 5 Aug 2022 19:04:22 -0600 Subject: [PATCH] Change from 'http' to 'https' for CDash submissions After a recent change to the testing-dev.sandia.gov/cdash/ site, you now need to submit with 'https' instead of 'http'. This works for the site testing.sandia.gov/cdash/ as well. I also tested by configuring and building with: -DTriBITS_CTEST_DRIVER_SUBMIT_TO=TESTING_SANDIA_CDASH which submitted to: https://testing.sandia.gov/cdash/index.php?project=TribitsExProj&date=2022-08-05&showfilters=1 and also: https://testing-dev.sandia.gov/cdash/index.php?project=TribitsExProj&date=2022-08-05&showfilters=1 due to: -- ENV_TRIBITS_2ND_CTEST_DROP_SITE='testing-dev.sandia.gov' -- TRIBITS_2ND_CTEST_DROP_SITE='testing-dev.sandia.gov' NOTE: I need to namespace these variables by the project name so as to avoid this type of cross-talk in the future. --- CTestConfig.cmake | 2 +- test/ctest_driver/TribitsExampleProject/CMakeLists.txt | 1 + tribits/examples/TribitsExampleMetaProject/CTestConfig.cmake | 4 ++-- tribits/examples/TribitsExampleProject/CTestConfig.cmake | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CTestConfig.cmake b/CTestConfig.cmake index 7cc6dc1d3..b797c2606 100644 --- 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 index 81b36aba7..ae968c422 100644 --- 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 index d1e3204b4..ae6051e44 100644 --- 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 index 95707466e..d2c46b37e 100644 --- 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")