This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 6acb63f Update bc tests to include versions up to 4.9.x
6acb63f is described below
commit 6acb63f91136b5c93bc5a30baf4d06cfaf5eacbf
Author: Enrico Olivelli <[email protected]>
AuthorDate: Wed Oct 2 10:02:54 2019 +0200
Update bc tests to include versions up to 4.9.x
### Motivation
With backward compatibility tests we should cover the compatibility of
current version against old versions, current we are only test current version
against ancient releases.
This change supersedes #1648 from sijie
### Changes
Change the list of versions to test clients and bookie upgrade
Reviewers: Matteo Merli <[email protected]>
This closes #2171 from eolivelli/update_bc_tests
---
.../tests/backwardcompat/TestCompatOldClients.groovy | 5 +----
.../TestCompatUpgradeWithHostnameBookieId.groovy | 5 +----
.../tests/backwardcompat/TestCompatUpgrade.groovy | 14 ++++++++++++--
tests/docker-images/all-released-versions-image/Dockerfile | 4 ++++
.../all-released-versions-image/scripts/install-tarball.sh | 3 +++
.../all-versions-image/scripts/install-all-tarballs.sh | 3 +++
6 files changed, 24 insertions(+), 10 deletions(-)
diff --git
a/tests/backward-compat/current-server-old-clients/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatOldClients.groovy
b/tests/backward-compat/current-server-old-clients/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatOldClients.groovy
index 4fd35d5..5a501bf 100644
---
a/tests/backward-compat/current-server-old-clients/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatOldClients.groovy
+++
b/tests/backward-compat/current-server-old-clients/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatOldClients.groovy
@@ -40,10 +40,7 @@ class TestCompatOldClients {
private static byte[] PASSWD = "foobar".getBytes()
// 4.1.0 doesn't work because metadata format changed
- private def oldClientVersions = ["4.2.0", "4.2.1", "4.2.2", "4.2.3",
"4.2.4",
- "4.3.0", "4.3.1", "4.3.2", "4.4.0",
"4.5.0", "4.5.1",
- "4.6.0", "4.6.1", "4.6.2",
- "4.7.0"]
+ private def oldClientVersions = ["4.4.0", "4.5.1", "4.6.2", "4.7.2",
"4.8.2", "4.9.2" ]
@ArquillianResource
DockerClient docker
diff --git
a/tests/backward-compat/hostname-bookieid/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgradeWithHostnameBookieId.groovy
b/tests/backward-compat/hostname-bookieid/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgradeWithHostnameBookieId.groovy
index e82cbd8..c6cf08a 100644
---
a/tests/backward-compat/hostname-bookieid/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgradeWithHostnameBookieId.groovy
+++
b/tests/backward-compat/hostname-bookieid/src/test/groovy/org/apache/bookkeeper/tests/backwardcompat/TestCompatUpgradeWithHostnameBookieId.groovy
@@ -37,10 +37,7 @@ class TestCompatUpgradeWithHostnameBookieId {
private static final Logger LOG =
LoggerFactory.getLogger(TestCompatUpgradeWithHostnameBookieId.class)
private static byte[] PASSWD = "foobar".getBytes()
- private def oldClientVersions = ["4.1.0", "4.2.0", "4.2.1", "4.2.2",
"4.2.3", "4.2.4",
- "4.3.0", "4.3.1", "4.3.2", "4.4.0",
"4.5.0", "4.5.1",
- "4.6.0", "4.6.1", "4.6.2",
- "4.7.0"]
+ private def oldClientVersions = ["4.4.0", "4.5.1", "4.6.2", "4.7.2",
"4.8.2", "4.9.2"]
@ArquillianResource
DockerClient docker
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 1a3f296..23d7b9f 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
@@ -192,7 +192,17 @@ class TestCompatUpgrade {
}
@Test
- public void test470toCurrentMaster() throws Exception {
- testUpgrade("4.7.0", System.getProperty("currentVersion"))
+ public void test470to471() throws Exception {
+ testUpgrade("4.7.0", "4.7.1")
+ }
+
+ @Test
+ public void test471to472() throws Exception {
+ testUpgrade("4.7.1", "4.7.2")
+ }
+
+ @Test
+ public void test472toCurrentMaster() throws Exception {
+ testUpgrade("4.7.2", System.getProperty("currentVersion"))
}
}
diff --git a/tests/docker-images/all-released-versions-image/Dockerfile
b/tests/docker-images/all-released-versions-image/Dockerfile
index abe3d65..f149349 100644
--- a/tests/docker-images/all-released-versions-image/Dockerfile
+++ b/tests/docker-images/all-released-versions-image/Dockerfile
@@ -48,6 +48,10 @@ RUN wget -nv
https://archive.apache.org/dist/bookkeeper/bookkeeper-4.6.0/bookkee
RUN wget -nv
https://archive.apache.org/dist/bookkeeper/bookkeeper-4.6.1/bookkeeper-server-4.6.1-bin.tar.gz{,.sha1,.md5,.asc}
RUN wget -nv
https://archive.apache.org/dist/bookkeeper/bookkeeper-4.6.2/bookkeeper-server-4.6.2-bin.tar.gz{,.sha1,.asc}
RUN wget -nv
https://archive.apache.org/dist/bookkeeper/bookkeeper-4.7.0/bookkeeper-server-4.7.0-bin.tar.gz{,.sha1,.asc}
+RUN wget -nv
https://archive.apache.org/dist/bookkeeper/bookkeeper-4.7.1/bookkeeper-server-4.7.1-bin.tar.gz{,.sha1,.asc}
+RUN wget -nv
https://archive.apache.org/dist/bookkeeper/bookkeeper-4.7.2/bookkeeper-server-4.7.2-bin.tar.gz{,.sha512,.asc}
+RUN wget -nv
https://archive.apache.org/dist/bookkeeper/bookkeeper-4.8.2/bookkeeper-server-4.8.2-bin.tar.gz{,.sha512,.asc}
+RUN wget -nv
https://archive.apache.org/dist/bookkeeper/bookkeeper-4.9.2/bookkeeper-server-4.9.2-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
RUN wget -nv
http://svn.apache.org/repos/asf/zookeeper/bookkeeper/dist/KEYS?p=1620552 -O
KEYS.old
diff --git
a/tests/docker-images/all-released-versions-image/scripts/install-tarball.sh
b/tests/docker-images/all-released-versions-image/scripts/install-tarball.sh
index d4cfb59..666a541 100755
--- a/tests/docker-images/all-released-versions-image/scripts/install-tarball.sh
+++ b/tests/docker-images/all-released-versions-image/scripts/install-tarball.sh
@@ -25,6 +25,9 @@ TARBALL=$1
if [ -f $TARBALL.sha1 ]; then
sha1sum --check $TARBALL.sha1 > /dev/null
fi
+if [ -f $TARBALL.sha512 ]; then
+ sha512sum --check $TARBALL.sha512 > /dev/null
+fi
if [ -f $T.md5 ]; then
md5sum --check $TARBALL.md5 > /dev/null
fi
diff --git
a/tests/docker-images/all-versions-image/scripts/install-all-tarballs.sh
b/tests/docker-images/all-versions-image/scripts/install-all-tarballs.sh
index 261bf7b..af9894e 100644
--- a/tests/docker-images/all-versions-image/scripts/install-all-tarballs.sh
+++ b/tests/docker-images/all-versions-image/scripts/install-all-tarballs.sh
@@ -59,6 +59,9 @@ for T in bookkeeper-{,dist-}server-*-bin.tar.gz; do
if [ -f $T.sha1 ]; then
sha1sum --check $T.sha1 > /dev/null
fi
+ if [ -f $T.sha512 ]; then
+ sha512sum --check $T.sha512 > /dev/null
+ fi
if [ -f $T.md5 ]; then
md5sum --check $T.md5 > /dev/null
fi
