Skip to content

Commit

Permalink
Change from 'http' to 'https' for CDash submissions
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bartlettroscoe committed Aug 6, 2022
1 parent 1f2024f commit 2cc4506
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CTestConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 1 addition & 0 deletions test/ctest_driver/TribitsExampleProject/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions tribits/examples/TribitsExampleMetaProject/CTestConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions tribits/examples/TribitsExampleProject/CTestConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 2cc4506

Please sign in to comment.