@@ -23,8 +23,8 @@ pipeline {
23
23
stage(' Publish JDK 17 + Cassandra 3.11' ) {
24
24
when {
25
25
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"
28
28
}
29
29
}
30
30
agent { label ' data' }
@@ -33,7 +33,7 @@ pipeline {
33
33
steps {
34
34
script {
35
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 ' ) {
36
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
37
37
image. push()
38
38
}
39
39
}
@@ -59,8 +59,8 @@ pipeline {
59
59
}
60
60
steps {
61
61
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.lts.tag'] } " ). inside(' -v $HOME:/tmp/jenkins-home' ) {
64
64
sh ' mkdir -p /tmp/jenkins-home'
65
65
sh ' JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
66
66
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 {
89
89
90
90
steps {
91
91
script {
92
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
92
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
93
93
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
94
94
sh ' mkdir -p /tmp/jenkins-home'
95
95
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
0 commit comments