From 60700283f39e119b4e5e7fb4a466daca1ada0c52 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 21 Nov 2017 20:43:40 +0100
Subject: [PATCH] [Jenkins] Fix missing variables.
---
Jenkinsfile | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index dbefff47fe1..0cb2a1dcf8e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -256,6 +256,7 @@ pipeline {
parallel {
// ************************* Deploy Web ********************************
stage('Deploy Web') {
+ agent any
steps {
dir('web') { unstash web }
dir('doxygen') { unstash doxygen }
@@ -281,8 +282,8 @@ pipeline {
'-DOGS_BUILD_UTILS=ON ' +
'-DOGS_BUILD_METIS=ON ' +
'-DBUILD_SHARED_LIBS=ON ' +
- '-DCMAKE_INSTALL_PREFIX=${installPrefix}/standard ' +
- '-DOGS_MODULEFILE=${modulePrefix}/standard ' +
+ '-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'
}
@@ -310,8 +311,8 @@ pipeline {
'-DOGS_BUILD_UTILS=ON ' +
'-DOGS_BUILD_METIS=ON ' +
'-DBUILD_SHARED_LIBS=ON ' +
- '-DCMAKE_INSTALL_PREFIX=${installPrefix}/petsc ' +
- '-DOGS_MODULEFILE=${modulePrefix}/petsc ' +
+ '-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'
}
--
GitLab