Skip to content

Commit 31707a0

Browse files
schauderchristophstrobl
authored andcommitted
Move baseline build to JDK17.
Closes #2312
1 parent 0ccec17 commit 31707a0

File tree

1 file changed

+30
-51
lines changed

1 file changed

+30
-51
lines changed

Jenkinsfile

+30-51
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
beforeAgent(true)
1818
anyOf {
@@ -31,7 +31,7 @@ pipeline {
3131
steps {
3232
script {
3333
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
34-
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+
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') {
3535
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
3636
sh 'PROFILE=all-dbs ci/test.sh'
3737
sh "ci/clean.sh"
@@ -41,62 +41,43 @@ pipeline {
4141
}
4242
}
4343

44-
stage("Test other configurations") {
44+
stage('Release to artifactory') {
4545
when {
4646
beforeAgent(true)
47-
allOf {
47+
anyOf {
4848
branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
4949
not { triggeredBy 'UpstreamCause' }
5050
}
5151
}
52-
parallel {
53-
stage("test: baseline (jdk11)") {
54-
agent {
55-
label 'data'
56-
}
57-
options { timeout(time: 30, unit: 'MINUTES') }
58-
environment {
59-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
60-
}
61-
steps {
62-
script {
63-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
64-
docker.image('adoptopenjdk/openjdk11:latest').inside('-v $HOME:/tmp/jenkins-home') {
65-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
66-
}
67-
}
68-
}
69-
}
70-
}
52+
agent {
53+
label 'data'
54+
}
55+
options { timeout(time: 20, unit: 'MINUTES') }
7156

72-
stage("test: baseline (jdk17)") {
73-
agent {
74-
label 'data'
75-
}
76-
options { timeout(time: 30, unit: 'MINUTES') }
77-
environment {
78-
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
79-
}
80-
steps {
81-
script {
82-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
83-
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
84-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
85-
}
86-
}
57+
environment {
58+
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
59+
}
60+
61+
steps {
62+
script {
63+
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
64+
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
65+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
66+
'-Dartifactory.server=https://repo.spring.io ' +
67+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
68+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
69+
"-Dartifactory.staging-repository=libs-snapshot-local " +
70+
"-Dartifactory.build-name=spring-data-jpa " +
71+
"-Dartifactory.build-number=${BUILD_NUMBER} " +
72+
'-Dmaven.test.skip=true clean deploy -U -B'
8773
}
8874
}
8975
}
9076
}
9177
}
92-
93-
stage('Release to artifactory') {
78+
stage('Publish documentation') {
9479
when {
95-
beforeAgent(true)
96-
anyOf {
97-
branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
98-
not { triggeredBy 'UpstreamCause' }
99-
}
80+
branch 'main'
10081
}
10182
agent {
10283
label 'data'
@@ -110,14 +91,12 @@ pipeline {
11091
steps {
11192
script {
11293
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
113-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
114-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
94+
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
95+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
11596
'-Dartifactory.server=https://repo.spring.io ' +
11697
"-Dartifactory.username=${ARTIFACTORY_USR} " +
11798
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
118-
"-Dartifactory.staging-repository=libs-snapshot-local " +
119-
"-Dartifactory.build-name=spring-data-jpa " +
120-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
99+
"-Dartifactory.distribution-repository=temp-private-local " +
121100
'-Dmaven.test.skip=true clean deploy -U -B'
122101
}
123102
}

0 commit comments

Comments
 (0)