Skip to content

Commit ab8fadf

Browse files
committed
Move baseline build to JDK17.
Closes #1057
1 parent a423bdd commit ab8fadf

File tree

1 file changed

+5
-63
lines changed

1 file changed

+5
-63
lines changed

Jenkinsfile

+5-63
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,7 +12,7 @@ pipeline {
1212
}
1313

1414
stages {
15-
stage("test: baseline (jdk8)") {
15+
stage("test: baseline (jdk17)") {
1616
when {
1717
anyOf {
1818
branch 'main'
@@ -32,7 +32,7 @@ pipeline {
3232
steps {
3333
script {
3434
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') {
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,all-dbs ci/test.sh"
3838
sh "ci/clean.sh"
@@ -42,64 +42,6 @@ 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 (jdk17)") {
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('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') {
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 {
10547
anyOf {
@@ -119,7 +61,7 @@ pipeline {
11961
steps {
12062
script {
12163
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
122-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
64+
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
12365
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-jdbc-non-root ' +
12466
'-Dartifactory.server=https://repo.spring.io ' +
12567
"-Dartifactory.username=${ARTIFACTORY_USR} " +
@@ -150,7 +92,7 @@ pipeline {
15092
steps {
15193
script {
15294
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
153-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
95+
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
15496
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-jdbc-non-root ' +
15597
'-Dartifactory.server=https://repo.spring.io ' +
15698
"-Dartifactory.username=${ARTIFACTORY_USR} " +

0 commit comments

Comments
 (0)