Skip to content

Commit 73eb49d

Browse files
committed
Update Jenkinsfile for Java 17 build.
See #1278
1 parent 49e7de0 commit 73eb49d

File tree

1 file changed

+10
-95
lines changed

1 file changed

+10
-95
lines changed

Jenkinsfile

Lines changed: 10 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pipeline {
33

44
triggers {
55
pollSCM 'H/10 * * * *'
6-
upstream(upstreamProjects: "spring-data-commons/main", threshold: hudson.model.Result.SUCCESS)
6+
upstream(upstreamProjects: "spring-data-commons/3.0.x", threshold: hudson.model.Result.SUCCESS)
77
}
88

99
options {
@@ -12,27 +12,27 @@ pipeline {
1212
}
1313

1414
stages {
15-
stage("test: baseline (jdk8)") {
15+
stage("test: baseline (Java 17)") {
1616
when {
17+
beforeAgent(true)
1718
anyOf {
18-
branch 'main'
19+
branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
1920
not { triggeredBy 'UpstreamCause' }
2021
}
2122
}
2223
agent {
2324
label 'data'
2425
}
2526
options { timeout(time: 30, unit: 'MINUTES') }
26-
2727
environment {
2828
DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
2929
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
3030
}
31-
3231
steps {
3332
script {
3433
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
35-
docker.image('adoptopenjdk/openjdk8:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
34+
sh 'mkdir -p /tmp/jenkins-home'
35+
docker.image('openjdk:17-bullseye').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
3636
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
3737
sh 'PROFILE=ci ci/test.sh'
3838
sh "ci/clean.sh"
@@ -42,68 +42,11 @@ pipeline {
4242
}
4343
}
4444

45-
stage("Test other configurations") {
46-
when {
47-
allOf {
48-
branch 'main'
49-
not { triggeredBy 'UpstreamCause' }
50-
}
51-
}
52-
parallel {
53-
stage("test: baseline (jdk11)") {
54-
agent {
55-
label 'data'
56-
}
57-
options { timeout(time: 30, unit: 'MINUTES') }
58-
59-
environment {
60-
DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
61-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
62-
}
63-
64-
steps {
65-
script {
66-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
67-
docker.image('adoptopenjdk/openjdk11:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
68-
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
69-
sh 'PROFILE=ci,java11 ci/test.sh'
70-
sh "ci/clean.sh"
71-
}
72-
}
73-
}
74-
}
75-
}
76-
77-
stage("test: baseline (jdk16)") {
78-
agent {
79-
label 'data'
80-
}
81-
options { timeout(time: 30, unit: 'MINUTES') }
82-
83-
environment {
84-
DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
85-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
86-
}
87-
88-
steps {
89-
script {
90-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
91-
docker.image('adoptopenjdk/openjdk16:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') {
92-
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
93-
sh 'PROFILE=ci,java11 ci/test.sh'
94-
sh "ci/clean.sh"
95-
}
96-
}
97-
}
98-
}
99-
}
100-
}
101-
}
102-
10345
stage('Release to artifactory') {
10446
when {
47+
beforeAgent(true)
10548
anyOf {
106-
branch 'main'
49+
branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
10750
not { triggeredBy 'UpstreamCause' }
10851
}
10952
}
@@ -119,7 +62,8 @@ pipeline {
11962
steps {
12063
script {
12164
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
122-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
65+
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
66+
sh 'mkdir -p /tmp/jenkins-home'
12367
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase-non-root ' +
12468
'-Dartifactory.server=https://repo.spring.io ' +
12569
"-Dartifactory.username=${ARTIFACTORY_USR} " +
@@ -133,35 +77,6 @@ pipeline {
13377
}
13478
}
13579
}
136-
137-
stage('Publish documentation') {
138-
when {
139-
branch 'main'
140-
}
141-
agent {
142-
label 'data'
143-
}
144-
options { timeout(time: 20, unit: 'MINUTES') }
145-
146-
environment {
147-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
148-
}
149-
150-
steps {
151-
script {
152-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
153-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
154-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-couchbase-non-root ' +
155-
'-Dartifactory.server=https://repo.spring.io ' +
156-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
157-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
158-
"-Dartifactory.distribution-repository=temp-private-local " +
159-
'-Dmaven.test.skip=true clean deploy -U -B'
160-
}
161-
}
162-
}
163-
}
164-
}
16580
}
16681

16782
post {

0 commit comments

Comments
 (0)