@@ -35,9 +35,11 @@ pipeline {
35
35
}
36
36
steps {
37
37
script {
38
- docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.docker' ]) {
39
- sh " PROFILE=ci JENKINS_USER_NAME=${ p['jenkins.user.name']} ci/test.sh"
40
- sh " JENKINS_USER_NAME=${ p['jenkins.user.name']} ci/clean.sh"
38
+ docker. withRegistry(p[' docker.proxy.registry' ], p[' docker.proxy.credentials' ]) {
39
+ docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.docker' ]) {
40
+ sh " PROFILE=ci JENKINS_USER_NAME=${ p['jenkins.user.name']} ci/test.sh"
41
+ sh " JENKINS_USER_NAME=${ p['jenkins.user.name']} ci/clean.sh"
42
+ }
41
43
}
42
44
}
43
45
}
@@ -62,9 +64,11 @@ pipeline {
62
64
}
63
65
steps {
64
66
script {
65
- docker. image(p[' docker.java.next.image' ]). inside(p[' docker.java.inside.docker' ]) {
66
- sh " PROFILE=ci JENKINS_USER_NAME=${ p['jenkins.user.name']} ci/test.sh"
67
- sh " JENKINS_USER_NAME=${ p['jenkins.user.name']} ci/clean.sh"
67
+ docker. withRegistry(p[' docker.proxy.registry' ], p[' docker.proxy.credentials' ]) {
68
+ docker. image(p[' docker.java.next.image' ]). inside(p[' docker.java.inside.docker' ]) {
69
+ sh " PROFILE=ci JENKINS_USER_NAME=${ p['jenkins.user.name']} ci/test.sh"
70
+ sh " JENKINS_USER_NAME=${ p['jenkins.user.name']} ci/clean.sh"
71
+ }
68
72
}
69
73
}
70
74
}
@@ -89,16 +93,18 @@ pipeline {
89
93
}
90
94
steps {
91
95
script {
92
- docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
93
- sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
94
- " ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase-non-root " +
95
- " -Dartifactory.server=${ p['artifactory.url']} " +
96
- " -Dartifactory.username=${ ARTIFACTORY_USR} " +
97
- " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
98
- " -Dartifactory.staging-repository=${ p['artifactory.repository.snapshot']} " +
99
- " -Dartifactory.build-name=spring-data-couchbase " +
100
- " -Dartifactory.build-number=spring-data-couchbase-${ BRANCH_NAME} -build-${ BUILD_NUMBER} " +
101
- " -Dmaven.test.skip=true clean deploy -U -B"
96
+ docker. withRegistry(p[' docker.proxy.registry' ], p[' docker.proxy.credentials' ]) {
97
+ docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
98
+ sh ' MAVEN_OPTS="-Duser.name=' + " ${ p['jenkins.user.name']} " + ' -Duser.home=/tmp/jenkins-home" ' +
99
+ " ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase-non-root " +
100
+ " -Dartifactory.server=${ p['artifactory.url']} " +
101
+ " -Dartifactory.username=${ ARTIFACTORY_USR} " +
102
+ " -Dartifactory.password=${ ARTIFACTORY_PSW} " +
103
+ " -Dartifactory.staging-repository=${ p['artifactory.repository.snapshot']} " +
104
+ " -Dartifactory.build-name=spring-data-couchbase " +
105
+ " -Dartifactory.build-number=spring-data-couchbase-${ BRANCH_NAME} -build-${ BUILD_NUMBER} " +
106
+ " -Dmaven.test.skip=true clean deploy -U -B"
107
+ }
102
108
}
103
109
}
104
110
}
0 commit comments