This is an automated email from the ASF dual-hosted git repository.
sijie 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 e9aeddd [RELEASE-4.7.0] update BC tests
e9aeddd is described below
commit e9aeddd89623bf1cd0c9ecb8ef200c7a3dd47f95
Author: Sijie Guo <[email protected]>
AuthorDate: Mon Apr 23 22:38:17 2018 -0700
[RELEASE-4.7.0] update BC tests
Descriptions of the changes in this PR:
add 4.6.2 and 4.7.0 to BC tests list
Author: Sijie Guo <[email protected]>
Reviewers: Jia Zhai <None>
This closes #1352 from sijie/update_bc_tests
---
.../tests/backwardcompat/TestCompatOldClients.groovy | 3 ++-
.../TestCompatUpgradeWithHostnameBookieId.groovy | 3 ++-
.../tests/backwardcompat/TestCompatUpgrade.groovy | 19 +++++++++++++++++--
.../all-released-versions-image/Dockerfile | 4 +++-
4 files changed, 24 insertions(+), 5 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 5a29fa4..84f48aa 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
@@ -42,7 +42,8 @@ class TestCompatOldClients {
// 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.0", "4.6.1", "4.6.2",
+ "4.7.0"]
@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 134d057..b9b2a9e 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
@@ -39,7 +39,8 @@ class TestCompatUpgradeWithHostnameBookieId {
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.0", "4.6.1", "4.6.2",
+ "4.7.0"]
@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 b834e4d..8e0d8d7 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
@@ -177,7 +177,22 @@ class TestCompatUpgrade {
}
@Test
- public void test460toCurrentMaster() throws Exception {
- testUpgrade("4.6.0", System.getProperty("currentVersion"), false, true)
+ public void test460to461() throws Exception {
+ testUpgrade("4.6.0", "4.6.1")
+ }
+
+ @Test
+ public void test461to462() throws Exception {
+ testUpgrade("4.6.1", "4.6.2")
+ }
+
+ @Test
+ public void test462to470() throws Exception {
+ testUpgrade("4.6.2", "4.7.0")
+ }
+
+ @Test
+ public void test470toCurrentMaster() throws Exception {
+ testUpgrade("4.7.0", System.getProperty("currentVersion"), false, true)
}
}
diff --git a/tests/docker-images/all-released-versions-image/Dockerfile
b/tests/docker-images/all-released-versions-image/Dockerfile
index 1dfc0b3..abe3d65 100644
--- a/tests/docker-images/all-released-versions-image/Dockerfile
+++ b/tests/docker-images/all-released-versions-image/Dockerfile
@@ -46,6 +46,8 @@ RUN wget -nv
https://archive.apache.org/dist/bookkeeper/bookkeeper-4.5.0/bookkee
RUN wget -nv
https://archive.apache.org/dist/bookkeeper/bookkeeper-4.5.1/bookkeeper-server-4.5.1-bin.tar.gz{,.sha1,.md5,.asc}
RUN wget -nv
https://archive.apache.org/dist/bookkeeper/bookkeeper-4.6.0/bookkeeper-server-4.6.0-bin.tar.gz{,.sha1,.md5,.asc}
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/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
@@ -60,4 +62,4 @@ RUN bash /install-all-tarballs.sh && bash
/install-pulsar-tarball.sh && rm -rf /
WORKDIR /
ADD scripts/update-conf-and-boot.sh /update-conf-and-boot.sh
-CMD ["/update-conf-and-boot.sh"]
\ No newline at end of file
+CMD ["/update-conf-and-boot.sh"]
--
To stop receiving notification emails like this one, please contact
[email protected].
