Merge pull request #260 from chuckatkins/cdash-labeling

CDash labeling

scripts/circle/circle_el7-gcc48.cmake

@@ -7,6 +7,7 @@ set(CTEST_TEST_ARGS PARALLEL_LEVEL 4)
 
 set(dashboard_model Experimental)
 set(dashboard_binary_name "build_$ENV{CIRCLE_JOB}")
+set(dashboard_track "Continuous Integration")
 
 set(CTEST_GIT_COMMAND "/usr/bin/git")
 set(CTEST_UPDATE_VERSION_ONLY TRUE)

scripts/circle/circle_el7-gcc7-openmpi.cmake

@@ -7,6 +7,7 @@ set(CTEST_TEST_ARGS PARALLEL_LEVEL 4)
 
 set(dashboard_model Experimental)
 set(dashboard_binary_name "build_$ENV{CIRCLE_JOB}")
+set(dashboard_track "Continuous Integration")
 
 set(CTEST_GIT_COMMAND "/usr/bin/git")
 set(CTEST_UPDATE_VERSION_ONLY TRUE)

scripts/circle/runOnCircle.sh

@@ -4,14 +4,14 @@ API_BASE="https://api.github.com/repos/ornladios/adios2"
 USER=${STATUS_ROBOT_NAME}
 TOKEN=${STATUS_ROBOT_KEY}
 COMMIT=${CIRCLE_SHA1}
-CDASH_STATUS_CONTEXT="cdash-results-link"
+CDASH_STATUS_CONTEXT="cdash"
 
 build_status_body() {
   cat <<EOF
 {
   "state": "success",
   "target_url": "https://open.cdash.org/index.php?compare1=61&filtercount=1&field1=revision&project=ADIOS&showfilters=0&limit=100&value1=${COMMIT}&showfeed=0",
-  "description": "Build and test results can also be viewed on CDash",
+  "description": "Build and test results available on CDash",
   "context": "${CDASH_STATUS_CONTEXT}"
 }
 EOF

scripts/dashboard/common.cmake

@@ -31,6 +31,7 @@
 #   dashboard_source_name = Name of source directory (CMake)
 #   dashboard_binary_name = Name of binary directory (CMake-build)
 #   dashboard_cache       = Initial CMakeCache.txt file content
+#   dashboard_track       = The name of the CDash "Track" to submit to
 
 #   dashboard_do_checkout  = True to enable source checkout via git
 #   dashboard_do_update    = True to enable the Update step
@@ -130,6 +131,7 @@ if(NOT "${dashboard_model}" MATCHES "^(Nightly|Experimental)$")
   message(FATAL_ERROR "dashboard_model must be Nightly or Experimental")
 endif()
 
+
 # Default to a Debug build.
 if(NOT DEFINED CTEST_BUILD_CONFIGURATION)
   set(CTEST_BUILD_CONFIGURATION Debug)
@@ -359,18 +361,21 @@ if(dashboard_fresh)
 endif()
 
 # Start a new submission.
+if(dashboard_track)
+  set(dashboard_track_arg TRACK "${dashboard_track}")
+endif()
 message("Calling ctest_start")
 if(dashboard_fresh)
   if(COMMAND dashboard_hook_start)
     dashboard_hook_start()
   endif()
-  ctest_start(${dashboard_model})
+  ctest_start(${dashboard_model} ${dashboard_track_arg})
   ctest_submit(PARTS Start)
   if(COMMAND dashboard_hook_started)
     dashboard_hook_started()
   endif()
 else()
-  ctest_start(${dashboard_model} APPEND)
+  ctest_start(${dashboard_model} ${dashboard_track_arg} APPEND)
 endif()
 
 # Look for updates.