Skip to content

Commit 4c9d493

Browse files
mp911demeistermeier
mp911de
authored and
meistermeier
committed
GH-2394 Enable CI pipeline for 7.0.x branch.
See #2394
1 parent d6a8e79 commit 4c9d493

File tree

2 files changed

+10
-107
lines changed

2 files changed

+10
-107
lines changed

‎Jenkinsfile

Lines changed: 9 additions & 94 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,10 +12,11 @@ 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
}
@@ -32,7 +33,7 @@ pipeline {
3233
steps {
3334
script {
3435
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') {
36+
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') {
3637
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
3738
sh "PROFILE=none ci/test.sh"
3839
sh "ci/clean.sh"
@@ -42,68 +43,11 @@ pipeline {
4243
}
4344
}
4445

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=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=java11 ci/test.sh"
94-
sh "ci/clean.sh"
95-
}
96-
}
97-
}
98-
}
99-
}
100-
}
101-
}
102-
10346
stage('Release to artifactory') {
10447
when {
48+
beforeAgent(true)
10549
anyOf {
106-
branch 'main'
50+
branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
10751
not { triggeredBy 'UpstreamCause' }
10852
}
10953
}
@@ -119,8 +63,8 @@ pipeline {
11963
steps {
12064
script {
12165
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
122-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
123-
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-neo4j-non-root ' +
66+
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
67+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home --add-opens java.base/java.lang=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j-non-root ' +
12468
'-Dartifactory.server=https://repo.spring.io ' +
12569
"-Dartifactory.username=${ARTIFACTORY_USR} " +
12670
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
@@ -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-neo4j-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 {

‎ci/test.sh

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,7 @@
22

33
set -euo pipefail
44

5-
# Checking for the major class versions seems more sane than fiddling around with the
6-
# various formats the different JDKs offer
7-
JAVA_VERSION=`javap -verbose java.lang.String | grep "major version" | cut -d " " -f5`
8-
ADDITIONAL_JAVA_OPS=""
9-
10-
if [[ "$JAVA_VERSION" -ge 60 ]]
11-
then
12-
# SDN 6 itself does not need this, but the embedded Neo4j database used by jQAssistant during verification
13-
# of SDN 6 requires it.
14-
ADDITIONAL_JAVA_OPS="--add-opens java.base/java.lang=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED"
15-
fi
16-
175
mkdir -p /tmp/jenkins-home
186
chown -R 1001:1001 .
19-
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home $ADDITIONAL_JAVA_OPS" \
7+
MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home " \
208
./mvnw -s settings.xml -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-neo4j

0 commit comments

Comments
 (0)