From a75e48a612583ba12c9515900f583d8e17e4a8d6 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 2 Nov 2016 13:55:17 +0100
Subject: [PATCH] [Jenkins] Pull latest docker images.
docker.image('ogs6/gcc-gui:latest')# Please enter the commit message for your
changes. Lines starting
---
scripts/jenkins/clang.groovy | 4 +++-
scripts/jenkins/coverage.groovy | 4 +++-
scripts/jenkins/docs.groovy | 4 +++-
scripts/jenkins/gcc.groovy | 4 +++-
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/scripts/jenkins/clang.groovy b/scripts/jenkins/clang.groovy
index 35323f4aec6..34e588b254a 100644
--- a/scripts/jenkins/clang.groovy
+++ b/scripts/jenkins/clang.groovy
@@ -18,7 +18,9 @@ node('docker') {
dir('ogs') { checkout scm }
}
- docker.image('ogs6/clang-base:latest').inside(defaultDockerArgs) {
+ def image = docker.image('ogs6/clang-base:latest')
+ image.pull()
+ image.inside(defaultDockerArgs) {
stage('Configure (Clang)') {
configure.linux 'build', "${defaultCMakeOptions}"
}
diff --git a/scripts/jenkins/coverage.groovy b/scripts/jenkins/coverage.groovy
index 848f2a513be..77da18c9e39 100644
--- a/scripts/jenkins/coverage.groovy
+++ b/scripts/jenkins/coverage.groovy
@@ -7,7 +7,9 @@ node('docker') {
stage('Checkout') { dir('ogs') { checkout scm } }
stage('Build') {
- docker.image('ogs6/gcc-base:latest').inside(defaultDockerArgs) {
+ def image = docker.image('ogs6/gcc-base:latest')
+ image.pull()
+ image.inside(defaultDockerArgs) {
build this, 'build', '-DOGS_COVERAGE=ON',
'testrunner_coverage_cobertura ctest_coverage_cobertura'
}
diff --git a/scripts/jenkins/docs.groovy b/scripts/jenkins/docs.groovy
index 6ccfbec35b2..071b35d6ce7 100644
--- a/scripts/jenkins/docs.groovy
+++ b/scripts/jenkins/docs.groovy
@@ -8,7 +8,9 @@ def build = new ogs.build()
def post = new ogs.post()
def helper = new ogs.helper()
-docker.image('ogs6/gcc-base:latest').inside() {
+def image = docker.image('ogs6/gcc-base:latest')
+image.pull()
+image.inside() {
stage('Configure (Docs)') {
configure.linux 'build', "${defaultCMakeOptions}"
}
diff --git a/scripts/jenkins/gcc.groovy b/scripts/jenkins/gcc.groovy
index 4e0c33820c6..ba019507a0f 100644
--- a/scripts/jenkins/gcc.groovy
+++ b/scripts/jenkins/gcc.groovy
@@ -8,7 +8,9 @@ def build = new ogs.build()
def post = new ogs.post()
def helper = new ogs.helper()
-docker.image('ogs6/gcc-gui:latest').inside(defaultDockerArgs) {
+def image = docker.image('ogs6/gcc-gui:latest')
+image.pull()
+image.inside(defaultDockerArgs) {
stage('Configure (Linux-Docker)') {
configure.linux 'build', "${defaultCMakeOptions}"
}
--
GitLab