Skip to content

Commit 1e40558

Browse files
committed
Upgrade to Valkey 8.0.2.
Close #3094
1 parent 939af14 commit 1e40558

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

Jenkinsfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ pipeline {
6060
}
6161
}
6262
}
63-
stage('Publish JDK 17 + Valkey 7.2 Docker Image') {
63+
stage('Publish JDK 17 + Valkey 8.0 Docker Image') {
6464
when {
6565
anyOf {
66-
changeset "ci/openjdk17-valkey-7.2/Dockerfile"
66+
changeset "ci/openjdk17-valkey-8.0/Dockerfile"
6767
changeset "Makefile"
6868
changeset "ci/pipeline.properties"
6969
}
@@ -73,7 +73,7 @@ pipeline {
7373

7474
steps {
7575
script {
76-
def image = docker.build("springci/spring-data-with-valkey-7.2:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg VERSION=${p['docker.redis.7.version']} -f ci/openjdk17-redis-7.2/Dockerfile .")
76+
def image = docker.build("springci/spring-data-with-valkey-8.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg VERSION=${p['docker.valkey.8.version']} -f ci/openjdk17-valkey-8.0/Dockerfile .")
7777
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
7878
image.push()
7979
}
@@ -197,7 +197,7 @@ pipeline {
197197
}
198198
}
199199

200-
stage("test: Valkey 7") {
200+
stage("test: Valkey 8") {
201201
agent {
202202
label 'data'
203203
}
@@ -209,7 +209,7 @@ pipeline {
209209
steps {
210210
script {
211211
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
212-
docker.image("springci/spring-data-with-valkey-7.2:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
212+
docker.image("springci/spring-data-with-valkey-8.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
213213
sh "PROFILE=none LONG_TESTS=true JENKINS_USER_NAME=${p['jenkins.user.name']} ci/test.sh"
214214
}
215215
}

Makefile

+1-1
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:=7.2.5
15+
VERSION?=7.2.5
1616
PROJECT?=redis
1717
GH_ORG?=redis
1818
SPRING_PROFILE?=ci
File renamed without changes.

ci/pipeline.properties

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ docker.mongodb.8.0.version=8.0.0
1616
# Supported versions of Redis
1717
docker.redis.6.version=6.2.13
1818
docker.redis.7.version=7.2.4
19+
docker.valkey.8.version=8.0.2
1920

2021
# Supported versions of Cassandra
2122
docker.cassandra.3.version=3.11.16

0 commit comments

Comments
 (0)