Skip to content

Commit 43b9370

Browse files
committed
Upgrade build to Redis 8.2.
Closes #3248
1 parent 07b4539 commit 43b9370

File tree

5 files changed

+7
-84
lines changed

5 files changed

+7
-84
lines changed

Jenkinsfile

Lines changed: 5 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ pipeline {
2020
stages {
2121
stage("Docker Images") {
2222
parallel {
23-
stage('Publish JDK 25 + Redis 6.2 Docker Image') {
23+
stage('Publish JDK 25 + Redis 8.2 Docker Image') {
2424
when {
2525
anyOf {
26-
changeset "ci/openjdk25-redis-6.2/Dockerfile"
26+
changeset "ci/openjdk25-redis-8.2/Dockerfile"
2727
changeset "Makefile"
2828
changeset "ci/pipeline.properties"
2929
}
@@ -33,27 +33,7 @@ pipeline {
3333

3434
steps {
3535
script {
36-
def image = docker.build("springci/spring-data-with-redis-6.2:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg VERSION=${p['docker.redis.6.version']} -f ci/openjdk25-redis-6.2/Dockerfile .")
37-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
38-
image.push()
39-
}
40-
}
41-
}
42-
}
43-
stage('Publish JDK 25 + Redis 7.2 Docker Image') {
44-
when {
45-
anyOf {
46-
changeset "ci/openjdk25-redis-7.2/Dockerfile"
47-
changeset "Makefile"
48-
changeset "ci/pipeline.properties"
49-
}
50-
}
51-
agent { label 'data' }
52-
options { timeout(time: 20, unit: 'MINUTES') }
53-
54-
steps {
55-
script {
56-
def image = docker.build("springci/spring-data-with-redis-7.2:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg VERSION=${p['docker.redis.7.version']} -f ci/openjdk25-redis-7.2/Dockerfile .")
36+
def image = docker.build("springci/spring-data-with-redis-8.2:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg VERSION=${p['docker.redis.8.version']} -f ci/openjdk25-redis-8.2/Dockerfile .")
5737
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
5838
image.push()
5939
}
@@ -102,7 +82,7 @@ pipeline {
10282
steps {
10383
script {
10484
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
105-
docker.image("springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
85+
docker.image("springci/spring-data-with-redis-8.2:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
10686
sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
10787
}
10888
}
@@ -131,51 +111,13 @@ pipeline {
131111
steps {
132112
script {
133113
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
134-
docker.image("springci/spring-data-with-redis-6.2:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
114+
docker.image("springci/spring-data-with-redis-8.2:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
135115
sh "PROFILE=runtimehints LONG_TESTS=false JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
136116
}
137117
}
138118
}
139119
}
140120
}
141-
stage("test: baseline (next)") {
142-
agent {
143-
label 'data'
144-
}
145-
options { timeout(time: 30, unit: 'MINUTES') }
146-
environment {
147-
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
148-
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
149-
}
150-
steps {
151-
script {
152-
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
153-
docker.image("springci/spring-data-with-redis-6.2:${p['java.next.tag']}").inside(p['docker.java.inside.docker']) {
154-
sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
155-
}
156-
}
157-
}
158-
}
159-
}
160-
stage("test: Redis 7") {
161-
agent {
162-
label 'data'
163-
}
164-
options { timeout(time: 30, unit: 'MINUTES') }
165-
environment {
166-
ARTIFACTORY = credentials("${p['artifactory.credentials']}")
167-
DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
168-
}
169-
steps {
170-
script {
171-
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
172-
docker.image("springci/spring-data-with-redis-7.2:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
173-
sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
174-
}
175-
}
176-
}
177-
}
178-
}
179121

180122
stage("test: Valkey 8") {
181123
agent {

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
VERSION?=8.0.0
15+
VERSION?=8.2.2
1616
PROJECT?=redis
1717
GH_ORG?=redis
1818
SPRING_PROFILE?=ci

ci/openjdk25-redis-7.2/Dockerfile

Lines changed: 0 additions & 20 deletions
This file was deleted.
File renamed without changes.

ci/pipeline.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ docker.mongodb.8.0.version=8.0.9
1414
# Supported versions of Redis
1515
docker.redis.6.version=6.2.13
1616
docker.redis.7.version=7.2.4
17+
docker.redis.8.version=8.2.2
1718
docker.valkey.8.version=8.1.1
1819

1920
# Docker environment settings

0 commit comments

Comments
 (0)