This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/trunk by this push:
new be753b7 Update testing docker images to include cassandra-4.0 branch
and ccm
be753b7 is described below
commit be753b78230d914f30936c3a6239b9c3a6b6bd39
Author: Mick Semb Wever <[email protected]>
AuthorDate: Mon Aug 9 13:38:48 2021 +0200
Update testing docker images to include cassandra-4.0 branch and ccm
patch by Mick Semb Wever; patch by XXX for CASSANDRA-16832
---
docker/testing/ubuntu1910_j11_w_dependencies.docker | 8 +++++---
docker/testing/ubuntu2004_j11_w_dependencies.docker | 8 +++++---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/docker/testing/ubuntu1910_j11_w_dependencies.docker
b/docker/testing/ubuntu1910_j11_w_dependencies.docker
index 2a4fd16..fa4fb55 100644
--- a/docker/testing/ubuntu1910_j11_w_dependencies.docker
+++ b/docker/testing/ubuntu1910_j11_w_dependencies.docker
@@ -21,9 +21,10 @@ WORKDIR /home/cassandra
# Fetch the maven dependencies in advance since this tends to fail at runtime
ARG CASSANDRA_GIT_URL=https://gitbox.apache.org/repos/asf/cassandra.git
RUN /bin/bash -c "git clone ${CASSANDRA_GIT_URL} ~/cassandra && \
- cd ~/cassandra && ant maven-ant-tasks-retrieve-build && \
- git checkout origin/cassandra-3.11 && ant maven-ant-tasks-retrieve-build
&& \
- git checkout origin/cassandra-3.0 && ant maven-ant-tasks-retrieve-build &&
\
+ cd ~/cassandra && ant resolver-dist-lib && \
+ git checkout origin/cassandra-4.0 && ant resolver-dist-lib && \
+ git checkout origin/cassandra-3.11 && ant resolver-dist-lib && \
+ git checkout origin/cassandra-3.0 && ant resolver-dist-lib && \
git checkout origin/cassandra-2.2 && ant maven-ant-tasks-retrieve-build &&
\
git checkout origin/cassandra-2.1 && ant maven-ant-tasks-retrieve-build &&
\
rm -fr ~/cassandra"
@@ -31,6 +32,7 @@ RUN /bin/bash -c "git clone ${CASSANDRA_GIT_URL} ~/cassandra
&& \
# Initialize the CCM git repo as well as this also can fail to clone
RUN /bin/bash -c "source ~/env3.6/bin/activate && \
ccm create -n 1 -v git:trunk test && ccm remove test && \
+ ccm create -n 1 -v git:cassandra-4.0 test && ccm remove test && \
ccm create -n 1 -v git:cassandra-3.11 test && ccm remove test && \
ccm create -n 1 -v git:cassandra-3.0 test && ccm remove test && \
ccm create -n 1 -v git:cassandra-2.2 test && ccm remove test && \
diff --git a/docker/testing/ubuntu2004_j11_w_dependencies.docker
b/docker/testing/ubuntu2004_j11_w_dependencies.docker
index c9ce72f..d55fca9 100644
--- a/docker/testing/ubuntu2004_j11_w_dependencies.docker
+++ b/docker/testing/ubuntu2004_j11_w_dependencies.docker
@@ -21,9 +21,10 @@ WORKDIR /home/cassandra
# Fetch the maven dependencies in advance since this tends to fail at runtime
ARG CASSANDRA_GIT_URL=https://gitbox.apache.org/repos/asf/cassandra.git
RUN /bin/bash -c "git clone ${CASSANDRA_GIT_URL} ~/cassandra && \
- cd ~/cassandra && ant maven-ant-tasks-retrieve-build && \
- git checkout origin/cassandra-3.11 && ant maven-ant-tasks-retrieve-build
&& \
- git checkout origin/cassandra-3.0 && ant maven-ant-tasks-retrieve-build &&
\
+ cd ~/cassandra && ant resolver-dist-lib && \
+ git checkout origin/cassandra-4.0 && ant resolver-dist-lib && \
+ git checkout origin/cassandra-3.11 && ant resolver-dist-lib && \
+ git checkout origin/cassandra-3.0 && ant resolver-dist-lib && \
git checkout origin/cassandra-2.2 && ant maven-ant-tasks-retrieve-build &&
\
git checkout origin/cassandra-2.1 && ant maven-ant-tasks-retrieve-build &&
\
rm -fr ~/cassandra"
@@ -31,6 +32,7 @@ RUN /bin/bash -c "git clone ${CASSANDRA_GIT_URL} ~/cassandra
&& \
# Initialize the CCM git repo as well as this also can fail to clone
RUN /bin/bash -c "source ~/env3.6/bin/activate && \
ccm create -n 1 -v git:trunk test && ccm remove test && \
+ ccm create -n 1 -v git:cassandra-4.0 test && ccm remove test && \
ccm create -n 1 -v git:cassandra-3.11 test && ccm remove test && \
ccm create -n 1 -v git:cassandra-3.0 test && ccm remove test && \
ccm create -n 1 -v git:cassandra-2.2 test && ccm remove test && \
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
