[cassandra-builds] 01/01: Dockerise cqlsh tests

[mc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch mck/dockerise-cqlsh-tests
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git

commit cadb2f8cc4c2f6ff4ff570c50704f34d1e162571
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Wed May 5 12:34:45 2021 +0200

    Dockerise cqlsh tests
---
 build-scripts/cassandra-test-docker.sh    |  3 ++-
 build-scripts/cassandra-test.sh           |  6 ++++++
 jenkins-dsl/cassandra_job_dsl_seed.groovy | 12 +++---------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/build-scripts/cassandra-test-docker.sh b/build-scripts/cassandra-test-docker.sh
index ff9bcc3..e4fda02 100755
--- a/build-scripts/cassandra-test-docker.sh
+++ b/build-scripts/cassandra-test-docker.sh
@@ -67,7 +67,7 @@ EOF
     # for relevant test targets calculate how many docker containers we should split the test list over
     case $TARGET in
       # test-burn doesn't have enough tests in it to split beyond 8
-      "stress-test" | "fqltool-test" | "microbench" | "test-burn")
+      "stress-test" | "fqltool-test" | "microbench" | "test-burn" | "cqlsh-test")
           docker_runs=1
         ;;
       "test"| "test-cdc" | "test-compression" | "long-test" | "jvm-dtest" | "jvm-dtest-upgrade")
@@ -151,6 +151,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/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 7756ecd..2399051 100755
--- a/build-scripts/cassandra-test.sh
+++ b/build-scripts/cassandra-test.sh
@@ -89,6 +89,9 @@ _main() {
       regx_version="(2.2|3.0).([0-9]+)$"
       ! [[ $version =~ $regx_version ]] || { echo "Skipping ${target}. It does not exist in ${version}"; exit 0; }
       ;;
+    "cqlsh-test")
+      [[ -f "./pylib/cassandra-cqlsh-tests.sh" ]] || { echo "Skipping ${target}. It does not exist in ${version}"; exit 0; }
+      ;;
     *)
       ;;
   esac
@@ -145,6 +148,9 @@ _main() {
       fi
       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 .
+      ;;
     *)
       echo "unregconised \"$target\""
       exit 1
diff --git a/jenkins-dsl/cassandra_job_dsl_seed.groovy b/jenkins-dsl/cassandra_job_dsl_seed.groovy
index 816a178..6187c67 100644
--- a/jenkins-dsl/cassandra_job_dsl_seed.groovy
+++ b/jenkins-dsl/cassandra_job_dsl_seed.groovy
@@ -310,9 +310,6 @@ matrixJob('Cassandra-template-cqlsh-tests') {
         }
         timestamps()
     }
-    throttleConcurrentBuilds {
-        categories(['Cassandra'])
-    }
     axes {
         text('cython', 'yes', 'no')
         jdk(jdkLabel)
@@ -353,7 +350,7 @@ matrixJob('Cassandra-template-cqlsh-tests') {
         buildDescription('', buildDescStr)
         shell("""
             git clean -xdff ;
-            ./pylib/cassandra-cqlsh-tests.sh \$WORKSPACE ;
+            ./cassandra-builds/build-scripts/cassandra-test-docker.sh apache ${branchName} ${buildsRepo} ${buildsBranch} ${testDockerImage} cqlsh-test ;
             echo "\${BUILD_TAG}) cassandra: `git log -1 --pretty=format:'%h %an %ad %s'`" > \${BUILD_TAG}.head ;
             wget --retry-connrefused --waitretry=1 "\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > console.log.xz || echo wget failed
             """)
@@ -1073,9 +1070,6 @@ matrixJob('Cassandra-devbranch-cqlsh-tests') {
         }
         timestamps()
     }
-    throttleConcurrentBuilds {
-        categories(['Cassandra'])
-    }
     parameters {
         stringParam('REPO', 'apache', 'The github user/org to clone cassandra repo from')
         stringParam('BRANCH', 'trunk', 'The branch of cassandra to checkout')
@@ -1122,8 +1116,8 @@ matrixJob('Cassandra-devbranch-cqlsh-tests') {
         buildDescription('', buildDescStr)
         shell("""
                 git clean -xdff ;
-                echo "Cassandra-devbranch-cqlsh-tests) cassandra: `git log -1 --pretty=format:'%h %an %ad %s'`" > Cassandra-devbranch-cqlsh-tests.head ;
-                ./pylib/cassandra-cqlsh-tests.sh \$WORKSPACE ;
+                echo "\${BUILD_TAG}) cassandra: `git log -1 --pretty=format:'%h %an %ad %s'`" > \${BUILD_TAG}.head ;
+                ./cassandra-builds/build-scripts/cassandra-test-docker.sh \${REPO} \${BRANCH} ${buildsRepo} ${buildsBranch} ${testDockerImage} cqlsh-test ;
                 wget --retry-connrefused --waitretry=1 "\${BUILD_URL}/timestamps/?time=HH:mm:ss&timeZone=UTC&appendLog" -qO - > console.log.xz || echo wget failed
              """)
     }

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