@@ -48,64 +48,6 @@ pipeline {
48
48
}
49
49
}
50
50
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
-
109
51
stage(' Release to artifactory' ) {
110
52
when {
111
53
anyOf {
@@ -125,7 +67,7 @@ pipeline {
125
67
steps {
126
68
script {
127
69
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' ]) {
129
71
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 ' +
130
72
' -Dartifactory.server=https://repo.spring.io ' +
131
73
" -Dartifactory.username=${ ARTIFACTORY_USR} " +
0 commit comments