@@ -29,7 +29,6 @@ pipeline {
2929 }
3030 agent { label ' data' }
3131 options { timeout(time : 30 , unit : ' MINUTES' ) }
32-
3332 steps {
3433 script {
3534 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/" )
@@ -48,7 +47,6 @@ pipeline {
4847 }
4948 agent { label ' data' }
5049 options { timeout(time : 30 , unit : ' MINUTES' ) }
51-
5250 steps {
5351 script {
5452 def image = docker. build(" springci/spring-data-with-cassandra-3.11:${ p['java.next.tag']} " , " --build-arg BASE=${ p['docker.java.next.image']} --build-arg CASSANDRA=${ p['docker.cassandra.3.version']} ci/openjdk21-8-cassandra-3.11/" )
@@ -75,7 +73,6 @@ pipeline {
7573 options { timeout(time : 30 , unit : ' MINUTES' ) }
7674 environment {
7775 ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
78- DEVELOCITY_CACHE = credentials(" ${ p['develocity.cache.credentials']} " )
7976 DEVELOCITY_ACCESS_KEY = credentials(" ${ p['develocity.access-key']} " )
8077 }
8178 steps {
@@ -85,9 +82,6 @@ pipeline {
8582 sh ' mkdir -p /tmp/jenkins-home'
8683 sh ' JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
8784 sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
88- " DEVELOCITY_CACHE_USERNAME=${ DEVELOCITY_CACHE_USR} " +
89- " DEVELOCITY_CACHE_PASSWORD=${ DEVELOCITY_CACHE_PSW} " +
90- " GRADLE_ENTERPRISE_ACCESS_KEY=${ DEVELOCITY_ACCESS_KEY} " +
9185 " ./mvnw -s settings.xml -Pci,external-cassandra " +
9286 " clean dependency:list verify -Dsort -U -B"
9387 }
@@ -112,7 +106,6 @@ pipeline {
112106 options { timeout(time : 30 , unit : ' MINUTES' ) }
113107 environment {
114108 ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
115- DEVELOCITY_CACHE = credentials(" ${ p['develocity.cache.credentials']} " )
116109 DEVELOCITY_ACCESS_KEY = credentials(" ${ p['develocity.access-key']} " )
117110 }
118111 steps {
@@ -122,9 +115,6 @@ pipeline {
122115 sh ' mkdir -p /tmp/jenkins-home'
123116 sh ' JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
124117 sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
125- " DEVELOCITY_CACHE_USERNAME=${ DEVELOCITY_CACHE_USR} " +
126- " DEVELOCITY_CACHE_PASSWORD=${ DEVELOCITY_CACHE_PSW} " +
127- " GRADLE_ENTERPRISE_ACCESS_KEY=${ DEVELOCITY_ACCESS_KEY} " +
128118 " ./mvnw -s settings.xml -Pci,external-cassandra " +
129119 " clean dependency:list verify -Dsort -U -B"
130120 }
@@ -147,22 +137,16 @@ pipeline {
147137 label ' data'
148138 }
149139 options { timeout(time : 20 , unit : ' MINUTES' ) }
150-
151140 environment {
152141 ARTIFACTORY = credentials(" ${ p['artifactory.credentials']} " )
153- DEVELOCITY_CACHE = credentials(" ${ p['develocity.cache.credentials']} " )
154142 DEVELOCITY_ACCESS_KEY = credentials(" ${ p['develocity.access-key']} " )
155143 }
156-
157144 steps {
158145 script {
159146 docker. withRegistry(p[' docker.proxy.registry' ], p[' docker.proxy.credentials' ]) {
160147 docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
161148 sh ' mkdir -p /tmp/jenkins-home'
162149 sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
163- " DEVELOCITY_CACHE_USERNAME=${ DEVELOCITY_CACHE_USR} " +
164- " DEVELOCITY_CACHE_PASSWORD=${ DEVELOCITY_CACHE_PSW} " +
165- " GRADLE_ENTERPRISE_ACCESS_KEY=${ DEVELOCITY_ACCESS_KEY} " +
166150 " ./mvnw -s settings.xml -Pci,artifactory " +
167151 " -Dartifactory.server=${ p['artifactory.url']} " +
168152 " -Dartifactory.username=${ ARTIFACTORY_USR} " +
0 commit comments