Skip to content

Commit 0797fb4

Browse files
committed
Remove Docker Registry login.
Closes #1269.
1 parent 16ff3ea commit 0797fb4

File tree

1 file changed

+30
-40
lines changed

1 file changed

+30
-40
lines changed

Jenkinsfile

Lines changed: 30 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,10 @@ pipeline {
9696
}
9797
steps {
9898
script {
99-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
100-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
101-
sh 'mkdir -p /tmp/jenkins-home'
102-
sh 'JAVA_HOME=/opt/java/openjdk /opt/cassandra/bin/cassandra -R &'
103-
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'
104-
}
99+
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
100+
sh 'mkdir -p /tmp/jenkins-home'
101+
sh 'JAVA_HOME=/opt/java/openjdk /opt/cassandra/bin/cassandra -R &'
102+
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'
105103
}
106104
}
107105
}
@@ -125,12 +123,10 @@ pipeline {
125123
}
126124
steps {
127125
script {
128-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
129-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.11.tag']}").inside(p['docker.java.inside.basic']) {
130-
sh 'mkdir -p /tmp/jenkins-home'
131-
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
132-
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'
133-
}
126+
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.11.tag']}").inside(p['docker.java.inside.basic']) {
127+
sh 'mkdir -p /tmp/jenkins-home'
128+
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
129+
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'
134130
}
135131
}
136132
}
@@ -145,12 +141,10 @@ pipeline {
145141
}
146142
steps {
147143
script {
148-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
149-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.lts.tag']}").inside(p['docker.java.inside.basic']) {
150-
sh 'mkdir -p /tmp/jenkins-home'
151-
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
152-
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'
153-
}
144+
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.lts.tag']}").inside(p['docker.java.inside.basic']) {
145+
sh 'mkdir -p /tmp/jenkins-home'
146+
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
147+
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'
154148
}
155149
}
156150
}
@@ -176,18 +170,16 @@ pipeline {
176170

177171
steps {
178172
script {
179-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
180-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
181-
sh 'mkdir -p /tmp/jenkins-home'
182-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
183-
'-Dartifactory.server=https://repo.spring.io ' +
184-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
185-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
186-
"-Dartifactory.staging-repository=libs-snapshot-local " +
187-
"-Dartifactory.build-name=spring-data-cassandra " +
188-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
189-
'-Dmaven.test.skip=true clean deploy -U -B'
190-
}
173+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
174+
sh 'mkdir -p /tmp/jenkins-home'
175+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
176+
'-Dartifactory.server=https://repo.spring.io ' +
177+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
178+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
179+
"-Dartifactory.staging-repository=libs-snapshot-local " +
180+
"-Dartifactory.build-name=spring-data-cassandra " +
181+
"-Dartifactory.build-number=${BUILD_NUMBER} " +
182+
'-Dmaven.test.skip=true clean deploy -U -B'
191183
}
192184
}
193185
}
@@ -207,16 +199,14 @@ pipeline {
207199

208200
steps {
209201
script {
210-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
211-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
212-
sh 'mkdir -p /tmp/jenkins-home'
213-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
214-
'-Dartifactory.server=https://repo.spring.io ' +
215-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
216-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
217-
"-Dartifactory.distribution-repository=temp-private-local " +
218-
'-Dmaven.test.skip=true clean deploy -U -B'
219-
}
202+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
203+
sh 'mkdir -p /tmp/jenkins-home'
204+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
205+
'-Dartifactory.server=https://repo.spring.io ' +
206+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
207+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
208+
"-Dartifactory.distribution-repository=temp-private-local " +
209+
'-Dmaven.test.skip=true clean deploy -U -B'
220210
}
221211
}
222212
}

0 commit comments

Comments
 (0)