Replaced envinf1 with eve.

Jenkinsfile

@@ -16,8 +16,8 @@ pipeline {
     booleanParam(name: 'docker_conan', defaultValue: true)
     booleanParam(name: 'docker_conan_debug', defaultValue: true)
     booleanParam(name: 'docker_conan_gui', defaultValue: true)
-    booleanParam(name: 'frontend1_serial', defaultValue: true)
-    booleanParam(name: 'frontend1_parallel', defaultValue: true)
+    booleanParam(name: 'eve_serial', defaultValue: true)
+    booleanParam(name: 'eve_parallel', defaultValue: true)
     booleanParam(name: 'win', defaultValue: true)
     booleanParam(name: 'mac', defaultValue: true)
     booleanParam(name: 'clang_analyzer', defaultValue: true)
@@ -262,7 +262,7 @@ pipeline {
         stage('Frontend2 (serial)') {
           when {
             beforeAgent true
-            expression { return params.frontend1_serial && (stage_required.build || stage_required.full) }
+            expression { return params.eve_serial && (stage_required.build || stage_required.full) }
           }
           agent { label "frontend2"}
           environment {
@@ -304,7 +304,7 @@ pipeline {
         stage('Frontend2 (parallel)') {
           when {
             beforeAgent true
-            expression { return params.frontend1_parallel && (stage_required.build || stage_required.full) }
+            expression { return params.eve_parallel && (stage_required.build || stage_required.full) }
           }
           agent { label "frontend2"}
           environment {
@@ -594,13 +594,13 @@ pipeline {
             }
           }
         }
-        // *********************** Deploy envinf1 ******************************
-        stage('Deploy envinf1') {
+        // ************************* Deploy eve ********************************
+        stage('Deploy eve') {
           when {
             beforeAgent true
             expression { return stage_required.build || stage_required.full }
           }
-          agent { label "envinf1"}
+          agent { label "frontend2"}
           steps {
             script {
               sh 'rm -rf /global/apps/ogs/head/standard'
@@ -611,10 +611,10 @@ pipeline {
                   '-DCMAKE_INSTALL_PREFIX=/global/apps/ogs/head/standard ' +
                   '-DOGS_MODULEFILE=/global/apps/modulefiles/ogs/head/standard ' +
                   '-DOGS_CPU_ARCHITECTURE=core-avx-i '
-                env = 'envinf1/cli.sh'
+                env = 'eve/cli.sh'
               }
               build {
-                env = 'envinf1/cli.sh'
+                env = 'eve/cli.sh'
                 target = 'install'
 
               }
@@ -622,12 +622,12 @@ pipeline {
           }
         }
         // ******************** Deploy envinf1 PETSc ***************************
-        stage('Deploy envinf1 PETSc') {
+        stage('Deploy eve PETSc') {
           when {
             beforeAgent true
             expression { return stage_required.build || stage_required.full }
           }
-          agent { label "envinf1"}
+          agent { label "frontend2"}
           steps {
             script {
               sh 'rm -rf /global/apps/ogs/head/petsc'
@@ -638,10 +638,10 @@ pipeline {
                   '-DCMAKE_INSTALL_PREFIX=/global/apps/ogs/head/petsc ' +
                   '-DOGS_MODULEFILE=/global/apps/modulefiles/ogs/head/petsc ' +
                   '-DOGS_CPU_ARCHITECTURE=core-avx-i '
-                env = 'envinf1/petsc.sh'
+                env = 'eve/petsc.sh'
               }
               build {
-                env = 'envinf1/petsc.sh'
+                env = 'eve/petsc.sh'
                 target = 'install'
                 cmd_args = '-l 30'
               }

Tests/CMakeLists.txt

@@ -98,7 +98,7 @@ add_custom_target(tests-cleanup ${CMAKE_COMMAND} -E remove -f testrunner.xml)
 set_target_properties(tests-cleanup PROPERTIES FOLDER Testing)
 
 if(OGS_USE_PETSC)
-    if("${HOSTNAME}" STREQUAL "frontend1")
+    if("${HOSTNAME}" MATCHES "frontend.*")
         set(MPIRUN_ARGS --mca btl_openib_allow_ib 1)
     endif()
     set(TEST_FILTER_MPI --gtest_filter=-MPITest*)

scripts/cmake/test/AddTest.cmake

@@ -17,7 +17,7 @@
 #                  OGS_USE_PETSC AND (OGS_USE_EIGEN OR OGS_USE_LIS)
 #   VIS <vtu output file(s)> # optional for documentation
 #   RUNTIME <in seconds> # optional for optimizing ctest duration
-#                          values should be taken from envinf1 serial job
+#                          values should be taken from eve serial job
 # )
 #
 # Conditional arguments:
@@ -104,7 +104,7 @@ function (AddTest)
         endif()
     elseif(AddTest_WRAPPER STREQUAL "mpirun")
         if(MPIRUN_TOOL_PATH)
-            if("${HOSTNAME}" STREQUAL "frontend1")
+            if("${HOSTNAME}" MATCHES "frontend.*")
                 set(AddTest_WRAPPER_ARGS ${AddTest_WRAPPER_ARGS} --mca btl_openib_allow_ib 1)
             endif()
             set(WRAPPER_COMMAND ${MPIRUN_TOOL_PATH})

scripts/env/eve/petsc.sh

@@ -8,8 +8,8 @@ source $DIR/mpi.sh
 module load petsc-bilke/3.11.0-foss2018b
 echo -e "Note: If you want to run a simulation on the cluster be aware of the "\
      "mixed CPU architecture. There are Sandy-Bridge-based nodes (orte-28, "\
-     "frontend2, envinf1) as well as Skylake-based nodes (orte-40, frontend1)"\
+     "frontend2) as well as Skylake-based nodes (orte-40, frontend1)"\
      ".\nConsider setting CMake-option OGS_CPU_ARCHITECTURE to:\n\n"\
      "  -DOGS_CPU_ARCHITECTURE=sandybridge\n"\
      "   -- OR --\n"\
-     "  -DOGS_CPU_ARCHITECTURE=skylake-avx512"
\ No newline at end of file
+     "  -DOGS_CPU_ARCHITECTURE=skylake-avx512"