Skip to content

Commit 812e4c6

Browse files
committed
Remove Docker Registry login.
Closes #1269.
1 parent 38014e2 commit 812e4c6

File tree

1 file changed

+22
-30
lines changed

1 file changed

+22
-30
lines changed

Jenkinsfile

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,10 @@ pipeline {
9797
}
9898
steps {
9999
script {
100-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
101-
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']) {
102-
sh 'mkdir -p /tmp/jenkins-home'
103-
sh 'JAVA_HOME=/opt/java/openjdk /opt/cassandra/bin/cassandra -R &'
104-
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'
105-
}
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'
106104
}
107105
}
108106
}
@@ -127,12 +125,10 @@ pipeline {
127125
}
128126
steps {
129127
script {
130-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
131-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.next.tag']}").inside(p['docker.java.inside.basic']) {
132-
sh 'mkdir -p /tmp/jenkins-home'
133-
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
134-
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'
135-
}
128+
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.next.tag']}").inside(p['docker.java.inside.basic']) {
129+
sh 'mkdir -p /tmp/jenkins-home'
130+
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
131+
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'
136132
}
137133
}
138134
}
@@ -147,12 +143,10 @@ pipeline {
147143
}
148144
steps {
149145
script {
150-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
151-
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']) {
152-
sh 'mkdir -p /tmp/jenkins-home'
153-
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
154-
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'
155-
}
146+
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']) {
147+
sh 'mkdir -p /tmp/jenkins-home'
148+
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
149+
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'
156150
}
157151
}
158152
}
@@ -179,18 +173,16 @@ pipeline {
179173

180174
steps {
181175
script {
182-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
183-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
184-
sh 'mkdir -p /tmp/jenkins-home'
185-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
186-
'-Dartifactory.server=https://repo.spring.io ' +
187-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
188-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
189-
"-Dartifactory.staging-repository=libs-snapshot-local " +
190-
"-Dartifactory.build-name=spring-data-cassandra " +
191-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
192-
'-Dmaven.test.skip=true clean deploy -U -B'
193-
}
176+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
177+
sh 'mkdir -p /tmp/jenkins-home'
178+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
179+
'-Dartifactory.server=https://repo.spring.io ' +
180+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
181+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
182+
"-Dartifactory.staging-repository=libs-snapshot-local " +
183+
"-Dartifactory.build-name=spring-data-cassandra " +
184+
"-Dartifactory.build-number=${BUILD_NUMBER} " +
185+
'-Dmaven.test.skip=true clean deploy -U -B'
194186
}
195187
}
196188
}

0 commit comments

Comments
 (0)