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 a0775a5 Fix ubuntu2004_j11_w_dependencies.docker for 5+ and jdk11,
and all ccm versions
a0775a5 is described below
commit a0775a541b9712e71f5a374cc8bb1a724bf9b5f8
Author: Mick Semb Wever <[email protected]>
AuthorDate: Tue Aug 15 18:19:26 2023 +0200
Fix ubuntu2004_j11_w_dependencies.docker for 5+ and jdk11, and all ccm
versions
patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-18705
---
.../testing/ubuntu2004_j11_w_dependencies.docker | 48 ++++++++++++++--------
1 file changed, 31 insertions(+), 17 deletions(-)
diff --git a/docker/testing/ubuntu2004_j11_w_dependencies.docker
b/docker/testing/ubuntu2004_j11_w_dependencies.docker
index 4b51671..0e692a3 100644
--- a/docker/testing/ubuntu2004_j11_w_dependencies.docker
+++ b/docker/testing/ubuntu2004_j11_w_dependencies.docker
@@ -19,38 +19,52 @@ ENV HOME /home/cassandra
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
+ARG CASSANDRA_GIT_URL=https://github.com/apache/cassandra.git
RUN git config --global http.postBuffer 524288000
-RUN /bin/bash -c "git clone ${CASSANDRA_GIT_URL} ~/cassandra && \
- cd ~/cassandra && ant resolver-dist-lib && \
- git checkout origin/cassandra-5.0 && ant resolver-dist-lib && \
+RUN git clone ${CASSANDRA_GIT_URL} ~/cassandra
+
+# 5+ requires java11
+RUN sudo update-java-alternatives --set java-1.11.0-openjdk-$(dpkg
--print-architecture)
+
+RUN cd ~/cassandra && \
+ ant resolver-dist-lib && \
+ git checkout origin/cassandra-5.0 && ant resolver-dist-lib
+
+# 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-5.0 test && ccm remove test'
+
+# <5 uses java8
+RUN sudo update-java-alternatives --set java-1.8.0-openjdk-$(dpkg
--print-architecture)
+
+RUN cd ~/cassandra && \
git checkout origin/cassandra-4.1 && 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"
+ git checkout origin/cassandra-2.1 && ant maven-ant-tasks-retrieve-build
# 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-5.0 test && ccm remove test && \
+RUN /bin/bash -c 'source ~/env3.6/bin/activate && \
ccm create -n 1 -v git:cassandra-4.1 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 && \
- ccm create -n 1 -v git:cassandra-2.1 test && ccm remove test"
+ ccm create -n 1 -v git:cassandra-2.1 test && ccm remove test'
+
+RUN rm -fr ~/cassandra
# Initialize ccm versions. right side of each sequence needs to be updated
with new releases.
# this can be checked with:
# `curl -s https://downloads.apache.org/cassandra/ | grep -oP
'(?<=href=\")[0-9]+\.[0-9]+\.[0-9]+(?=)' | sort -V | uniq -w 3`
-RUN /bin/bash -c "source ~/env3.6/bin/activate && \
- for i in {1..22} ; do ccm create -n 1 -v 2.1.$i test && ccm remove test ;
done && \
- for i in {1..19} ; do ccm create -n 1 -v 2.2.$i test && ccm remove test ;
done && \
- for i in {1..29} ; do ccm create -n 1 -v 3.0.$i test && ccm remove test ;
done && \
- for i in {1..15} ; do ccm create -n 1 -v 3.11.$i test && ccm remove test ;
done && \
- for i in {1..11} ; do ccm create -n 1 -v 4.0.$i test && ccm remove test ;
done && \
- for i in {1..3} ; do ccm create -n 1 -v 4.1.$i test && ccm remove test ;
done"
+RUN bash -c 'source ~/env3.6/bin/activate && \
+ for i in {1..22} ; do echo $i ; ccm create --quiet -n 1 -v binary:2.1.$i
test && ccm remove test ; done && \
+ for i in {1..19} ; do echo $i ; ccm create --quiet -n 1 -v binary:2.2.$i
test && ccm remove test ; done && \
+ for i in {1..29} ; do echo $i ; ccm create --quiet -n 1 -v binary:3.0.$i
test && ccm remove test ; done && \
+ for i in {1..15} ; do echo $i ; ccm create --quiet -n 1 -v binary:3.11.$i
test && ccm remove test ; done && \
+ for i in {1..11} ; do echo $i ; ccm create --quiet -n 1 -v binary:4.0.$i
test && ccm remove test ; done && \
+ for i in {1..3} ; do echo $i ; ccm create --quiet -n 1 -v binary:4.1.$i
test && ccm remove test ; done'
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
