[cassandra-builds] branch trunk updated: The cython variable from the jenkins axis must be passed through into the docker container, and absolute paths used for the workspace

[mc...@apache.org]

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 16a025c  The cython variable from the jenkins axis must be passed through into the docker container, and absolute paths used for the workspace
16a025c is described below

commit 16a025c86ede72e04a6cf32d2cc1d989c2b74e02
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Thu Nov 10 08:58:59 2022 +0100

    The cython variable from the jenkins axis must be passed through into the docker container, and absolute paths used for the workspace
    
     patch by Mick Semb Wever; reviewed by Berenguer Blasi for CASSANDRA-18028
---
 build-scripts/cassandra-test-docker.sh | 3 ++-
 build-scripts/cassandra-test.sh        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build-scripts/cassandra-test-docker.sh b/build-scripts/cassandra-test-docker.sh
index f5bf68d..6070c41 100755
--- a/build-scripts/cassandra-test-docker.sh
+++ b/build-scripts/cassandra-test-docker.sh
@@ -65,6 +65,7 @@ else
 REPO=$1
 BRANCH=$2
 JAVA_VERSION=${java_version}
+cython=${cython}
 EOF
 
     # Jenkins agents run multiple executors per machine. `jenkins_executors=1` is used for anything non-jenkins.
@@ -163,7 +164,7 @@ EOF
             docker cp "$docker_id:/home/cassandra/cassandra/${TARGET}-${inner_split}-${INNER_SPLITS}-cassandra.head" .
             docker cp $docker_id:/home/cassandra/cassandra/build/test/output/. build/test/output
             docker cp $docker_id:/home/cassandra/cassandra/build/test/logs/. build/test/logs
-            docker cp $docker_id:/home/cassandra/cassandra/pylib/cqlshlib/cqlshlib.xml cqlshlib.xml
+            docker cp $docker_id:/home/cassandra/cassandra/cqlshlib.xml cqlshlib.xml
         fi
         docker rm $docker_id
         ((i++))
diff --git a/build-scripts/cassandra-test.sh b/build-scripts/cassandra-test.sh
index bb9b9d3..eac7274 100755
--- a/build-scripts/cassandra-test.sh
+++ b/build-scripts/cassandra-test.sh
@@ -153,7 +153,7 @@ _main() {
       ant testclasslist -Dtest.classlistprefix=distributed -Dtest.timeout=$(_timeout_for "test.distributed.timeout") -Dtest.classlistfile=<(echo "${testlist}") -Dtmp.dir="${TMP_DIR}" || echo "failed $target"
       ;;
     "cqlsh-test")
-      ./pylib/cassandra-cqlsh-tests.sh .
+      ./pylib/cassandra-cqlsh-tests.sh $(pwd)
       ;;
     *)
       echo "unregconised \"$target\""


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org