From 314f043dd5a1ceefae481d29579f069edfd46dac Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Thu, 4 Mar 2021 10:42:21 +0100 Subject: [PATCH 1/4] Prepare issue branch. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b20e7c9dcc..c4bfaf99c8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-redis - 2.5.0-SNAPSHOT + 2.5.0-GH-1990-SNAPSHOT Spring Data Redis From b1a75b3030851afc6a229bdeba358053ad299193 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Thu, 4 Mar 2021 10:42:26 +0100 Subject: [PATCH 2/4] Give Redis 6.2.1 a try on CI --- ci/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test.sh b/ci/test.sh index a0ce00d897..d4df59e5d7 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -8,7 +8,7 @@ rm -f work cwd=$(pwd) # Launch Redis in proper configuration -pushd /tmp && ln -s /work && make -f $cwd/Makefile start && popd +pushd /tmp && ln -s /work && make -f $cwd/Makefile start REDIS_VERSION=6.2.1 && popd # Execute maven test MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean test -P${PROFILE} -DrunLongTests=${LONG_TESTS:-false} -B From f7ca3dcf18ca70261bebe6bc527dde1244765f58 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Thu, 4 Mar 2021 11:20:30 +0100 Subject: [PATCH 3/4] mess with docker & jenkins --- Jenkinsfile | 24 ++++++++++++------------ ci/openjdk11-redis-6.2/Dockerfile | 13 +++++++++++++ ci/openjdk15-redis-6.2/Dockerfile | 13 +++++++++++++ ci/openjdk8-redis-6.2/Dockerfile | 12 ++++++++++++ 4 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 ci/openjdk11-redis-6.2/Dockerfile create mode 100644 ci/openjdk15-redis-6.2/Dockerfile create mode 100644 ci/openjdk8-redis-6.2/Dockerfile diff --git a/Jenkinsfile b/Jenkinsfile index 7365e56189..6a50e3448e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,10 +14,10 @@ pipeline { stages { stage("Docker images") { parallel { - stage('Publish OpenJDK 8 + Redis 6.0 docker image') { + stage('Publish OpenJDK 8 + Redis 6.2 docker image') { when { anyOf { - changeset "ci/openjdk8-redis-6.0/**" + changeset "ci/openjdk8-redis-6.2/**" changeset "Makefile" } } @@ -26,17 +26,17 @@ pipeline { steps { script { - def image = docker.build("springci/spring-data-openjdk8-with-redis-6.0", "-f ci/openjdk8-redis-6.0/Dockerfile .") + def image = docker.build("springci/spring-data-openjdk8-with-redis-6.2", "-f ci/openjdk8-redis-6.2/Dockerfile .") docker.withRegistry('', 'hub.docker.com-springbuildmaster') { image.push() } } } } - stage('Publish OpenJDK 11 + Redis 6.0 docker image') { + stage('Publish OpenJDK 11 + Redis 6.2 docker image') { when { anyOf { - changeset "ci/openjdk11-redis-6.0/**" + changeset "ci/openjdk11-redis-6.2/**" changeset "Makefile" } } @@ -45,17 +45,17 @@ pipeline { steps { script { - def image = docker.build("springci/spring-data-openjdk11-with-redis-6.0", "-f ci/openjdk11-redis-6.0/Dockerfile .") + def image = docker.build("springci/spring-data-openjdk11-with-redis-6.2", "-f ci/openjdk11-redis-6.2/Dockerfile .") docker.withRegistry('', 'hub.docker.com-springbuildmaster') { image.push() } } } } - stage('Publish OpenJDK 15 + Redis 6.0 docker image') { + stage('Publish OpenJDK 15 + Redis 6.2 docker image') { when { anyOf { - changeset "ci/openjdk15-redis-6.0/**" + changeset "ci/openjdk15-redis-6.2/**" changeset "Makefile" } } @@ -64,7 +64,7 @@ pipeline { steps { script { - def image = docker.build("springci/spring-data-openjdk15-with-redis-6.0", "-f ci/openjdk15-redis-6.0/Dockerfile .") + def image = docker.build("springci/spring-data-openjdk15-with-redis-6.2", "-f ci/openjdk15-redis-6.2/Dockerfile .") docker.withRegistry('', 'hub.docker.com-springbuildmaster') { image.push() } @@ -88,7 +88,7 @@ pipeline { steps { script { docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('springci/spring-data-openjdk8-with-redis-6.0:latest').inside('-v $HOME:/tmp/jenkins-home') { + docker.image('springci/spring-data-openjdk8-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') { sh 'PROFILE=none LONG_TESTS=true ci/test.sh' } } @@ -112,7 +112,7 @@ pipeline { steps { script { docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('springci/spring-data-openjdk11-with-redis-6.0:latest').inside('-v $HOME:/tmp/jenkins-home') { + docker.image('springci/spring-data-openjdk11-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') { sh 'PROFILE=java11 ci/test.sh' } } @@ -127,7 +127,7 @@ pipeline { steps { script { docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('springci/spring-data-openjdk15-with-redis-6.0:latest').inside('-v $HOME:/tmp/jenkins-home') { + docker.image('springci/spring-data-openjdk15-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') { sh 'PROFILE=java11 ci/test.sh' } } diff --git a/ci/openjdk11-redis-6.2/Dockerfile b/ci/openjdk11-redis-6.2/Dockerfile new file mode 100644 index 0000000000..284f7d64c8 --- /dev/null +++ b/ci/openjdk11-redis-6.2/Dockerfile @@ -0,0 +1,13 @@ +FROM adoptopenjdk/openjdk11:latest + +# Copy Spring Data Redis's Makefile into the container +COPY ./Makefile / + +RUN set -eux; \ + apt-get update ; \ + apt-get install -y build-essential ; \ + make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.1; \ + chmod -R o+rw work; \ + apt-get clean; \ + rm -rf /var/lib/apt/lists/*; + diff --git a/ci/openjdk15-redis-6.2/Dockerfile b/ci/openjdk15-redis-6.2/Dockerfile new file mode 100644 index 0000000000..f25fe6cd2d --- /dev/null +++ b/ci/openjdk15-redis-6.2/Dockerfile @@ -0,0 +1,13 @@ +FROM adoptopenjdk/openjdk15:latest + +# Copy Spring Data Redis's Makefile into the container +COPY ./Makefile / + +RUN set -eux; \ + apt-get update ; \ + apt-get install -y build-essential ; \ + make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.1; \ + chmod -R o+rw work; \ + apt-get clean; \ + rm -rf /var/lib/apt/lists/*; + diff --git a/ci/openjdk8-redis-6.2/Dockerfile b/ci/openjdk8-redis-6.2/Dockerfile new file mode 100644 index 0000000000..7181f3903e --- /dev/null +++ b/ci/openjdk8-redis-6.2/Dockerfile @@ -0,0 +1,12 @@ +FROM adoptopenjdk/openjdk8:latest + +# Copy Spring Data Redis's Makefile into the container +COPY ./Makefile / + +RUN set -eux; \ + apt-get update ; \ + apt-get install -y build-essential ; \ + make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.1; \ + chmod -R o+rw work; \ + apt-get clean; \ + rm -rf /var/lib/apt/lists/*; From 33bfdb1b88d87b858ed15d719b69623b657f8e8b Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Thu, 4 Mar 2021 14:29:15 +0100 Subject: [PATCH 4/4] Remove 6.0 Dockerfiles --- ci/openjdk11-redis-6.0/Dockerfile | 13 ------------- ci/openjdk11-redis-6.2/Dockerfile | 1 - ci/openjdk15-redis-6.0/Dockerfile | 13 ------------- ci/openjdk15-redis-6.2/Dockerfile | 1 - ci/openjdk8-redis-6.0/Dockerfile | 12 ------------ ci/test.sh | 2 +- 6 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 ci/openjdk11-redis-6.0/Dockerfile delete mode 100644 ci/openjdk15-redis-6.0/Dockerfile delete mode 100644 ci/openjdk8-redis-6.0/Dockerfile diff --git a/ci/openjdk11-redis-6.0/Dockerfile b/ci/openjdk11-redis-6.0/Dockerfile deleted file mode 100644 index 8f249302dd..0000000000 --- a/ci/openjdk11-redis-6.0/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM adoptopenjdk/openjdk11:latest - -# Copy Spring Data Redis's Makefile into the container -COPY ./Makefile / - -RUN set -eux; \ - apt-get update ; \ - apt-get install -y build-essential ; \ - make work/redis/bin/redis-cli work/redis/bin/redis-server; \ - chmod -R o+rw work; \ - apt-get clean; \ - rm -rf /var/lib/apt/lists/*; - diff --git a/ci/openjdk11-redis-6.2/Dockerfile b/ci/openjdk11-redis-6.2/Dockerfile index 284f7d64c8..5ab4fd42c1 100644 --- a/ci/openjdk11-redis-6.2/Dockerfile +++ b/ci/openjdk11-redis-6.2/Dockerfile @@ -10,4 +10,3 @@ RUN set -eux; \ chmod -R o+rw work; \ apt-get clean; \ rm -rf /var/lib/apt/lists/*; - diff --git a/ci/openjdk15-redis-6.0/Dockerfile b/ci/openjdk15-redis-6.0/Dockerfile deleted file mode 100644 index 8d9064d2d5..0000000000 --- a/ci/openjdk15-redis-6.0/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM adoptopenjdk/openjdk15:latest - -# Copy Spring Data Redis's Makefile into the container -COPY ./Makefile / - -RUN set -eux; \ - apt-get update ; \ - apt-get install -y build-essential ; \ - make work/redis/bin/redis-cli work/redis/bin/redis-server; \ - chmod -R o+rw work; \ - apt-get clean; \ - rm -rf /var/lib/apt/lists/*; - diff --git a/ci/openjdk15-redis-6.2/Dockerfile b/ci/openjdk15-redis-6.2/Dockerfile index f25fe6cd2d..09f9ad25d1 100644 --- a/ci/openjdk15-redis-6.2/Dockerfile +++ b/ci/openjdk15-redis-6.2/Dockerfile @@ -10,4 +10,3 @@ RUN set -eux; \ chmod -R o+rw work; \ apt-get clean; \ rm -rf /var/lib/apt/lists/*; - diff --git a/ci/openjdk8-redis-6.0/Dockerfile b/ci/openjdk8-redis-6.0/Dockerfile deleted file mode 100644 index 516cf6fd9b..0000000000 --- a/ci/openjdk8-redis-6.0/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM adoptopenjdk/openjdk8:latest - -# Copy Spring Data Redis's Makefile into the container -COPY ./Makefile / - -RUN set -eux; \ - apt-get update ; \ - apt-get install -y build-essential ; \ - make work/redis/bin/redis-cli work/redis/bin/redis-server; \ - chmod -R o+rw work; \ - apt-get clean; \ - rm -rf /var/lib/apt/lists/*; diff --git a/ci/test.sh b/ci/test.sh index d4df59e5d7..a0ce00d897 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -8,7 +8,7 @@ rm -f work cwd=$(pwd) # Launch Redis in proper configuration -pushd /tmp && ln -s /work && make -f $cwd/Makefile start REDIS_VERSION=6.2.1 && popd +pushd /tmp && ln -s /work && make -f $cwd/Makefile start && popd # Execute maven test MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean test -P${PROFILE} -DrunLongTests=${LONG_TESTS:-false} -B