[Jenkins] Added static builds for eve deploy.

jianhit · Mar 23, 2017 · e198e5f · e198e5f
1 parent 31ed285
commit e198e5f
Showing 1 changed file with 30 additions and 10 deletions.
diff --git a/scripts/jenkins/gcc-dynamic.groovy b/scripts/jenkins/gcc-dynamic.groovy
@@ -2,7 +2,6 @@ def defaultCMakeOptions =
     '-DCMAKE_BUILD_TYPE=Release ' +
     '-DOGS_LIB_BOOST=System ' +
     '-DOGS_LIB_VTK=System ' +
-    '-DBUILD_SHARED_LIBS=ON ' +
     '-DOGS_BUILD_UTILS=ON '
 
 def configure = new ogs.configure()
@@ -11,13 +10,15 @@ def post = new ogs.post()
 def helper = new ogs.helper()
 
 stage('Configure (envinf1)') {
-    if (helper.isOriginMaster(this)) {
-        defaultCMakeOptions +=
-            ' -DCMAKE_INSTALL_PREFIX=/global/apps/ogs/head/default' +
-            ' -DOGS_MODULEFILE=/global/apps/modulefiles/ogs/head/default'
-    }
-    configure.linux(cmakeOptions: defaultCMakeOptions, env: 'envinf1/cli.sh', script: this)
-    configure.linux(cmakeOptions: defaultCMakeOptions + '-DOGS_USE_PETSC=ON',
+    installPrefix = "/global/apps/ogs/"
+    installPrefix += "head"
+    modulePrefix = "/global/apps/modulefiles/ogs/"
+    modulePrefix += "head"
+
+    configure.linux(cmakeOptions: defaultCMakeOptions + '-DBUILD_SHARED_LIBS=ON ',
+        env: 'envinf1/cli.sh', script: this)
+    configure.linux(cmakeOptions: defaultCMakeOptions + '-DBUILD_SHARED_LIBS=ON ' +
+        '-DOGS_USE_PETSC=ON ',
         dir: 'build-petsc', env: 'envinf1/petsc.sh', script: this)
 }
 
@@ -38,8 +39,27 @@ stage('Test (envinf1)') {
     }
 }
 
-stage('Deploy (envinf1)') {
-    build.linux(env: 'envinf1/cli.sh', script: this, target: 'install')
+if (helper.isOriginMaster(this)) {
+    stage('Deploy (envinf1)') {
+        parallel serial: {
+            configure.linux(cmakeOptions: defaultCMakeOptions +
+                "-DCMAKE_INSTALL_PREFIX=${installPrefix}/default " +
+                "-DOGS_MODULEFILE=${modulePrefix}/default " +
+                "-DOGS_CPU_ARCHITECTURE=core-avx-i ",
+                dir: 'build-static', env: 'envinf1/cli.sh', script: this)
+            build.linux(dir: 'build-static', env: 'envinf1/cli.sh',
+                script: this, target: 'install')
+
+        }, petsc: {
+            configure.linux(cmakeOptions: defaultCMakeOptions + '-DOGS_USE_PETSC=ON ' +
+                "-DCMAKE_INSTALL_PREFIX=${installPrefix}/petsc " +
+                "-DOGS_MODULEFILE=${modulePrefix}/petsc " +
+                "-DOGS_CPU_ARCHITECTURE=core-avx-i ",
+                dir: 'build-static-petsc', env: 'envinf1/petsc.sh', script: this)
+            build.linux(dir: 'build-static-petsc', env: 'envinf1/petsc.sh',
+                script: this, target: 'install')
+        }
+    }
 }
 
 stage('Post (envinf1)') {