diff --git a/cdash/CTestConfig.cmake b/cdash/CTestConfig.cmake index bba10b83e..602b33319 100644 --- a/cdash/CTestConfig.cmake +++ b/cdash/CTestConfig.cmake @@ -1,5 +1,5 @@ set(CTEST_PROJECT_NAME "SCOREC") -set(CTEST_NIGHTLY_START_TIME "17:00:00 EST") +set(CTEST_NIGHTLY_START_TIME "3:00:00 EDT") set(CTEST_DROP_METHOD "http") set(CTEST_DROP_SITE "my.cdash.org") diff --git a/cdash/Project.xml b/cdash/Project.xml index b734e4b34..459814986 100644 --- a/cdash/Project.xml +++ b/cdash/Project.xml @@ -1,12 +1,11 @@ - - - - - - - - - - + + + + + + + + + diff --git a/cdash/nightly.cmake b/cdash/nightly.cmake index a69a7e3d7..3664d5eef 100644 --- a/cdash/nightly.cmake +++ b/cdash/nightly.cmake @@ -4,15 +4,15 @@ SET(CTEST_DO_SUBMIT ON) SET(CTEST_TEST_TYPE Nightly) set(CTEST_BUILD_CONFIGURATION RelWithDebInfo) -set(CTEST_NIGHTLY_START_TIME "17:00:00 EST") -set(CTEST_SITE "checkers.scorec.rpi.edu" ) +set(CTEST_NIGHTLY_START_TIME "3:00:00 EDT") +set(CTEST_SITE "asics.scorec.rpi.edu" ) set(CTEST_DROP_METHOD "http") set(CTEST_DROP_SITE "my.cdash.org") set(CTEST_DROP_LOCATION "/submit.php?project=SCOREC") set(CTEST_DROP_SITE_CDASH TRUE) set(CTEST_BUILD_NAME "linux-gcc-${CTEST_BUILD_CONFIGURATION}") -set(CTEST_DASHBOARD_ROOT "/lore/smithc11/nightlyBuilds/" ) +set(CTEST_DASHBOARD_ROOT "/users/d_zxg06726/nightlyBuilds/core_build" ) set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_BUILD_FLAGS -j4) @@ -20,13 +20,13 @@ set(CTEST_PROJECT_NAME "SCOREC") set(CTEST_SOURCE_NAME src) set(CTEST_BINARY_NAME build) -set(REPO_URL_BASE "git@github.com:SCOREC/core") +set(REPO_URL_BASE "https://github.com/SCOREC/core") set(BRANCHES "master;develop") set(MERGE_AUTHOR "Nightly Bot ") set(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}") set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}") -set(MESH_URL_BASE "git@github.com:SCOREC/pumi-meshes") +set(MESH_URL_BASE "https://github.com/SCOREC/pumi-meshes") set(MESHES "${CTEST_SOURCE_DIRECTORY}/${CTEST_PROJECT_NAME}/") set(CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION} "tmpnam") @@ -252,7 +252,7 @@ function(start_merge FIRST_BRANCH SECOND_BRANCH NEXT_ACTION) set(${NEXT_ACTION} ABORT PARENT_SCOPE) return() endif() - if("${MERGE_OUTPUT}" MATCHES "Already up-to-date") + if("${MERGE_OUTPUT}" MATCHES "Already up to date") message("${FIRST_BRANCH} up-to-date with ${SECOND_BRANCH}, stopping merge") set(${NEXT_ACTION} CLEANUP PARENT_SCOPE) return() diff --git a/cdash/nightly.sh b/cdash/nightly.sh index c25f79107..63b9ad737 100755 --- a/cdash/nightly.sh +++ b/cdash/nightly.sh @@ -1,6 +1,11 @@ #!/bin/bash -x +( +#cdash output root +d=/users/d_zxg06726/nightlyBuilds/core_build +exec > $d/nightly_log.txt 2>&1 + source /etc/profile -source /users/smithc11/.bash_profile +# source /users/d_zxg06726/.bash_profile #setup lmod export PATH=/usr/share/lmod/lmod/libexec:$PATH @@ -16,8 +21,6 @@ module load zoltan/3.83-hap4ggo module load cmake/3.26.3-2duxfcd module load cgns/develop-cc4dfwp -#cdash output root -d=/lore/smithc11/nightlyBuilds/ cd $d #remove compilation directories created by previous nightly.cmake runs [ -d build ] && rm -rf build/ @@ -28,6 +31,7 @@ ctest -V --script $d/nightly.cmake touch $d/doneCoreNightly #create doxygen docs -cd build/master -make doc -cp -r doc/html /net/web/scorec/scorec-web/htdocs/pumi/doxygen +#cd build/master +#make doc +#cp -r doc/html /net/web/scorec/scorec-web/htdocs/pumi/doxygen +)