Skip to content

Commit

Permalink
DATAREDIS-1046 - Upgrade to Redis 6 in CI docker images.
Browse files Browse the repository at this point in the history
  • Loading branch information
mp911de committed Sep 14, 2020
1 parent bdbba08 commit 0f29937
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ pipeline {
stages {
stage("Docker images") {
parallel {
stage('Publish OpenJDK 8 + Redis 5.0 docker image') {
stage('Publish OpenJDK 8 + Redis 6.0 docker image') {
when {
anyOf {
changeset "ci/openjdk8-redis-5.0/**"
changeset "ci/openjdk8-redis-6.0/**"
changeset "Makefile"
}
}
Expand All @@ -26,17 +26,17 @@ pipeline {

steps {
script {
def image = docker.build("springci/spring-data-openjdk8-with-redis-5.0", "-f ci/openjdk8-redis-5.0/Dockerfile .")
def image = docker.build("springci/spring-data-openjdk8-with-redis-6.0", "-f ci/openjdk8-redis-6.0/Dockerfile .")
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
image.push()
}
}
}
}
stage('Publish OpenJDK 11 + Redis 5.0 docker image') {
stage('Publish OpenJDK 11 + Redis 6.0 docker image') {
when {
anyOf {
changeset "ci/openjdk11-redis-5.0/**"
changeset "ci/openjdk11-redis-6.0/**"
changeset "Makefile"
}
}
Expand All @@ -45,7 +45,7 @@ pipeline {

steps {
script {
def image = docker.build("springci/spring-data-openjdk11-with-redis-5.0", "-f ci/openjdk11-redis-5.0/Dockerfile .")
def image = docker.build("springci/spring-data-openjdk11-with-redis-6.0", "-f ci/openjdk11-redis-6.0/Dockerfile .")
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
image.push()
}
Expand All @@ -64,7 +64,7 @@ pipeline {
}
agent {
docker {
image 'springci/spring-data-openjdk8-with-redis-5.0:latest'
image 'springci/spring-data-openjdk8-with-redis-6.0:latest'
label 'data'
args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
}
Expand Down Expand Up @@ -103,7 +103,7 @@ pipeline {
stage("test: baseline (jdk11)") {
agent {
docker {
image 'springci/spring-data-openjdk11-with-redis-5.0:latest'
image 'springci/spring-data-openjdk11-with-redis-6.0:latest'
label 'data'
args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

REDIS_VERSION:=6.0.7
REDIS_VERSION:=6.0.8
SPRING_PROFILE?=ci
SHELL=/bin/bash -euo pipefail

Expand Down

0 comments on commit 0f29937

Please sign in to comment.