From ed19227599a35c499fdd67b79cbd0a7e48bda610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Boschi?= Date: Sat, 5 Feb 2022 00:10:37 +0100 Subject: [PATCH] [BACKWARD TESTS] add BookKeeper 4.14.4 ### Motivation BK 4.14.4 has been released and we should test it in the upgrade tests Note: for the sake of test performance, we test the upgrades only for the latest releases of each minor release ### Changes * Replaced BK 4.14.3 with 4.14.4 Reviewers: Enrico Olivelli , Andrey Yegorov This closes #2997 from nicoloboschi/tests/add-bk-4144-backward-compat --- .../bookkeeper/tests/backwardcompat/TestCompatUpgrade.groovy | 4 ++-- tests/docker-images/all-released-versions-image/Dockerfile | 2 +- .../tests/integration/utils/BookKeeperClusterUtils.java | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/backward-compat/upgrade/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgrade.groovy b/tests/backward-compat/upgrade/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgrade.groovy index d885e778ff8..e7e9a3170a3 100644 --- a/tests/backward-compat/upgrade/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgrade.groovy +++ b/tests/backward-compat/upgrade/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgrade.groovy @@ -143,11 +143,11 @@ class TestCompatUpgrade { @Test public void test_006_4130to4143() throws Exception { - testUpgrade("4.13.0", "4.14.3") + testUpgrade("4.13.0", "4.14.4") } @Test public void test_007_4143toCurrentMaster() throws Exception { - testUpgrade("4.14.3", BookKeeperClusterUtils.CURRENT_VERSION) + testUpgrade("4.14.4", BookKeeperClusterUtils.CURRENT_VERSION) } } diff --git a/tests/docker-images/all-released-versions-image/Dockerfile b/tests/docker-images/all-released-versions-image/Dockerfile index 9c0301fa205..af2d9651de8 100644 --- a/tests/docker-images/all-released-versions-image/Dockerfile +++ b/tests/docker-images/all-released-versions-image/Dockerfile @@ -38,7 +38,7 @@ RUN wget -nv https://archive.apache.org/dist/bookkeeper/bookkeeper-4.10.0/bookke RUN wget -nv https://archive.apache.org/dist/bookkeeper/bookkeeper-4.11.1/bookkeeper-server-4.11.1-bin.tar.gz{,.sha512,.asc} RUN wget -nv https://archive.apache.org/dist/bookkeeper/bookkeeper-4.12.1/bookkeeper-server-4.12.1-bin.tar.gz{,.sha512,.asc} RUN wget -nv https://archive.apache.org/dist/bookkeeper/bookkeeper-4.13.0/bookkeeper-server-4.13.0-bin.tar.gz{,.sha512,.asc} -RUN wget -nv https://archive.apache.org/dist/bookkeeper/bookkeeper-4.14.3/bookkeeper-server-4.14.3-bin.tar.gz{,.sha512,.asc} +RUN wget -nv https://archive.apache.org/dist/bookkeeper/bookkeeper-4.14.4/bookkeeper-server-4.14.4-bin.tar.gz{,.sha512,.asc} RUN wget -nv https://archive.apache.org/dist/incubator/pulsar/pulsar-1.21.0-incubating/apache-pulsar-1.21.0-incubating-bin.tar.gz{,.asc} RUN wget -nv https://dist.apache.org/repos/dist/release/bookkeeper/KEYS diff --git a/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/BookKeeperClusterUtils.java b/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/BookKeeperClusterUtils.java index 94cdedfab96..a29331131fe 100644 --- a/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/BookKeeperClusterUtils.java +++ b/tests/integration-tests-utils/src/main/java/org/apache/bookkeeper/tests/integration/utils/BookKeeperClusterUtils.java @@ -43,9 +43,10 @@ public class BookKeeperClusterUtils { public static final String CURRENT_VERSION = System.getProperty("currentVersion"); public static final List OLD_CLIENT_VERSIONS = - Arrays.asList("4.8.2", "4.9.2", "4.10.0", "4.11.1", "4.12.1", "4.13.0", "4.14.3"); + Arrays.asList("4.8.2", "4.9.2", "4.10.0", "4.11.1", "4.12.1", "4.13.0", "4.14.4"); private static final List OLD_CLIENT_VERSIONS_WITH_CURRENT_LEDGER_METADATA_FORMAT = - Arrays.asList("4.9.2", "4.10.0", "4.11.1", "4.12.1", "4.13.0", "4.14.3"); + Arrays.asList("4.9.2", "4.10.0", "4.11.1", "4.12.1", "4.13.0", "4.14.4"); + private static final Logger LOG = LoggerFactory.getLogger(BookKeeperClusterUtils.class);