From b4c48aa3a78df9e86959e25489ed7967cb4be992 Mon Sep 17 00:00:00 2001 From: "Greg L. Turnquist" Date: Mon, 14 Dec 2020 14:49:41 -0600 Subject: [PATCH] DATACASS-835 - Polishing. --- Jenkinsfile | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 09a367146..b3bfb62d1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -64,26 +64,25 @@ pipeline { } } } - stage("Test") { + + stage("test: baseline (jdk8)") { when { anyOf { branch 'master' not { triggeredBy 'UpstreamCause' } } } - stage("test: baseline (jdk8)") { - agent { - label 'data' - } - options { timeout(time: 30, unit: 'MINUTES') } - steps { - script { - docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('springci/spring-data-openjdk8-cassandra-3.11:latest').inside('-v $HOME:/tmp/jenkins-home') { - sh 'mkdir -p /tmp/jenkins-home' - sh 'JAVA_HOME=/opt/java/openjdk /opt/cassandra/bin/cassandra -R &' - sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,external-cassandra clean dependency:list verify -Dsort -U -B' - } + agent { + label 'data' + } + options { timeout(time: 30, unit: 'MINUTES') } + steps { + script { + docker.withRegistry('', 'hub.docker.com-springbuildmaster') { + docker.image('springci/spring-data-openjdk8-cassandra-3.11:latest').inside('-v $HOME:/tmp/jenkins-home') { + sh 'mkdir -p /tmp/jenkins-home' + sh 'JAVA_HOME=/opt/java/openjdk /opt/cassandra/bin/cassandra -R &' + sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,external-cassandra clean dependency:list verify -Dsort -U -B' } } }