From f2846f956550bedc373a0a70a486f0c47d737fe0 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 19 Sep 2016 17:28:45 +0200
Subject: [PATCH] Revert "[Jenkins] Checkout scm on master, unstash on slaves."
This reverts commit a8d8d2d9f9c87edb06a41a80e4ab0e2122a6c8d8.
---
Jenkinsfile | 3 ---
scripts/jenkins/gcc.groovy | 3 ++-
scripts/jenkins/mac.groovy | 3 ++-
scripts/jenkins/msvc.groovy | 3 ++-
scripts/jenkins/msvc32.groovy | 3 ++-
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index c29f09bedb2..ec8b9dce799 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,10 +7,7 @@ helper = null
node('master') {
step([$class: 'GitHubSetCommitStatusBuilder', statusMessage: [content: 'Started Jenkins build']])
-
- stage 'Checkout'
checkout scm
- stash name: 'source', useDefaultExcludes: false
configure = load 'scripts/jenkins/lib/configure.groovy'
build = load 'scripts/jenkins/lib/build.groovy'
diff --git a/scripts/jenkins/gcc.groovy b/scripts/jenkins/gcc.groovy
index 5e97657ba58..eebba790292 100644
--- a/scripts/jenkins/gcc.groovy
+++ b/scripts/jenkins/gcc.groovy
@@ -4,7 +4,8 @@ node('docker') {
'-DOGS_LIB_BOOST=System ' +
'-DOGS_LIB_VTK=System'
- dir('ogs') { unstash 'source' }
+ stage 'Checkout (Linux-Docker)'
+ dir('ogs') { checkout scm }
docker.image('ogs6/gcc-gui:latest').inside(defaultDockerArgs) {
stage 'Configure (Linux-Docker)'
diff --git a/scripts/jenkins/mac.groovy b/scripts/jenkins/mac.groovy
index 89df106322e..1669d612a48 100644
--- a/scripts/jenkins/mac.groovy
+++ b/scripts/jenkins/mac.groovy
@@ -6,7 +6,8 @@ node('mac && conan') {
'-DOGS_LIB_VTK=System ' +
'-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON'
- dir('ogs') { unstash 'source' }
+ stage 'Checkout (Mac)'
+ dir('ogs') { checkout scm }
stage 'Configure (Mac)'
configure.linux 'build', "${defaultCMakeOptions}", 'Ninja', ''
diff --git a/scripts/jenkins/msvc.groovy b/scripts/jenkins/msvc.groovy
index b2a90af7816..6c70d9e68cf 100644
--- a/scripts/jenkins/msvc.groovy
+++ b/scripts/jenkins/msvc.groovy
@@ -11,7 +11,8 @@ node('win && conan') {
'-DOGS_BUILD_TESTS=OFF ' +
'-DOGS_BUILD_SWMM=ON'
- dir('ogs') { unstash 'source' }
+ stage 'Checkout (Win)'
+ dir('ogs') { checkout scm }
withEnv(helper.getEnv()) {
stage 'Configure (Win)'
diff --git a/scripts/jenkins/msvc32.groovy b/scripts/jenkins/msvc32.groovy
index d96cfcfe0b2..13f858fcfab 100644
--- a/scripts/jenkins/msvc32.groovy
+++ b/scripts/jenkins/msvc32.groovy
@@ -6,7 +6,8 @@ node('win && conan') {
'-DOGS_LIB_VTK=System ' +
'-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON'
- dir('ogs') { unstash 'source' }
+ stage 'Checkout (Win)'
+ dir('ogs') { checkout scm }
stage 'Data Explorer 32-bit (Win)'
withEnv(helper.getEnv('x32')) {
--
GitLab