Skip to content

Commit e8014f9

Browse files
gregturngregturn
committed
DATACASS-835 - Use Docker hub credentials for all CI jobs.
1 parent df50a08 commit e8014f9

File tree

2 files changed

+75
-47
lines changed

2 files changed

+75
-47
lines changed

‎Jenkinsfile‎

Lines changed: 70 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -48,31 +48,31 @@ pipeline {
4848
}
4949
}
5050
}
51-
stage("Test") {
51+
52+
stage("test: baseline (jdk8)") {
5253
when {
5354
anyOf {
5455
branch 'issue/DATACASS-699'
5556
not { triggeredBy 'UpstreamCause' }
5657
}
5758
}
58-
parallel {
59-
stage("test: baseline") {
60-
agent {
61-
docker {
62-
image 'springci/spring-data-openjdk8-cassandra-3.11:latest'
63-
label 'data'
64-
args '-v $HOME:/tmp/jenkins-home'
59+
agent {
60+
label 'data'
61+
}
62+
options { timeout(time: 30, unit: 'MINUTES') }
63+
steps {
64+
script {
65+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
66+
docker.image('springci/spring-data-openjdk8-cassandra-3.11:latest').inside('-v $HOME:/tmp/jenkins-home') {
67+
sh 'mkdir -p /tmp/jenkins-home'
68+
sh 'JAVA_HOME=/opt/java/openjdk /opt/cassandra/bin/cassandra -R &'
69+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,external-cassandra clean dependency:list verify -Dsort -U -B'
6570
}
6671
}
67-
options { timeout(time: 30, unit: 'MINUTES') }
68-
steps {
69-
sh 'mkdir -p /tmp/jenkins-home'
70-
sh 'JAVA_HOME=/opt/java/openjdk /opt/cassandra/bin/cassandra -R &'
71-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,external-cassandra clean dependency:list verify -Dsort -U -B'
72-
}
7372
}
7473
}
7574
}
75+
7676
stage("Test other configurations") {
7777
when {
7878
anyOf {
@@ -83,17 +83,36 @@ pipeline {
8383
parallel {
8484
stage("test: baseline (jdk11)") {
8585
agent {
86-
docker {
87-
image 'springci/spring-data-openjdk11-8-cassandra-3.11:latest'
88-
label 'data'
89-
args '-v $HOME:/tmp/jenkins-home'
86+
label 'data'
87+
}
88+
options { timeout(time: 30, unit: 'MINUTES') }
89+
steps {
90+
script {
91+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
92+
docker.image('springci/spring-data-openjdk11-8-cassandra-3.11:latest').inside('-v $HOME:/tmp/jenkins-home') {
93+
sh 'mkdir -p /tmp/jenkins-home'
94+
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
95+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,external-cassandra,java11 clean dependency:list verify -Dsort -U -B'
96+
}
97+
}
9098
}
9199
}
100+
}
101+
stage("test: baseline (jdk15)") {
102+
agent {
103+
label 'data'
104+
}
92105
options { timeout(time: 30, unit: 'MINUTES') }
93106
steps {
94-
sh 'mkdir -p /tmp/jenkins-home'
95-
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
96-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,external-cassandra,java11 clean dependency:list verify -Dsort -U -B'
107+
script {
108+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
109+
docker.image('springci/spring-data-openjdk15-8-cassandra-3.11:latest').inside('-v $HOME:/tmp/jenkins-home') {
110+
sh 'mkdir -p /tmp/jenkins-home'
111+
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
112+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,external-cassandra,java11 clean dependency:list verify -Dsort -U -B'
113+
}
114+
}
115+
}
97116
}
98117
}
99118
}
@@ -106,11 +125,7 @@ pipeline {
106125
}
107126
}
108127
agent {
109-
docker {
110-
image 'adoptopenjdk/openjdk8:latest'
111-
label 'data'
112-
args '-v $HOME:/tmp/jenkins-home'
113-
}
128+
label 'data'
114129
}
115130
options { timeout(time: 20, unit: 'MINUTES') }
116131

@@ -119,27 +134,29 @@ pipeline {
119134
}
120135

121136
steps {
122-
sh 'mkdir -p /tmp/jenkins-home'
123-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
124-
'-Dartifactory.server=https://repo.spring.io ' +
125-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
126-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
127-
"-Dartifactory.staging-repository=libs-snapshot-local " +
128-
"-Dartifactory.build-name=spring-data-cassandra " +
129-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
130-
'-Dmaven.test.skip=true clean deploy -U -B'
137+
script {
138+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
139+
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
140+
sh 'mkdir -p /tmp/jenkins-home'
141+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
142+
'-Dartifactory.server=https://repo.spring.io ' +
143+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
144+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
145+
"-Dartifactory.staging-repository=libs-snapshot-local " +
146+
"-Dartifactory.build-name=spring-data-cassandra " +
147+
"-Dartifactory.build-number=${BUILD_NUMBER} " +
148+
'-Dmaven.test.skip=true clean deploy -U -B'
149+
}
150+
}
151+
}
131152
}
132153
}
133154
stage('Publish documentation') {
134155
when {
135156
branch '3.0.x'
136157
}
137158
agent {
138-
docker {
139-
image 'adoptopenjdk/openjdk8:latest'
140-
label 'data'
141-
args '-v $HOME:/tmp/jenkins-home'
142-
}
159+
label 'data'
143160
}
144161
options { timeout(time: 20, unit: 'MINUTES') }
145162

@@ -148,13 +165,19 @@ pipeline {
148165
}
149166

150167
steps {
151-
sh 'mkdir -p /tmp/jenkins-home'
152-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +
153-
'-Dartifactory.server=https://repo.spring.io ' +
154-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
155-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
156-
"-Dartifactory.distribution-repository=temp-private-local " +
157-
'-Dmaven.test.skip=true clean deploy -U -B'
168+
script {
169+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
170+
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
171+
sh 'mkdir -p /tmp/jenkins-home'
172+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +
173+
'-Dartifactory.server=https://repo.spring.io ' +
174+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
175+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
176+
"-Dartifactory.distribution-repository=temp-private-local " +
177+
'-Dmaven.test.skip=true clean deploy -U -B'
178+
}
179+
}
180+
}
158181
}
159182
}
160183
}

‎pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,11 @@
112112
<id>spring-plugins-release</id>
113113
<url>https://repo.spring.io/plugins-release</url>
114114
</pluginRepository>
115+
<pluginRepository>
116+
<id>bintray-plugins</id>
117+
<name>bintray-plugins</name>
118+
<url>https://jcenter.bintray.com</url>
119+
</pluginRepository>
115120
</pluginRepositories>
116121

117122
<dependencyManagement>

0 commit comments

Comments
 (0)