From abc4a6c8075c63dcb3efc8599edbf396266043cc Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 30 Oct 2017 13:10:31 +0100
Subject: [PATCH] [Jenkins] Replaced checkoutWithTags() with checkout scm.
---
Jenkinsfile | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d3c14d8a2ff..dc5acac3868 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,7 +10,7 @@ timestamps {
builders['gcc'] = {
node('docker') {
dir('ogs') {
- checkoutWithTags()
+ checkout scm
tag = helper.getTag()
}
load 'ogs/scripts/jenkins/gcc.groovy'
@@ -19,28 +19,28 @@ builders['gcc'] = {
builders['gcc-conan'] = {
node('docker') {
- dir('ogs') { checkoutWithTags() }
+ dir('ogs') { checkout scm }
load 'ogs/scripts/jenkins/gcc-conan.groovy'
}
}
builders['gcc-dynamic'] = {
node('envinf1') {
- dir('ogs') { checkoutWithTags() }
+ dir('ogs') { checkout scm }
load 'ogs/scripts/jenkins/gcc-dynamic.groovy'
}
}
builders['msvc'] = {
node('win && conan') {
- dir('ogs') { checkoutWithTags() }
+ dir('ogs') { checkout scm }
load 'ogs/scripts/jenkins/msvc.groovy'
}
}
builders['mac'] = {
node('mac') {
- dir('ogs') { checkoutWithTags() }
+ dir('ogs') { checkout scm }
// load 'ogs/scripts/jenkins/mac.groovy'
}
}
@@ -48,7 +48,7 @@ builders['mac'] = {
if (helper.isRelease(this)) {
builders['msvc32'] = {
node('win && conan') {
- dir('ogs') { checkoutWithTags() }
+ dir('ogs') { checkout scm }
load 'ogs/scripts/jenkins/msvc32.groovy'
}
}
@@ -57,7 +57,7 @@ if (helper.isRelease(this)) {
if (helper.isOriginMaster(this)) {
builders['coverage'] = {
node('docker') {
- dir('ogs') { checkoutWithTags() }
+ dir('ogs') { checkout scm }
load 'ogs/scripts/jenkins/coverage.groovy'
}
}
@@ -75,7 +75,7 @@ catch (err) {
}
node('master') {
- checkoutWithTags()
+ checkout scm
step([$class: 'LogParserPublisher',
failBuildOnError: true,
projectRulePath: "scripts/jenkins/all-log-parser.rules",
@@ -94,7 +94,7 @@ if (helper.isOriginMaster(this)) {
helper.notification(msg: "Marked build for ${tag}.", script: this)
node('mac') {
- dir('ogs') { checkoutWithTags() }
+ dir('ogs') { checkout scm }
load 'ogs/scripts/jenkins/docset.groovy'
}
}
--
GitLab