From 88ec2043196d70566ff8db32c37ca390c2e82403 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 22 Nov 2017 21:42:08 +0000
Subject: [PATCH] [Jenkins] Fixed web deploy and sanitizer.
---
Jenkinsfile | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 83039f76438..3598d392131 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -56,6 +56,7 @@ pipeline {
success {
dir('web/public') { stash(name: 'web') }
dir('build/docs') { stash(name: 'doxygen') }
+ dir('scripts/jenkins') { stash(name: 'known_hosts', includes: 'known_hosts') }
script {
publishHTML(target: [allowMissing: false, alwaysLinkToLastBuild: true,
keepAll: true, reportDir: 'build/docs', reportFiles: 'index.html',
@@ -260,13 +261,14 @@ pipeline {
steps {
dir('web') { unstash 'web' }
dir('doxygen') { unstash 'doxygen' }
+ unstash 'known_hosts'
script {
sshagent(credentials: ['www-data_jenkins']) {
sh 'rsync -a --delete --stats -e "ssh -o UserKnownHostsFile=' +
- 'ogs/scripts/jenkins/known_hosts" . ' +
+ 'known_hosts" . ' +
'www-data@jenkins.opengeosys.org:/var/www/dev.opengeosys.org'
sh 'rsync -a --delete --stats -e "ssh -o UserKnownHostsFile=' +
- 'ogs/scripts/jenkins/known_hosts" . ' +
+ 'known_hosts" . ' +
'www-data@jenkins.opengeosys.org:/var/www/doxygen.opengeosys.org'
}
}
@@ -343,6 +345,7 @@ pipeline {
script {
configure {
cmakeOptions =
+ '-DOGS_USE_CONAN=ON ' +
'-DOGS_ADDRESS_SANITIZER=ON ' +
'-DOGS_UNDEFINED_BEHAVIOR_SANITIZER=ON ' +
'-DOGS_BUILD_UTILS=ON '
--
GitLab