Skip to content

Commit 70d00a1

Browse files
committed
GH-2487 - Make Jenkins not fail.
1 parent ce8f364 commit 70d00a1

File tree

1 file changed

+1
-59
lines changed

1 file changed

+1
-59
lines changed

Jenkinsfile

+1-59
Original file line numberDiff line numberDiff line change
@@ -48,64 +48,6 @@ pipeline {
4848
}
4949
}
5050

51-
stage("Test other configurations") {
52-
when {
53-
allOf {
54-
branch 'main'
55-
not { triggeredBy 'UpstreamCause' }
56-
}
57-
}
58-
parallel {
59-
stage("test: baseline (next)") {
60-
agent {
61-
label 'data'
62-
}
63-
options { timeout(time: 30, unit: 'MINUTES') }
64-
65-
environment {
66-
DOCKER_HUB = credentials("${p['docker.credentials']}")
67-
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
68-
}
69-
70-
steps {
71-
script {
72-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
73-
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
74-
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
75-
sh "PROFILE=none ci/test.sh"
76-
sh "ci/clean.sh"
77-
}
78-
}
79-
}
80-
}
81-
}
82-
83-
stage("test: baseline (LTS)") {
84-
agent {
85-
label 'data'
86-
}
87-
options { timeout(time: 30, unit: 'MINUTES') }
88-
89-
environment {
90-
DOCKER_HUB = credentials("${p['docker.credentials']}")
91-
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
92-
}
93-
94-
steps {
95-
script {
96-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
97-
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.docker']) {
98-
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
99-
sh "PROFILE=none ci/test.sh"
100-
sh "ci/clean.sh"
101-
}
102-
}
103-
}
104-
}
105-
}
106-
}
107-
}
108-
10951
stage('Release to artifactory') {
11052
when {
11153
anyOf {
@@ -125,7 +67,7 @@ pipeline {
12567
steps {
12668
script {
12769
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
128-
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
70+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
12971
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 ' +
13072
'-Dartifactory.server=https://repo.spring.io ' +
13173
"-Dartifactory.username=${ARTIFACTORY_USR} " +

0 commit comments

Comments
 (0)