jmckenzie-dev commented on code in PR #2787:
URL: https://github.com/apache/cassandra/pull/2787#discussion_r1360671850
##########
.build/docker/ubuntu2004_test.docker:
##########
@@ -146,11 +131,26 @@ RUN /bin/bash -c "export CASS_DRIVER_NO_CYTHON=1
CASS_DRIVER_NO_EXTENSIONS=1 \
&& pip3 freeze --user"
# Initialize the CCM git repo as well as this also can fail to clone
-RUN /bin/bash -c "source ${BUILD_HOME}/env3.6/bin/activate && \
- ccm create -n 1 -v git:trunk test && ccm remove test && \
+RUN /bin/bash -c "source ${BUILD_HOME}/env3.7/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"
+# 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 bash -c 'source ~/env3.7/bin/activate && \
+ for i in {1..11} ; do echo $i ; ccm create --quiet -n 1 -v binary:4.0.$i
test && ccm remove test ; done && \
Review Comment:
So we're intentionally trying to init 4.0.1 to 4.0.11 right? And when a
4.0.12 hits we'll need to manually add that here?
If we want to be... clever? Hacky? We could do something like:
`git tag | grep -E 'cassandra-4.0.[0-9]+$' | cut -d '.' -f 3 | sort -nr |
head -n 1`
to parse out the latest version at time of docker image creation and iterate
through all up to that point to init them. Alternatively, or along with that,
might be nice to add a comment to indicate why we have the top end of the
sequence here since it's non-obvious.
##########
.build/run-tests.sh:
##########
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
Review Comment:
Was this an accidental change or intentional? If intentional (for my own
education) - why the change?
##########
.build/docker/run-tests.sh:
##########
@@ -69,8 +69,11 @@ if [[ ! "${java_version}" =~ $regx_java_version ]]; then
exit 1
fi
-python_version="3.6"
-command -v python >/dev/null 2>&1 && python_version="$(python -V | awk '{print
$2}' | awk -F'.' '{print $1"."$2}')"
+# allow python version override, otherwise default to current python version
or 3.7
+if [ "x" == "x${python_version}" ] ; then
+ command -v python >/dev/null 2>&1 && python_version="$(python -V 2>&1 |
awk '{print $2}' | awk -F'.' '{print $1"."$2}')"
+ python_version="${python_version:-3.7}"
Review Comment:
I don't have a horse in this race, but why 3.7? vs. 3.8, 3.11, etc.
##########
.build/docker/ubuntu2004_test.docker:
##########
@@ -41,7 +38,7 @@ RUN echo 'Acquire::http::Timeout "60";' >
/etc/apt/apt.conf.d/80proxy.conf
RUN echo 'Acquire::ftp::Timeout "60";' >> /etc/apt/apt.conf.d/80proxy.conf
# install our python dependencies and some other stuff we need
-# libev4 libev-dev are for the python driver / libssl-dev is for python3.6
+# libev4 libev-dev are for the python driver
Review Comment:
Are we dropping python3.6? Asking for a friend. 😀
##########
.build/run-tests.sh:
##########
@@ -84,7 +87,9 @@ _build_all_dtest_jars() {
fi
if [ -d ${TMP_DIR}/cassandra-dtest-jars ] && [
"https://github.com/apache/cassandra.git"; == "$(git -C
${TMP_DIR}/cassandra-dtest-jars remote get-url origin)" ] ; then
- until git -C ${TMP_DIR}/cassandra-dtest-jars fetch --quiet origin ; do
echo "git pull failed… trying again… " ; done
+ if [ "x" == "x${OFFLINE}" ] ; then
+ until git -C ${TMP_DIR}/cassandra-dtest-jars fetch --quiet origin ; do
echo "git fetch failed… trying again… " ; done
Review Comment:
Can this infinite loop / hang? And if so maybe we constrain it and explain
why the need?
##########
.build/docker/ubuntu2004_test.docker:
##########
@@ -41,7 +38,7 @@ RUN echo 'Acquire::http::Timeout "60";' >
/etc/apt/apt.conf.d/80proxy.conf
RUN echo 'Acquire::ftp::Timeout "60";' >> /etc/apt/apt.conf.d/80proxy.conf
# install our python dependencies and some other stuff we need
-# libev4 libev-dev are for the python driver / libssl-dev is for python3.6
+# libev4 libev-dev are for the python driver
Review Comment:
Are we dropping python3.6? Asking for a friend. 😀
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
