@@ -23,17 +23,17 @@ pipeline {
2323 stage(' Publish JDK 17 + Cassandra 3.11' ) {
2424 when {
2525 anyOf {
26- changeset " ci/openjdk17-8-cassandra-3.11/**"
27- changeset " ci/pipeline.properties"
26+ changeset " ci/openjdk17-8-cassandra-3.11/**"
27+ changeset " ci/pipeline.properties"
2828 }
2929 }
3030 agent { label ' data' }
3131 options { timeout(time : 30 , unit : ' MINUTES' ) }
3232
3333 steps {
3434 script {
35- def image = docker. build(" springci/spring-data-with-cassandra-3.11:${ p['java.lts .tag']} " , " --build-arg BASE=${ p['docker.java.lts .image']} --build-arg CASSANDRA=${ p['docker.cassandra.3.version']} ci/openjdk17-8-cassandra-3.11/" )
36- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
35+ def image = docker. build(" springci/spring-data-with-cassandra-3.11:${ p['java.main .tag']} " , " --build-arg BASE=${ p['docker.java.main .image']} --build-arg CASSANDRA=${ p['docker.cassandra.3.version']} ci/openjdk17-8-cassandra-3.11/" )
36+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
3737 image. push()
3838 }
3939 }
@@ -59,8 +59,8 @@ pipeline {
5959 }
6060 steps {
6161 script {
62- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
63- docker. image(' springci/spring-data-openjdk17-8- cassandra-3.11:latest ' ). inside(' -v $HOME:/tmp/jenkins-home' ) {
62+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
63+ docker. image(" springci/spring-data-with- cassandra-3.11:${ p['java.main.tag'] } " ). inside(' -v $HOME:/tmp/jenkins-home' ) {
6464 sh ' mkdir -p /tmp/jenkins-home'
6565 sh ' JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
6666 sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,external-cassandra clean dependency:list verify -Dsort -U -B'
@@ -89,7 +89,7 @@ pipeline {
8989
9090 steps {
9191 script {
92- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
92+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
9393 docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
9494 sh ' mkdir -p /tmp/jenkins-home'
9595 sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
0 commit comments