Skip to content

Commit 814f5cd

Browse files
committed
Remove Docker Registry login.
Closes #1269.
1 parent 4abcbf6 commit 814f5cd

File tree

1 file changed

+14
-18
lines changed

1 file changed

+14
-18
lines changed

Jenkinsfile

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,10 @@ pipeline {
5959
}
6060
steps {
6161
script {
62-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
63-
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
64-
sh 'mkdir -p /tmp/jenkins-home'
65-
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
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'
67-
}
62+
docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-data-with-cassandra-3.11:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
63+
sh 'mkdir -p /tmp/jenkins-home'
64+
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
65+
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'
6866
}
6967
}
7068
}
@@ -89,18 +87,16 @@ pipeline {
8987

9088
steps {
9189
script {
92-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
93-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
94-
sh 'mkdir -p /tmp/jenkins-home'
95-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
96-
'-Dartifactory.server=https://repo.spring.io ' +
97-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
98-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
99-
"-Dartifactory.staging-repository=libs-snapshot-local " +
100-
"-Dartifactory.build-name=spring-data-cassandra " +
101-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
102-
'-Dmaven.test.skip=true clean deploy -U -B'
103-
}
90+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
91+
sh 'mkdir -p /tmp/jenkins-home'
92+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
93+
'-Dartifactory.server=https://repo.spring.io ' +
94+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
95+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
96+
"-Dartifactory.staging-repository=libs-snapshot-local " +
97+
"-Dartifactory.build-name=spring-data-cassandra " +
98+
"-Dartifactory.build-number=${BUILD_NUMBER} " +
99+
'-Dmaven.test.skip=true clean deploy -U -B'
104100
}
105101
}
106102
}

0 commit comments

Comments
 (0)