You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2020/04/14 19:01:18 UTC
[cassandra] branch trunk updated: Allow cqlsh to run with Python
2.7/Python 3.6+
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.git
The following commit(s) were added to refs/heads/trunk by this push:
new c05443c Allow cqlsh to run with Python 2.7/Python 3.6+
c05443c is described below
commit c05443c0980cb51720ba0503f26f084c1538729c
Author: Eduard Tudenhoefner <ed...@datastax.com>
AuthorDate: Wed Apr 1 16:24:14 2020 +0200
Allow cqlsh to run with Python 2.7/Python 3.6+
* Adds a minimal manual test that starts cqlsh with python3.7 & 3.8 in a Docker container. It also fixes a minor issue when starting up cqlsh with python3.7+, where `webbrowser._tryorder` is `None` as can be seen in https://github.com/python/cpython/blob/3.7/Lib/webbrowser.py#L1. Note that we're checking `webbrowser._tryorder` for `None` instead of doing `webbrowser.get()` because it's likely that there's no default browser installed in a Dockerized environment and so things would fa [...]
* Adds python3.8 testing to CircleCI
* Fixes some Python warnings that occur with newer versions
patch by Eduard Tudenhöfner, reviewed by Mick Semb Wever for CASSANDRA-15659
---
.circleci/config-2_1.yml | 113 ++++++++++-
.circleci/config.yml | 456 +++++++++++++++++++++++++++++++++++++------
.circleci/config.yml.HIGHRES | 456 +++++++++++++++++++++++++++++++++++++------
.circleci/config.yml.LOWRES | 456 +++++++++++++++++++++++++++++++++++++------
.circleci/readme.md | 2 +-
CHANGES.txt | 1 +
bin/cqlsh | 5 +-
bin/cqlsh.py | 5 +-
pylib/Dockerfile.ubuntu.py3 | 2 +-
pylib/Dockerfile.ubuntu.py37 | 2 +
pylib/Dockerfile.ubuntu.py38 | 2 +
pylib/README.asc | 6 +-
12 files changed, 1303 insertions(+), 203 deletions(-)
diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml
index 5d8218c..d711975 100644
--- a/.circleci/config-2_1.yml
+++ b/.circleci/config-2_1.yml
@@ -148,6 +148,9 @@ j8_with_dtests_jobs: &j8_with_dtests_jobs
- j8_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_cqlsh-dtests-py38-with-vnodes:
+ requires:
+ - start_j8_cqlsh_tests-with-vnodes
- start_j8_cqlsh_tests-no-vnodes:
type: approval
requires:
@@ -158,6 +161,9 @@ j8_with_dtests_jobs: &j8_with_dtests_jobs
- j8_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_cqlsh-dtests-py38-no-vnodes:
+ requires:
+ - start_j8_cqlsh_tests-no-vnodes
- start_j11_cqlsh_tests-with-vnodes:
type: approval
requires:
@@ -168,6 +174,9 @@ j8_with_dtests_jobs: &j8_with_dtests_jobs
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_cqlsh-dtests-py38-with-vnodes:
+ requires:
+ - start_j11_cqlsh_tests-with-vnodes
- start_j11_cqlsh_tests-no-vnodes:
type: approval
requires:
@@ -178,6 +187,9 @@ j8_with_dtests_jobs: &j8_with_dtests_jobs
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_cqlsh-dtests-py38-no-vnodes:
+ requires:
+ - start_j11_cqlsh_tests-no-vnodes
j11_with_dtests_jobs: &j11_with_dtests_jobs
jobs:
@@ -214,6 +226,9 @@ j11_with_dtests_jobs: &j11_with_dtests_jobs
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_cqlsh-dtests-py38-with-vnodes:
+ requires:
+ - start_j11_cqlsh_tests-with-vnodes
- start_j11_cqlsh_tests-no-vnodes:
type: approval
requires:
@@ -224,6 +239,9 @@ j11_with_dtests_jobs: &j11_with_dtests_jobs
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_cqlsh-dtests-py38-no-vnodes:
+ requires:
+ - start_j11_cqlsh_tests-no-vnodes
j8_with_dtest_jobs_only: &j8_with_dtest_jobs_only
jobs:
@@ -259,7 +277,7 @@ executors:
type: string
default: medium
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: << parameters.exec_resource_class >>
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -274,7 +292,7 @@ executors:
type: string
default: medium
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: << parameters.exec_resource_class >>
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -511,6 +529,24 @@ jobs:
pytest_extra_args: '--use-vnodes --num-tokens=32 --skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
+ j8_cqlsh-dtests-py38-with-vnodes:
+ <<: *j8_par_executor
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - clone_dtest
+ - create_venv:
+ python_version: '3.8'
+ - create_dtest_containers:
+ file_tag: j8_with_vnodes
+ run_dtests_extra_args: "--use-vnodes --skip-resource-intensive-tests --pytest-options '-k cql'"
+ python_version: '3.8'
+ - run_dtests:
+ file_tag: j8_with_vnodes
+ pytest_extra_args: '--use-vnodes --num-tokens=32 --skip-resource-intensive-tests'
+ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.8'
+ python_version: '3.8'
+
j8_cqlsh-dtests-py2-no-vnodes:
<<: *j8_par_executor
steps:
@@ -541,6 +577,24 @@ jobs:
pytest_extra_args: '--skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
+ j8_cqlsh-dtests-py38-no-vnodes:
+ <<: *j8_par_executor
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - clone_dtest
+ - create_venv:
+ python_version: '3.8'
+ - create_dtest_containers:
+ file_tag: j8_without_vnodes
+ run_dtests_extra_args: "--skip-resource-intensive-tests --pytest-options '-k cql'"
+ python_version: '3.8'
+ - run_dtests:
+ file_tag: j8_without_vnodes
+ pytest_extra_args: '--skip-resource-intensive-tests'
+ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.8'
+ python_version: '3.8'
+
j11_cqlsh-dtests-py2-with-vnodes:
<<: *j11_par_executor
steps:
@@ -571,6 +625,24 @@ jobs:
pytest_extra_args: '--use-vnodes --num-tokens=32 --skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
+ j11_cqlsh-dtests-py38-with-vnodes:
+ <<: *j11_par_executor
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - clone_dtest
+ - create_venv:
+ python_version: '3.8'
+ - create_dtest_containers:
+ file_tag: j11_with_vnodes
+ run_dtests_extra_args: "--use-vnodes --skip-resource-intensive-tests --pytest-options '-k cql'"
+ python_version: '3.8'
+ - run_dtests:
+ file_tag: j11_with_vnodes
+ pytest_extra_args: '--use-vnodes --num-tokens=32 --skip-resource-intensive-tests'
+ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.8'
+ python_version: '3.8'
+
j11_cqlsh-dtests-py2-no-vnodes:
<<: *j11_par_executor
steps:
@@ -601,6 +673,24 @@ jobs:
pytest_extra_args: '--skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
+ j11_cqlsh-dtests-py38-no-vnodes:
+ <<: *j11_par_executor
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - clone_dtest
+ - create_venv:
+ python_version: '3.8'
+ - create_dtest_containers:
+ file_tag: j11_without_vnodes
+ run_dtests_extra_args: "--skip-resource-intensive-tests --pytest-options '-k cql'"
+ python_version: '3.8'
+ - run_dtests:
+ file_tag: j11_without_vnodes
+ pytest_extra_args: '--skip-resource-intensive-tests'
+ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.8'
+ python_version: '3.8'
+
commands:
log_environment:
steps:
@@ -809,6 +899,11 @@ commands:
destination: logs
create_venv:
+ parameters:
+ python_version:
+ type: enum
+ default: "3.6"
+ enum: ["3.6", "3.7", "3.8"]
steps:
- run:
name: Configure virtualenv and python Dependencies
@@ -817,7 +912,7 @@ commands:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env<<parameters.python_version>>/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -836,6 +931,10 @@ commands:
tests_filter_pattern:
type: string
default: ''
+ python_version:
+ type: enum
+ default: "3.6"
+ enum: ["3.6", "3.7", "3.8"]
steps:
- run:
name: Determine Tests to Run (<<parameters.file_tag>>)
@@ -846,7 +945,7 @@ commands:
# which we do via the `circleci` cli tool.
cd cassandra-dtest
- source ~/env/bin/activate
+ source ~/env<<parameters.python_version>>/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n '<<parameters.extra_env_args>>' ]; then
@@ -874,6 +973,10 @@ commands:
extra_env_args:
type: string
default: ''
+ python_version:
+ type: enum
+ default: "3.6"
+ enum: ["3.6", "3.7", "3.8"]
steps:
- run:
name: Run dtests (<<parameters.file_tag>>)
@@ -882,7 +985,7 @@ commands:
echo "cat /tmp/split_dtest_tests_<<parameters.file_tag>>_final.txt"
cat /tmp/split_dtest_tests_<<parameters.file_tag>>_final.txt
- source ~/env/bin/activate
+ source ~/env<<parameters.python_version>>/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n '<<parameters.extra_env_args>>' ]; then
export <<parameters.extra_env_args>>
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3757f46..7f6c93b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
jobs:
j8_jvm_upgrade_dtests:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -93,7 +93,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlsh-dtests-py2-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -112,7 +112,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -120,7 +120,7 @@ jobs:
- run:
name: Determine Tests to Run (j8_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-reso [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-r [...]
- run:
name: Run dtests (j8_with_vnodes)
no_output_timeout: 15m
@@ -128,7 +128,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt"
cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
export CQLSH_PYTHON=/usr/bin/python2.7
@@ -170,7 +170,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_unit_tests:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -260,9 +260,86 @@ jobs:
- JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- CASSANDRA_USE_JDK11: true
+ j8_cqlsh-dtests-py38-no-vnodes:
+ docker:
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
+ resource_class: medium
+ working_directory: ~/
+ shell: /bin/bash -eo pipefail -l
+ parallelism: 4
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - run:
+ name: Clone Cassandra dtest Repository (via git)
+ command: |
+ git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
+ - run:
+ name: Configure virtualenv and python Dependencies
+ command: |
+ # note, this should be super quick as all dependencies should be pre-installed in the docker image
+ # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
+ # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
+ # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
+ pip3 uninstall -y cqlsh
+ pip3 freeze
+ - run:
+ name: Determine Tests to Run (j8_without_vnodes)
+ no_output_timeout: 5m
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-in [...]
+ - run:
+ name: Run dtests (j8_without_vnodes)
+ no_output_timeout: 15m
+ command: |
+ echo "cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt"
+ cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt
+
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
+ export CQLSH_PYTHON=/usr/bin/python3.8
+ fi
+
+ java -version
+ cd ~/cassandra-dtest
+ mkdir -p /tmp/dtest
+
+ echo "env: $(env)"
+ echo "** done env"
+ mkdir -p /tmp/results/dtests
+ # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
+ export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt`
+ set -o pipefail && cd ~/cassandra-dtest && pytest --skip-resource-intensive-tests --log-level="INFO" --junit-xml=/tmp/results/dtests/pytest_result_j8_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
+ - store_test_results:
+ path: /tmp/results
+ - store_artifacts:
+ path: /tmp/dtest
+ destination: dtest_j8_without_vnodes
+ - store_artifacts:
+ path: ~/cassandra-dtest/logs
+ destination: dtest_j8_without_vnodes_logs
+ environment:
+ - ANT_HOME: /usr/share/ant
+ - LANG: en_US.UTF-8
+ - KEEP_TEST_DIR: true
+ - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+ - PYTHONIOENCODING: utf-8
+ - PYTHONUNBUFFERED: true
+ - CASS_DRIVER_NO_EXTENSIONS: true
+ - CASS_DRIVER_NO_CYTHON: true
+ - CASSANDRA_SKIP_SYNC: true
+ - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
+ - DTEST_BRANCH: master
+ - CCM_MAX_HEAP_SIZE: 1024M
+ - CCM_HEAP_NEWSIZE: 256M
+ - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_cqlsh-dtests-py3-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -281,7 +358,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -289,7 +366,7 @@ jobs:
- run:
name: Determine Tests to Run (j11_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-res [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
- run:
name: Run dtests (j11_with_vnodes)
no_output_timeout: 15m
@@ -297,7 +374,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt"
cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
export CQLSH_PYTHON=/usr/bin/python3.6
@@ -340,7 +417,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_cqlsh-dtests-py3-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -359,7 +436,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -367,7 +444,7 @@ jobs:
- run:
name: Determine Tests to Run (j11_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inte [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
- run:
name: Run dtests (j11_without_vnodes)
no_output_timeout: 15m
@@ -375,7 +452,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt"
cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
export CQLSH_PYTHON=/usr/bin/python3.6
@@ -416,9 +493,87 @@ jobs:
- JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- CASSANDRA_USE_JDK11: true
+ j11_cqlsh-dtests-py38-with-vnodes:
+ docker:
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
+ resource_class: medium
+ working_directory: ~/
+ shell: /bin/bash -eo pipefail -l
+ parallelism: 4
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - run:
+ name: Clone Cassandra dtest Repository (via git)
+ command: |
+ git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
+ - run:
+ name: Configure virtualenv and python Dependencies
+ command: |
+ # note, this should be super quick as all dependencies should be pre-installed in the docker image
+ # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
+ # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
+ # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
+ pip3 uninstall -y cqlsh
+ pip3 freeze
+ - run:
+ name: Determine Tests to Run (j11_with_vnodes)
+ no_output_timeout: 5m
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
+ - run:
+ name: Run dtests (j11_with_vnodes)
+ no_output_timeout: 15m
+ command: |
+ echo "cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt"
+ cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt
+
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
+ export CQLSH_PYTHON=/usr/bin/python3.8
+ fi
+
+ java -version
+ cd ~/cassandra-dtest
+ mkdir -p /tmp/dtest
+
+ echo "env: $(env)"
+ echo "** done env"
+ mkdir -p /tmp/results/dtests
+ # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
+ export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt`
+ set -o pipefail && cd ~/cassandra-dtest && pytest --use-vnodes --num-tokens=32 --skip-resource-intensive-tests --log-level="INFO" --junit-xml=/tmp/results/dtests/pytest_result_j11_with_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
+ - store_test_results:
+ path: /tmp/results
+ - store_artifacts:
+ path: /tmp/dtest
+ destination: dtest_j11_with_vnodes
+ - store_artifacts:
+ path: ~/cassandra-dtest/logs
+ destination: dtest_j11_with_vnodes_logs
+ environment:
+ - ANT_HOME: /usr/share/ant
+ - LANG: en_US.UTF-8
+ - KEEP_TEST_DIR: true
+ - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+ - PYTHONIOENCODING: utf-8
+ - PYTHONUNBUFFERED: true
+ - CASS_DRIVER_NO_EXTENSIONS: true
+ - CASS_DRIVER_NO_CYTHON: true
+ - CASSANDRA_SKIP_SYNC: true
+ - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
+ - DTEST_BRANCH: master
+ - CCM_MAX_HEAP_SIZE: 1024M
+ - CCM_HEAP_NEWSIZE: 256M
+ - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+ - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+ - CASSANDRA_USE_JDK11: true
j8_cqlsh-dtests-py3-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -437,7 +592,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -445,7 +600,7 @@ jobs:
- run:
name: Determine Tests to Run (j8_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-reso [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-r [...]
- run:
name: Run dtests (j8_with_vnodes)
no_output_timeout: 15m
@@ -453,7 +608,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt"
cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
export CQLSH_PYTHON=/usr/bin/python3.6
@@ -495,7 +650,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlsh-dtests-py2-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -514,7 +669,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -522,7 +677,7 @@ jobs:
- run:
name: Determine Tests to Run (j8_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inten [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-in [...]
- run:
name: Run dtests (j8_without_vnodes)
no_output_timeout: 15m
@@ -530,7 +685,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt"
cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
export CQLSH_PYTHON=/usr/bin/python2.7
@@ -572,7 +727,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_cqlsh-dtests-py2-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -591,7 +746,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -599,7 +754,7 @@ jobs:
- run:
name: Determine Tests to Run (j11_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-res [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
- run:
name: Run dtests (j11_with_vnodes)
no_output_timeout: 15m
@@ -607,7 +762,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt"
cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
export CQLSH_PYTHON=/usr/bin/python2.7
@@ -650,7 +805,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_dtests-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -691,7 +846,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -699,11 +854,11 @@ jobs:
- run:
name: Determine Tests to Run (j11_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-res [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
- run:
name: Run dtests (j11_with_vnodes)
no_output_timeout: 15m
- command: "echo \"cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j11_with_vnodes_final.txt\n\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the exi [...]
+ command: "echo \"cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j11_with_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the [...]
- store_test_results:
path: /tmp/results
- store_artifacts:
@@ -731,7 +886,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j8_dtests-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -750,7 +905,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -758,11 +913,11 @@ jobs:
- run:
name: Determine Tests to Run (j8_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inten [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-in [...]
- run:
name: Run dtests (j8_without_vnodes)
no_output_timeout: 15m
- command: "echo \"cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_without_vnodes_final.txt\n\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the [...]
+ command: "echo \"cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_without_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not [...]
- store_test_results:
path: /tmp/results
- store_artifacts:
@@ -789,7 +944,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_upgradetests-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -808,7 +963,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -822,7 +977,7 @@ jobs:
# which we do via the `circleci` cli tool.
cd cassandra-dtest
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'RUN_STATIC_UPGRADE_MATRIX=true' ]; then
@@ -846,7 +1001,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt"
cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'RUN_STATIC_UPGRADE_MATRIX=true' ]; then
export RUN_STATIC_UPGRADE_MATRIX=true
@@ -888,7 +1043,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_stress:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -933,7 +1088,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_unit_tests:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1024,7 +1179,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_jvm_dtests:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1116,7 +1271,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_build:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1197,7 +1352,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_cqlsh-dtests-py2-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1216,7 +1371,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -1224,7 +1379,7 @@ jobs:
- run:
name: Determine Tests to Run (j11_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inte [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
- run:
name: Run dtests (j11_without_vnodes)
no_output_timeout: 15m
@@ -1232,7 +1387,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt"
cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
export CQLSH_PYTHON=/usr/bin/python2.7
@@ -1275,7 +1430,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j8_dtests-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1294,7 +1449,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -1302,11 +1457,11 @@ jobs:
- run:
name: Determine Tests to Run (j8_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-reso [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-r [...]
- run:
name: Run dtests (j8_with_vnodes)
no_output_timeout: 15m
- command: "echo \"cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\n\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the exit [...]
+ command: "echo \"cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the ex [...]
- store_test_results:
path: /tmp/results
- store_artifacts:
@@ -1331,9 +1486,87 @@ jobs:
- CCM_HEAP_NEWSIZE: 256M
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ j11_cqlsh-dtests-py38-no-vnodes:
+ docker:
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
+ resource_class: medium
+ working_directory: ~/
+ shell: /bin/bash -eo pipefail -l
+ parallelism: 4
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - run:
+ name: Clone Cassandra dtest Repository (via git)
+ command: |
+ git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
+ - run:
+ name: Configure virtualenv and python Dependencies
+ command: |
+ # note, this should be super quick as all dependencies should be pre-installed in the docker image
+ # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
+ # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
+ # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
+ pip3 uninstall -y cqlsh
+ pip3 freeze
+ - run:
+ name: Determine Tests to Run (j11_without_vnodes)
+ no_output_timeout: 5m
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
+ - run:
+ name: Run dtests (j11_without_vnodes)
+ no_output_timeout: 15m
+ command: |
+ echo "cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt"
+ cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt
+
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
+ export CQLSH_PYTHON=/usr/bin/python3.8
+ fi
+
+ java -version
+ cd ~/cassandra-dtest
+ mkdir -p /tmp/dtest
+
+ echo "env: $(env)"
+ echo "** done env"
+ mkdir -p /tmp/results/dtests
+ # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
+ export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt`
+ set -o pipefail && cd ~/cassandra-dtest && pytest --skip-resource-intensive-tests --log-level="INFO" --junit-xml=/tmp/results/dtests/pytest_result_j11_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
+ - store_test_results:
+ path: /tmp/results
+ - store_artifacts:
+ path: /tmp/dtest
+ destination: dtest_j11_without_vnodes
+ - store_artifacts:
+ path: ~/cassandra-dtest/logs
+ destination: dtest_j11_without_vnodes_logs
+ environment:
+ - ANT_HOME: /usr/share/ant
+ - LANG: en_US.UTF-8
+ - KEEP_TEST_DIR: true
+ - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+ - PYTHONIOENCODING: utf-8
+ - PYTHONUNBUFFERED: true
+ - CASS_DRIVER_NO_EXTENSIONS: true
+ - CASS_DRIVER_NO_CYTHON: true
+ - CASSANDRA_SKIP_SYNC: true
+ - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
+ - DTEST_BRANCH: master
+ - CCM_MAX_HEAP_SIZE: 1024M
+ - CCM_HEAP_NEWSIZE: 256M
+ - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+ - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+ - CASSANDRA_USE_JDK11: true
j8_jvm_dtests:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1424,7 +1657,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_build:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1504,7 +1737,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlsh-dtests-py3-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1523,7 +1756,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -1531,7 +1764,7 @@ jobs:
- run:
name: Determine Tests to Run (j8_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inten [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-in [...]
- run:
name: Run dtests (j8_without_vnodes)
no_output_timeout: 15m
@@ -1539,7 +1772,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt"
cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
export CQLSH_PYTHON=/usr/bin/python3.6
@@ -1579,9 +1812,86 @@ jobs:
- CCM_HEAP_NEWSIZE: 256M
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ j8_cqlsh-dtests-py38-with-vnodes:
+ docker:
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
+ resource_class: medium
+ working_directory: ~/
+ shell: /bin/bash -eo pipefail -l
+ parallelism: 4
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - run:
+ name: Clone Cassandra dtest Repository (via git)
+ command: |
+ git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
+ - run:
+ name: Configure virtualenv and python Dependencies
+ command: |
+ # note, this should be super quick as all dependencies should be pre-installed in the docker image
+ # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
+ # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
+ # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
+ pip3 uninstall -y cqlsh
+ pip3 freeze
+ - run:
+ name: Determine Tests to Run (j8_with_vnodes)
+ no_output_timeout: 5m
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-r [...]
+ - run:
+ name: Run dtests (j8_with_vnodes)
+ no_output_timeout: 15m
+ command: |
+ echo "cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt"
+ cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt
+
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
+ export CQLSH_PYTHON=/usr/bin/python3.8
+ fi
+
+ java -version
+ cd ~/cassandra-dtest
+ mkdir -p /tmp/dtest
+
+ echo "env: $(env)"
+ echo "** done env"
+ mkdir -p /tmp/results/dtests
+ # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
+ export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt`
+ set -o pipefail && cd ~/cassandra-dtest && pytest --use-vnodes --num-tokens=32 --skip-resource-intensive-tests --log-level="INFO" --junit-xml=/tmp/results/dtests/pytest_result_j8_with_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
+ - store_test_results:
+ path: /tmp/results
+ - store_artifacts:
+ path: /tmp/dtest
+ destination: dtest_j8_with_vnodes
+ - store_artifacts:
+ path: ~/cassandra-dtest/logs
+ destination: dtest_j8_with_vnodes_logs
+ environment:
+ - ANT_HOME: /usr/share/ant
+ - LANG: en_US.UTF-8
+ - KEEP_TEST_DIR: true
+ - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+ - PYTHONIOENCODING: utf-8
+ - PYTHONUNBUFFERED: true
+ - CASS_DRIVER_NO_EXTENSIONS: true
+ - CASS_DRIVER_NO_CYTHON: true
+ - CASSANDRA_SKIP_SYNC: true
+ - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
+ - DTEST_BRANCH: master
+ - CCM_MAX_HEAP_SIZE: 1024M
+ - CCM_HEAP_NEWSIZE: 256M
+ - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_long:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1626,7 +1936,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_fqltool:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1671,7 +1981,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_dtests-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1712,7 +2022,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -1720,11 +2030,11 @@ jobs:
- run:
name: Determine Tests to Run (j11_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inte [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
- run:
name: Run dtests (j11_without_vnodes)
no_output_timeout: 15m
- command: "echo \"cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j11_without_vnodes_final.txt\n\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not t [...]
+ command: "echo \"cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j11_without_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and no [...]
- store_test_results:
path: /tmp/results
- store_artifacts:
@@ -1752,7 +2062,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
utests_compression:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1843,7 +2153,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_dtest_jars_build:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -2001,6 +2311,9 @@ workflows:
- j8_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_cqlsh-dtests-py38-with-vnodes:
+ requires:
+ - start_j8_cqlsh_tests-with-vnodes
- start_j8_cqlsh_tests-no-vnodes:
type: approval
requires:
@@ -2011,6 +2324,9 @@ workflows:
- j8_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_cqlsh-dtests-py38-no-vnodes:
+ requires:
+ - start_j8_cqlsh_tests-no-vnodes
- start_j11_cqlsh_tests-with-vnodes:
type: approval
requires:
@@ -2021,6 +2337,9 @@ workflows:
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_cqlsh-dtests-py38-with-vnodes:
+ requires:
+ - start_j11_cqlsh_tests-with-vnodes
- start_j11_cqlsh_tests-no-vnodes:
type: approval
requires:
@@ -2031,6 +2350,9 @@ workflows:
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_cqlsh-dtests-py38-no-vnodes:
+ requires:
+ - start_j11_cqlsh_tests-no-vnodes
java11_build_and_run_tests:
jobs:
- j11_build
@@ -2064,6 +2386,9 @@ workflows:
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_cqlsh-dtests-py38-with-vnodes:
+ requires:
+ - start_j11_cqlsh_tests-with-vnodes
- start_j11_cqlsh_tests-no-vnodes:
type: approval
requires:
@@ -2074,3 +2399,6 @@ workflows:
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_cqlsh-dtests-py38-no-vnodes:
+ requires:
+ - start_j11_cqlsh_tests-no-vnodes
diff --git a/.circleci/config.yml.HIGHRES b/.circleci/config.yml.HIGHRES
index 7fecdfe..727081a 100644
--- a/.circleci/config.yml.HIGHRES
+++ b/.circleci/config.yml.HIGHRES
@@ -2,7 +2,7 @@ version: 2
jobs:
j8_jvm_upgrade_dtests:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -93,7 +93,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlsh-dtests-py2-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -112,7 +112,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -120,7 +120,7 @@ jobs:
- run:
name: Determine Tests to Run (j8_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-reso [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-r [...]
- run:
name: Run dtests (j8_with_vnodes)
no_output_timeout: 15m
@@ -128,7 +128,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt"
cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
export CQLSH_PYTHON=/usr/bin/python2.7
@@ -170,7 +170,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_unit_tests:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -260,9 +260,86 @@ jobs:
- JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- CASSANDRA_USE_JDK11: true
+ j8_cqlsh-dtests-py38-no-vnodes:
+ docker:
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
+ resource_class: xlarge
+ working_directory: ~/
+ shell: /bin/bash -eo pipefail -l
+ parallelism: 100
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - run:
+ name: Clone Cassandra dtest Repository (via git)
+ command: |
+ git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
+ - run:
+ name: Configure virtualenv and python Dependencies
+ command: |
+ # note, this should be super quick as all dependencies should be pre-installed in the docker image
+ # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
+ # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
+ # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
+ pip3 uninstall -y cqlsh
+ pip3 freeze
+ - run:
+ name: Determine Tests to Run (j8_without_vnodes)
+ no_output_timeout: 5m
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-in [...]
+ - run:
+ name: Run dtests (j8_without_vnodes)
+ no_output_timeout: 15m
+ command: |
+ echo "cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt"
+ cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt
+
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
+ export CQLSH_PYTHON=/usr/bin/python3.8
+ fi
+
+ java -version
+ cd ~/cassandra-dtest
+ mkdir -p /tmp/dtest
+
+ echo "env: $(env)"
+ echo "** done env"
+ mkdir -p /tmp/results/dtests
+ # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
+ export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt`
+ set -o pipefail && cd ~/cassandra-dtest && pytest --skip-resource-intensive-tests --log-level="INFO" --junit-xml=/tmp/results/dtests/pytest_result_j8_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
+ - store_test_results:
+ path: /tmp/results
+ - store_artifacts:
+ path: /tmp/dtest
+ destination: dtest_j8_without_vnodes
+ - store_artifacts:
+ path: ~/cassandra-dtest/logs
+ destination: dtest_j8_without_vnodes_logs
+ environment:
+ - ANT_HOME: /usr/share/ant
+ - LANG: en_US.UTF-8
+ - KEEP_TEST_DIR: true
+ - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+ - PYTHONIOENCODING: utf-8
+ - PYTHONUNBUFFERED: true
+ - CASS_DRIVER_NO_EXTENSIONS: true
+ - CASS_DRIVER_NO_CYTHON: true
+ - CASSANDRA_SKIP_SYNC: true
+ - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
+ - DTEST_BRANCH: master
+ - CCM_MAX_HEAP_SIZE: 1024M
+ - CCM_HEAP_NEWSIZE: 256M
+ - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_cqlsh-dtests-py3-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -281,7 +358,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -289,7 +366,7 @@ jobs:
- run:
name: Determine Tests to Run (j11_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-res [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
- run:
name: Run dtests (j11_with_vnodes)
no_output_timeout: 15m
@@ -297,7 +374,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt"
cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
export CQLSH_PYTHON=/usr/bin/python3.6
@@ -340,7 +417,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_cqlsh-dtests-py3-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -359,7 +436,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -367,7 +444,7 @@ jobs:
- run:
name: Determine Tests to Run (j11_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inte [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
- run:
name: Run dtests (j11_without_vnodes)
no_output_timeout: 15m
@@ -375,7 +452,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt"
cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
export CQLSH_PYTHON=/usr/bin/python3.6
@@ -416,9 +493,87 @@ jobs:
- JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- CASSANDRA_USE_JDK11: true
+ j11_cqlsh-dtests-py38-with-vnodes:
+ docker:
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
+ resource_class: xlarge
+ working_directory: ~/
+ shell: /bin/bash -eo pipefail -l
+ parallelism: 100
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - run:
+ name: Clone Cassandra dtest Repository (via git)
+ command: |
+ git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
+ - run:
+ name: Configure virtualenv and python Dependencies
+ command: |
+ # note, this should be super quick as all dependencies should be pre-installed in the docker image
+ # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
+ # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
+ # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
+ pip3 uninstall -y cqlsh
+ pip3 freeze
+ - run:
+ name: Determine Tests to Run (j11_with_vnodes)
+ no_output_timeout: 5m
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
+ - run:
+ name: Run dtests (j11_with_vnodes)
+ no_output_timeout: 15m
+ command: |
+ echo "cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt"
+ cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt
+
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
+ export CQLSH_PYTHON=/usr/bin/python3.8
+ fi
+
+ java -version
+ cd ~/cassandra-dtest
+ mkdir -p /tmp/dtest
+
+ echo "env: $(env)"
+ echo "** done env"
+ mkdir -p /tmp/results/dtests
+ # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
+ export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt`
+ set -o pipefail && cd ~/cassandra-dtest && pytest --use-vnodes --num-tokens=32 --skip-resource-intensive-tests --log-level="INFO" --junit-xml=/tmp/results/dtests/pytest_result_j11_with_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
+ - store_test_results:
+ path: /tmp/results
+ - store_artifacts:
+ path: /tmp/dtest
+ destination: dtest_j11_with_vnodes
+ - store_artifacts:
+ path: ~/cassandra-dtest/logs
+ destination: dtest_j11_with_vnodes_logs
+ environment:
+ - ANT_HOME: /usr/share/ant
+ - LANG: en_US.UTF-8
+ - KEEP_TEST_DIR: true
+ - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+ - PYTHONIOENCODING: utf-8
+ - PYTHONUNBUFFERED: true
+ - CASS_DRIVER_NO_EXTENSIONS: true
+ - CASS_DRIVER_NO_CYTHON: true
+ - CASSANDRA_SKIP_SYNC: true
+ - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
+ - DTEST_BRANCH: master
+ - CCM_MAX_HEAP_SIZE: 1024M
+ - CCM_HEAP_NEWSIZE: 256M
+ - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+ - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+ - CASSANDRA_USE_JDK11: true
j8_cqlsh-dtests-py3-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -437,7 +592,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -445,7 +600,7 @@ jobs:
- run:
name: Determine Tests to Run (j8_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-reso [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-r [...]
- run:
name: Run dtests (j8_with_vnodes)
no_output_timeout: 15m
@@ -453,7 +608,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt"
cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
export CQLSH_PYTHON=/usr/bin/python3.6
@@ -495,7 +650,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlsh-dtests-py2-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -514,7 +669,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -522,7 +677,7 @@ jobs:
- run:
name: Determine Tests to Run (j8_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inten [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-in [...]
- run:
name: Run dtests (j8_without_vnodes)
no_output_timeout: 15m
@@ -530,7 +685,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt"
cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
export CQLSH_PYTHON=/usr/bin/python2.7
@@ -572,7 +727,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_cqlsh-dtests-py2-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -591,7 +746,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -599,7 +754,7 @@ jobs:
- run:
name: Determine Tests to Run (j11_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-res [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
- run:
name: Run dtests (j11_with_vnodes)
no_output_timeout: 15m
@@ -607,7 +762,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt"
cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
export CQLSH_PYTHON=/usr/bin/python2.7
@@ -650,7 +805,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_dtests-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -691,7 +846,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -699,11 +854,11 @@ jobs:
- run:
name: Determine Tests to Run (j11_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-res [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
- run:
name: Run dtests (j11_with_vnodes)
no_output_timeout: 15m
- command: "echo \"cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j11_with_vnodes_final.txt\n\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the exi [...]
+ command: "echo \"cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j11_with_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the [...]
- store_test_results:
path: /tmp/results
- store_artifacts:
@@ -731,7 +886,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j8_dtests-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -750,7 +905,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -758,11 +913,11 @@ jobs:
- run:
name: Determine Tests to Run (j8_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inten [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-in [...]
- run:
name: Run dtests (j8_without_vnodes)
no_output_timeout: 15m
- command: "echo \"cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_without_vnodes_final.txt\n\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the [...]
+ command: "echo \"cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_without_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not [...]
- store_test_results:
path: /tmp/results
- store_artifacts:
@@ -789,7 +944,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_upgradetests-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -808,7 +963,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -822,7 +977,7 @@ jobs:
# which we do via the `circleci` cli tool.
cd cassandra-dtest
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'RUN_STATIC_UPGRADE_MATRIX=true' ]; then
@@ -846,7 +1001,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt"
cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'RUN_STATIC_UPGRADE_MATRIX=true' ]; then
export RUN_STATIC_UPGRADE_MATRIX=true
@@ -888,7 +1043,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_stress:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -933,7 +1088,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_unit_tests:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1024,7 +1179,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_jvm_dtests:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1116,7 +1271,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_build:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1197,7 +1352,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_cqlsh-dtests-py2-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1216,7 +1371,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -1224,7 +1379,7 @@ jobs:
- run:
name: Determine Tests to Run (j11_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inte [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
- run:
name: Run dtests (j11_without_vnodes)
no_output_timeout: 15m
@@ -1232,7 +1387,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt"
cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
export CQLSH_PYTHON=/usr/bin/python2.7
@@ -1275,7 +1430,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j8_dtests-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1294,7 +1449,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -1302,11 +1457,11 @@ jobs:
- run:
name: Determine Tests to Run (j8_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-reso [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-r [...]
- run:
name: Run dtests (j8_with_vnodes)
no_output_timeout: 15m
- command: "echo \"cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\n\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the exit [...]
+ command: "echo \"cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the ex [...]
- store_test_results:
path: /tmp/results
- store_artifacts:
@@ -1331,9 +1486,87 @@ jobs:
- CCM_HEAP_NEWSIZE: 256M
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ j11_cqlsh-dtests-py38-no-vnodes:
+ docker:
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
+ resource_class: xlarge
+ working_directory: ~/
+ shell: /bin/bash -eo pipefail -l
+ parallelism: 100
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - run:
+ name: Clone Cassandra dtest Repository (via git)
+ command: |
+ git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
+ - run:
+ name: Configure virtualenv and python Dependencies
+ command: |
+ # note, this should be super quick as all dependencies should be pre-installed in the docker image
+ # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
+ # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
+ # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
+ pip3 uninstall -y cqlsh
+ pip3 freeze
+ - run:
+ name: Determine Tests to Run (j11_without_vnodes)
+ no_output_timeout: 5m
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
+ - run:
+ name: Run dtests (j11_without_vnodes)
+ no_output_timeout: 15m
+ command: |
+ echo "cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt"
+ cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt
+
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
+ export CQLSH_PYTHON=/usr/bin/python3.8
+ fi
+
+ java -version
+ cd ~/cassandra-dtest
+ mkdir -p /tmp/dtest
+
+ echo "env: $(env)"
+ echo "** done env"
+ mkdir -p /tmp/results/dtests
+ # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
+ export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt`
+ set -o pipefail && cd ~/cassandra-dtest && pytest --skip-resource-intensive-tests --log-level="INFO" --junit-xml=/tmp/results/dtests/pytest_result_j11_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
+ - store_test_results:
+ path: /tmp/results
+ - store_artifacts:
+ path: /tmp/dtest
+ destination: dtest_j11_without_vnodes
+ - store_artifacts:
+ path: ~/cassandra-dtest/logs
+ destination: dtest_j11_without_vnodes_logs
+ environment:
+ - ANT_HOME: /usr/share/ant
+ - LANG: en_US.UTF-8
+ - KEEP_TEST_DIR: true
+ - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+ - PYTHONIOENCODING: utf-8
+ - PYTHONUNBUFFERED: true
+ - CASS_DRIVER_NO_EXTENSIONS: true
+ - CASS_DRIVER_NO_CYTHON: true
+ - CASSANDRA_SKIP_SYNC: true
+ - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
+ - DTEST_BRANCH: master
+ - CCM_MAX_HEAP_SIZE: 1024M
+ - CCM_HEAP_NEWSIZE: 256M
+ - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+ - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+ - CASSANDRA_USE_JDK11: true
j8_jvm_dtests:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1424,7 +1657,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_build:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1504,7 +1737,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlsh-dtests-py3-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1523,7 +1756,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -1531,7 +1764,7 @@ jobs:
- run:
name: Determine Tests to Run (j8_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inten [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-in [...]
- run:
name: Run dtests (j8_without_vnodes)
no_output_timeout: 15m
@@ -1539,7 +1772,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt"
cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
export CQLSH_PYTHON=/usr/bin/python3.6
@@ -1579,9 +1812,86 @@ jobs:
- CCM_HEAP_NEWSIZE: 256M
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ j8_cqlsh-dtests-py38-with-vnodes:
+ docker:
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
+ resource_class: xlarge
+ working_directory: ~/
+ shell: /bin/bash -eo pipefail -l
+ parallelism: 100
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - run:
+ name: Clone Cassandra dtest Repository (via git)
+ command: |
+ git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
+ - run:
+ name: Configure virtualenv and python Dependencies
+ command: |
+ # note, this should be super quick as all dependencies should be pre-installed in the docker image
+ # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
+ # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
+ # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
+ pip3 uninstall -y cqlsh
+ pip3 freeze
+ - run:
+ name: Determine Tests to Run (j8_with_vnodes)
+ no_output_timeout: 5m
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-r [...]
+ - run:
+ name: Run dtests (j8_with_vnodes)
+ no_output_timeout: 15m
+ command: |
+ echo "cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt"
+ cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt
+
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
+ export CQLSH_PYTHON=/usr/bin/python3.8
+ fi
+
+ java -version
+ cd ~/cassandra-dtest
+ mkdir -p /tmp/dtest
+
+ echo "env: $(env)"
+ echo "** done env"
+ mkdir -p /tmp/results/dtests
+ # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
+ export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt`
+ set -o pipefail && cd ~/cassandra-dtest && pytest --use-vnodes --num-tokens=32 --skip-resource-intensive-tests --log-level="INFO" --junit-xml=/tmp/results/dtests/pytest_result_j8_with_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
+ - store_test_results:
+ path: /tmp/results
+ - store_artifacts:
+ path: /tmp/dtest
+ destination: dtest_j8_with_vnodes
+ - store_artifacts:
+ path: ~/cassandra-dtest/logs
+ destination: dtest_j8_with_vnodes_logs
+ environment:
+ - ANT_HOME: /usr/share/ant
+ - LANG: en_US.UTF-8
+ - KEEP_TEST_DIR: true
+ - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+ - PYTHONIOENCODING: utf-8
+ - PYTHONUNBUFFERED: true
+ - CASS_DRIVER_NO_EXTENSIONS: true
+ - CASS_DRIVER_NO_CYTHON: true
+ - CASSANDRA_SKIP_SYNC: true
+ - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
+ - DTEST_BRANCH: master
+ - CCM_MAX_HEAP_SIZE: 1024M
+ - CCM_HEAP_NEWSIZE: 256M
+ - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_long:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1626,7 +1936,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_fqltool:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1671,7 +1981,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_dtests-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1712,7 +2022,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -1720,11 +2030,11 @@ jobs:
- run:
name: Determine Tests to Run (j11_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inte [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
- run:
name: Run dtests (j11_without_vnodes)
no_output_timeout: 15m
- command: "echo \"cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j11_without_vnodes_final.txt\n\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not t [...]
+ command: "echo \"cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j11_without_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and no [...]
- store_test_results:
path: /tmp/results
- store_artifacts:
@@ -1752,7 +2062,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
utests_compression:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1843,7 +2153,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_dtest_jars_build:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -2001,6 +2311,9 @@ workflows:
- j8_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_cqlsh-dtests-py38-with-vnodes:
+ requires:
+ - start_j8_cqlsh_tests-with-vnodes
- start_j8_cqlsh_tests-no-vnodes:
type: approval
requires:
@@ -2011,6 +2324,9 @@ workflows:
- j8_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_cqlsh-dtests-py38-no-vnodes:
+ requires:
+ - start_j8_cqlsh_tests-no-vnodes
- start_j11_cqlsh_tests-with-vnodes:
type: approval
requires:
@@ -2021,6 +2337,9 @@ workflows:
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_cqlsh-dtests-py38-with-vnodes:
+ requires:
+ - start_j11_cqlsh_tests-with-vnodes
- start_j11_cqlsh_tests-no-vnodes:
type: approval
requires:
@@ -2031,6 +2350,9 @@ workflows:
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_cqlsh-dtests-py38-no-vnodes:
+ requires:
+ - start_j11_cqlsh_tests-no-vnodes
java11_build_and_run_tests:
jobs:
- j11_build
@@ -2064,6 +2386,9 @@ workflows:
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_cqlsh-dtests-py38-with-vnodes:
+ requires:
+ - start_j11_cqlsh_tests-with-vnodes
- start_j11_cqlsh_tests-no-vnodes:
type: approval
requires:
@@ -2074,3 +2399,6 @@ workflows:
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_cqlsh-dtests-py38-no-vnodes:
+ requires:
+ - start_j11_cqlsh_tests-no-vnodes
diff --git a/.circleci/config.yml.LOWRES b/.circleci/config.yml.LOWRES
index 3757f46..7f6c93b 100644
--- a/.circleci/config.yml.LOWRES
+++ b/.circleci/config.yml.LOWRES
@@ -2,7 +2,7 @@ version: 2
jobs:
j8_jvm_upgrade_dtests:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -93,7 +93,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlsh-dtests-py2-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -112,7 +112,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -120,7 +120,7 @@ jobs:
- run:
name: Determine Tests to Run (j8_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-reso [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-r [...]
- run:
name: Run dtests (j8_with_vnodes)
no_output_timeout: 15m
@@ -128,7 +128,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt"
cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
export CQLSH_PYTHON=/usr/bin/python2.7
@@ -170,7 +170,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_unit_tests:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -260,9 +260,86 @@ jobs:
- JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- CASSANDRA_USE_JDK11: true
+ j8_cqlsh-dtests-py38-no-vnodes:
+ docker:
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
+ resource_class: medium
+ working_directory: ~/
+ shell: /bin/bash -eo pipefail -l
+ parallelism: 4
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - run:
+ name: Clone Cassandra dtest Repository (via git)
+ command: |
+ git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
+ - run:
+ name: Configure virtualenv and python Dependencies
+ command: |
+ # note, this should be super quick as all dependencies should be pre-installed in the docker image
+ # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
+ # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
+ # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
+ pip3 uninstall -y cqlsh
+ pip3 freeze
+ - run:
+ name: Determine Tests to Run (j8_without_vnodes)
+ no_output_timeout: 5m
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-in [...]
+ - run:
+ name: Run dtests (j8_without_vnodes)
+ no_output_timeout: 15m
+ command: |
+ echo "cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt"
+ cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt
+
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
+ export CQLSH_PYTHON=/usr/bin/python3.8
+ fi
+
+ java -version
+ cd ~/cassandra-dtest
+ mkdir -p /tmp/dtest
+
+ echo "env: $(env)"
+ echo "** done env"
+ mkdir -p /tmp/results/dtests
+ # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
+ export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt`
+ set -o pipefail && cd ~/cassandra-dtest && pytest --skip-resource-intensive-tests --log-level="INFO" --junit-xml=/tmp/results/dtests/pytest_result_j8_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
+ - store_test_results:
+ path: /tmp/results
+ - store_artifacts:
+ path: /tmp/dtest
+ destination: dtest_j8_without_vnodes
+ - store_artifacts:
+ path: ~/cassandra-dtest/logs
+ destination: dtest_j8_without_vnodes_logs
+ environment:
+ - ANT_HOME: /usr/share/ant
+ - LANG: en_US.UTF-8
+ - KEEP_TEST_DIR: true
+ - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+ - PYTHONIOENCODING: utf-8
+ - PYTHONUNBUFFERED: true
+ - CASS_DRIVER_NO_EXTENSIONS: true
+ - CASS_DRIVER_NO_CYTHON: true
+ - CASSANDRA_SKIP_SYNC: true
+ - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
+ - DTEST_BRANCH: master
+ - CCM_MAX_HEAP_SIZE: 1024M
+ - CCM_HEAP_NEWSIZE: 256M
+ - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_cqlsh-dtests-py3-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -281,7 +358,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -289,7 +366,7 @@ jobs:
- run:
name: Determine Tests to Run (j11_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-res [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
- run:
name: Run dtests (j11_with_vnodes)
no_output_timeout: 15m
@@ -297,7 +374,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt"
cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
export CQLSH_PYTHON=/usr/bin/python3.6
@@ -340,7 +417,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_cqlsh-dtests-py3-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -359,7 +436,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -367,7 +444,7 @@ jobs:
- run:
name: Determine Tests to Run (j11_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inte [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
- run:
name: Run dtests (j11_without_vnodes)
no_output_timeout: 15m
@@ -375,7 +452,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt"
cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
export CQLSH_PYTHON=/usr/bin/python3.6
@@ -416,9 +493,87 @@ jobs:
- JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- CASSANDRA_USE_JDK11: true
+ j11_cqlsh-dtests-py38-with-vnodes:
+ docker:
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
+ resource_class: medium
+ working_directory: ~/
+ shell: /bin/bash -eo pipefail -l
+ parallelism: 4
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - run:
+ name: Clone Cassandra dtest Repository (via git)
+ command: |
+ git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
+ - run:
+ name: Configure virtualenv and python Dependencies
+ command: |
+ # note, this should be super quick as all dependencies should be pre-installed in the docker image
+ # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
+ # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
+ # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
+ pip3 uninstall -y cqlsh
+ pip3 freeze
+ - run:
+ name: Determine Tests to Run (j11_with_vnodes)
+ no_output_timeout: 5m
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
+ - run:
+ name: Run dtests (j11_with_vnodes)
+ no_output_timeout: 15m
+ command: |
+ echo "cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt"
+ cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt
+
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
+ export CQLSH_PYTHON=/usr/bin/python3.8
+ fi
+
+ java -version
+ cd ~/cassandra-dtest
+ mkdir -p /tmp/dtest
+
+ echo "env: $(env)"
+ echo "** done env"
+ mkdir -p /tmp/results/dtests
+ # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
+ export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt`
+ set -o pipefail && cd ~/cassandra-dtest && pytest --use-vnodes --num-tokens=32 --skip-resource-intensive-tests --log-level="INFO" --junit-xml=/tmp/results/dtests/pytest_result_j11_with_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
+ - store_test_results:
+ path: /tmp/results
+ - store_artifacts:
+ path: /tmp/dtest
+ destination: dtest_j11_with_vnodes
+ - store_artifacts:
+ path: ~/cassandra-dtest/logs
+ destination: dtest_j11_with_vnodes_logs
+ environment:
+ - ANT_HOME: /usr/share/ant
+ - LANG: en_US.UTF-8
+ - KEEP_TEST_DIR: true
+ - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+ - PYTHONIOENCODING: utf-8
+ - PYTHONUNBUFFERED: true
+ - CASS_DRIVER_NO_EXTENSIONS: true
+ - CASS_DRIVER_NO_CYTHON: true
+ - CASSANDRA_SKIP_SYNC: true
+ - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
+ - DTEST_BRANCH: master
+ - CCM_MAX_HEAP_SIZE: 1024M
+ - CCM_HEAP_NEWSIZE: 256M
+ - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+ - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+ - CASSANDRA_USE_JDK11: true
j8_cqlsh-dtests-py3-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -437,7 +592,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -445,7 +600,7 @@ jobs:
- run:
name: Determine Tests to Run (j8_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-reso [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-r [...]
- run:
name: Run dtests (j8_with_vnodes)
no_output_timeout: 15m
@@ -453,7 +608,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt"
cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
export CQLSH_PYTHON=/usr/bin/python3.6
@@ -495,7 +650,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlsh-dtests-py2-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -514,7 +669,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -522,7 +677,7 @@ jobs:
- run:
name: Determine Tests to Run (j8_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inten [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-in [...]
- run:
name: Run dtests (j8_without_vnodes)
no_output_timeout: 15m
@@ -530,7 +685,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt"
cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
export CQLSH_PYTHON=/usr/bin/python2.7
@@ -572,7 +727,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_cqlsh-dtests-py2-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -591,7 +746,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -599,7 +754,7 @@ jobs:
- run:
name: Determine Tests to Run (j11_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-res [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
- run:
name: Run dtests (j11_with_vnodes)
no_output_timeout: 15m
@@ -607,7 +762,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt"
cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
export CQLSH_PYTHON=/usr/bin/python2.7
@@ -650,7 +805,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_dtests-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -691,7 +846,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -699,11 +854,11 @@ jobs:
- run:
name: Determine Tests to Run (j11_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-res [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip- [...]
- run:
name: Run dtests (j11_with_vnodes)
no_output_timeout: 15m
- command: "echo \"cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j11_with_vnodes_final.txt\n\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the exi [...]
+ command: "echo \"cat /tmp/split_dtest_tests_j11_with_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j11_with_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the [...]
- store_test_results:
path: /tmp/results
- store_artifacts:
@@ -731,7 +886,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j8_dtests-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -750,7 +905,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -758,11 +913,11 @@ jobs:
- run:
name: Determine Tests to Run (j8_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inten [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-in [...]
- run:
name: Run dtests (j8_without_vnodes)
no_output_timeout: 15m
- command: "echo \"cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_without_vnodes_final.txt\n\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the [...]
+ command: "echo \"cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_without_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not [...]
- store_test_results:
path: /tmp/results
- store_artifacts:
@@ -789,7 +944,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_upgradetests-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -808,7 +963,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -822,7 +977,7 @@ jobs:
# which we do via the `circleci` cli tool.
cd cassandra-dtest
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'RUN_STATIC_UPGRADE_MATRIX=true' ]; then
@@ -846,7 +1001,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt"
cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'RUN_STATIC_UPGRADE_MATRIX=true' ]; then
export RUN_STATIC_UPGRADE_MATRIX=true
@@ -888,7 +1043,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_stress:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -933,7 +1088,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_unit_tests:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1024,7 +1179,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_jvm_dtests:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1116,7 +1271,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_build:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1197,7 +1352,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_cqlsh-dtests-py2-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1216,7 +1371,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -1224,7 +1379,7 @@ jobs:
- run:
name: Determine Tests to Run (j11_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inte [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
- run:
name: Run dtests (j11_without_vnodes)
no_output_timeout: 15m
@@ -1232,7 +1387,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt"
cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python2.7' ]; then
export CQLSH_PYTHON=/usr/bin/python2.7
@@ -1275,7 +1430,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j8_dtests-with-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1294,7 +1449,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -1302,11 +1457,11 @@ jobs:
- run:
name: Determine Tests to Run (j8_with_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-reso [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-r [...]
- run:
name: Run dtests (j8_with_vnodes)
no_output_timeout: 15m
- command: "echo \"cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\n\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the exit [...]
+ command: "echo \"cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j8_with_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not the ex [...]
- store_test_results:
path: /tmp/results
- store_artifacts:
@@ -1331,9 +1486,87 @@ jobs:
- CCM_HEAP_NEWSIZE: 256M
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ j11_cqlsh-dtests-py38-no-vnodes:
+ docker:
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
+ resource_class: medium
+ working_directory: ~/
+ shell: /bin/bash -eo pipefail -l
+ parallelism: 4
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - run:
+ name: Clone Cassandra dtest Repository (via git)
+ command: |
+ git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
+ - run:
+ name: Configure virtualenv and python Dependencies
+ command: |
+ # note, this should be super quick as all dependencies should be pre-installed in the docker image
+ # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
+ # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
+ # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
+ pip3 uninstall -y cqlsh
+ pip3 freeze
+ - run:
+ name: Determine Tests to Run (j11_without_vnodes)
+ no_output_timeout: 5m
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
+ - run:
+ name: Run dtests (j11_without_vnodes)
+ no_output_timeout: 15m
+ command: |
+ echo "cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt"
+ cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt
+
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
+ export CQLSH_PYTHON=/usr/bin/python3.8
+ fi
+
+ java -version
+ cd ~/cassandra-dtest
+ mkdir -p /tmp/dtest
+
+ echo "env: $(env)"
+ echo "** done env"
+ mkdir -p /tmp/results/dtests
+ # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
+ export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt`
+ set -o pipefail && cd ~/cassandra-dtest && pytest --skip-resource-intensive-tests --log-level="INFO" --junit-xml=/tmp/results/dtests/pytest_result_j11_without_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
+ - store_test_results:
+ path: /tmp/results
+ - store_artifacts:
+ path: /tmp/dtest
+ destination: dtest_j11_without_vnodes
+ - store_artifacts:
+ path: ~/cassandra-dtest/logs
+ destination: dtest_j11_without_vnodes_logs
+ environment:
+ - ANT_HOME: /usr/share/ant
+ - LANG: en_US.UTF-8
+ - KEEP_TEST_DIR: true
+ - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+ - PYTHONIOENCODING: utf-8
+ - PYTHONUNBUFFERED: true
+ - CASS_DRIVER_NO_EXTENSIONS: true
+ - CASS_DRIVER_NO_CYTHON: true
+ - CASSANDRA_SKIP_SYNC: true
+ - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
+ - DTEST_BRANCH: master
+ - CCM_MAX_HEAP_SIZE: 1024M
+ - CCM_HEAP_NEWSIZE: 256M
+ - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+ - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+ - CASSANDRA_USE_JDK11: true
j8_jvm_dtests:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1424,7 +1657,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_build:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1504,7 +1737,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlsh-dtests-py3-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1523,7 +1756,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -1531,7 +1764,7 @@ jobs:
- run:
name: Determine Tests to Run (j8_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inten [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-in [...]
- run:
name: Run dtests (j8_without_vnodes)
no_output_timeout: 15m
@@ -1539,7 +1772,7 @@ jobs:
echo "cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt"
cat /tmp/split_dtest_tests_j8_without_vnodes_final.txt
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
if [ -n 'CQLSH_PYTHON=/usr/bin/python3.6' ]; then
export CQLSH_PYTHON=/usr/bin/python3.6
@@ -1579,9 +1812,86 @@ jobs:
- CCM_HEAP_NEWSIZE: 256M
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ j8_cqlsh-dtests-py38-with-vnodes:
+ docker:
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
+ resource_class: medium
+ working_directory: ~/
+ shell: /bin/bash -eo pipefail -l
+ parallelism: 4
+ steps:
+ - attach_workspace:
+ at: /home/cassandra
+ - run:
+ name: Clone Cassandra dtest Repository (via git)
+ command: |
+ git clone --single-branch --branch $DTEST_BRANCH --depth 1 $DTEST_REPO ~/cassandra-dtest
+ - run:
+ name: Configure virtualenv and python Dependencies
+ command: |
+ # note, this should be super quick as all dependencies should be pre-installed in the docker image
+ # if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
+ # we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
+ # rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
+ pip3 uninstall -y cqlsh
+ pip3 freeze
+ - run:
+ name: Determine Tests to Run (j8_with_vnodes)
+ no_output_timeout: 5m
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.8/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j8_with_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --use-vnodes --skip-r [...]
+ - run:
+ name: Run dtests (j8_with_vnodes)
+ no_output_timeout: 15m
+ command: |
+ echo "cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt"
+ cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt
+
+ source ~/env3.8/bin/activate
+ export PATH=$JAVA_HOME/bin:$PATH
+ if [ -n 'CQLSH_PYTHON=/usr/bin/python3.8' ]; then
+ export CQLSH_PYTHON=/usr/bin/python3.8
+ fi
+
+ java -version
+ cd ~/cassandra-dtest
+ mkdir -p /tmp/dtest
+
+ echo "env: $(env)"
+ echo "** done env"
+ mkdir -p /tmp/results/dtests
+ # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
+ export SPLIT_TESTS=`cat /tmp/split_dtest_tests_j8_with_vnodes_final.txt`
+ set -o pipefail && cd ~/cassandra-dtest && pytest --use-vnodes --num-tokens=32 --skip-resource-intensive-tests --log-level="INFO" --junit-xml=/tmp/results/dtests/pytest_result_j8_with_vnodes.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
+ - store_test_results:
+ path: /tmp/results
+ - store_artifacts:
+ path: /tmp/dtest
+ destination: dtest_j8_with_vnodes
+ - store_artifacts:
+ path: ~/cassandra-dtest/logs
+ destination: dtest_j8_with_vnodes_logs
+ environment:
+ - ANT_HOME: /usr/share/ant
+ - LANG: en_US.UTF-8
+ - KEEP_TEST_DIR: true
+ - DEFAULT_DIR: /home/cassandra/cassandra-dtest
+ - PYTHONIOENCODING: utf-8
+ - PYTHONUNBUFFERED: true
+ - CASS_DRIVER_NO_EXTENSIONS: true
+ - CASS_DRIVER_NO_CYTHON: true
+ - CASSANDRA_SKIP_SYNC: true
+ - DTEST_REPO: git://github.com/apache/cassandra-dtest.git
+ - DTEST_BRANCH: master
+ - CCM_MAX_HEAP_SIZE: 1024M
+ - CCM_HEAP_NEWSIZE: 256M
+ - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+ - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_long:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1626,7 +1936,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_fqltool:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1671,7 +1981,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_dtests-no-vnodes:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11:20181210
+ - image: nastra/cassandra-testing-ubuntu1910-java11:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1712,7 +2022,7 @@ jobs:
# if additional dependencies were added to requirmeents.txt and the docker image hasn't been updated
# we'd have to install it here at runtime -- which will make things slow, so do yourself a favor and
# rebuild the docker image! (it automatically pulls the latest requirements.txt on build)
- source ~/env/bin/activate
+ source ~/env3.6/bin/activate
export PATH=$JAVA_HOME/bin:$PATH
pip3 install --upgrade -r ~/cassandra-dtest/requirements.txt
pip3 uninstall -y cqlsh
@@ -1720,11 +2030,11 @@ jobs:
- run:
name: Determine Tests to Run (j11_without_vnodes)
no_output_timeout: 5m
- command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-inte [...]
+ command: "# reminder: this code (along with all the steps) is independently executed on every circle container\n# so the goal here is to get the circleci script to return the tests *this* container will run\n# which we do via the `circleci` cli tool.\n\ncd cassandra-dtest\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\n\nif [ -n '' ]; then\n export \nfi\n\necho \"***Collected DTests (j11_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py --skip-resource-i [...]
- run:
name: Run dtests (j11_without_vnodes)
no_output_timeout: 15m
- command: "echo \"cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j11_without_vnodes_final.txt\n\nsource ~/env/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and not t [...]
+ command: "echo \"cat /tmp/split_dtest_tests_j11_without_vnodes_final.txt\"\ncat /tmp/split_dtest_tests_j11_without_vnodes_final.txt\n\nsource ~/env3.6/bin/activate\nexport PATH=$JAVA_HOME/bin:$PATH\nif [ -n '' ]; then\n export \nfi\n\njava -version\ncd ~/cassandra-dtest\nmkdir -p /tmp/dtest\n\necho \"env: $(env)\"\necho \"** done env\"\nmkdir -p /tmp/results/dtests\n# we need the \"set -o pipefail\" here so that the exit code that circleci will actually use is from pytest and no [...]
- store_test_results:
path: /tmp/results
- store_artifacts:
@@ -1752,7 +2062,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
utests_compression:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1843,7 +2153,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_dtest_jars_build:
docker:
- - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306
+ - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200406
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -2001,6 +2311,9 @@ workflows:
- j8_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j8_cqlsh_tests-with-vnodes
+ - j8_cqlsh-dtests-py38-with-vnodes:
+ requires:
+ - start_j8_cqlsh_tests-with-vnodes
- start_j8_cqlsh_tests-no-vnodes:
type: approval
requires:
@@ -2011,6 +2324,9 @@ workflows:
- j8_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j8_cqlsh_tests-no-vnodes
+ - j8_cqlsh-dtests-py38-no-vnodes:
+ requires:
+ - start_j8_cqlsh_tests-no-vnodes
- start_j11_cqlsh_tests-with-vnodes:
type: approval
requires:
@@ -2021,6 +2337,9 @@ workflows:
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_cqlsh-dtests-py38-with-vnodes:
+ requires:
+ - start_j11_cqlsh_tests-with-vnodes
- start_j11_cqlsh_tests-no-vnodes:
type: approval
requires:
@@ -2031,6 +2350,9 @@ workflows:
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_cqlsh-dtests-py38-no-vnodes:
+ requires:
+ - start_j11_cqlsh_tests-no-vnodes
java11_build_and_run_tests:
jobs:
- j11_build
@@ -2064,6 +2386,9 @@ workflows:
- j11_cqlsh-dtests-py3-with-vnodes:
requires:
- start_j11_cqlsh_tests-with-vnodes
+ - j11_cqlsh-dtests-py38-with-vnodes:
+ requires:
+ - start_j11_cqlsh_tests-with-vnodes
- start_j11_cqlsh_tests-no-vnodes:
type: approval
requires:
@@ -2074,3 +2399,6 @@ workflows:
- j11_cqlsh-dtests-py3-no-vnodes:
requires:
- start_j11_cqlsh_tests-no-vnodes
+ - j11_cqlsh-dtests-py38-no-vnodes:
+ requires:
+ - start_j11_cqlsh_tests-no-vnodes
diff --git a/.circleci/readme.md b/.circleci/readme.md
index 965eaf7..ca20442 100644
--- a/.circleci/readme.md
+++ b/.circleci/readme.md
@@ -28,5 +28,5 @@ HIGHRES files, read below for details how to do it manually;
the patch file based on the diff (don't commit it though).
1. generate the HIGHRES file:
`circleci config process config-2_1.yml.HIGHRES > config.yml.HIGHRES`
-1. and remove the temporary patched highres `config-2_1.yml.HIGHRES`
+1. and remove the temporary patched HIGHRES file: `rm config-2_1.yml.HIGHRES`
diff --git a/CHANGES.txt b/CHANGES.txt
index d125138..958ee99 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.0-alpha4
+ * Allow cqlsh to run with Python2.7/Python3.6+ (CASSANDRA-15659)
* Improve logging around incremental repair (CASSANDRA-15599)
* Do not check cdc_raw_directory filesystem space if CDC disabled (CASSANDRA-15688)
* Replace array iterators with get by index (CASSANDRA-15394)
diff --git a/bin/cqlsh b/bin/cqlsh
index b7de04a..bce00f8 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -57,7 +57,10 @@ get_python_version() {
# test whether a version string matches one of the supported versions for cqlsh
is_supported_version() {
version=$1
- if [ "$version" = "3.6" ] || [ "$version" = "2.7" ]; then
+ # shellcheck disable=SC2039
+ # shellcheck disable=SC2072
+ # python2.7 or python3.6+ is supported
+ if [ "$version" = "3.6" ] || [ "$version" \> "3.6" ] || [ "$version" = "2.7" ]; then
echo "supported"
else
echo "unsupported"
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 008a23c..272bf40 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -96,6 +96,7 @@ else:
# >>> webbrowser._tryorder
# >>> webbrowser._browser
#
+# webbrowser._tryorder is None in python3.7+
if webbrowser._tryorder is None or len(webbrowser._tryorder) == 0:
CASSANDRA_CQL_HTML = CASSANDRA_CQL_HTML_FALLBACK
elif webbrowser._tryorder[0] == 'xdg-open' and os.environ.get('XDG_DATA_DIRS', '') == '':
@@ -414,7 +415,7 @@ def insert_driver_hooks():
class Shell(cmd.Cmd):
custom_prompt = os.getenv('CQLSH_PROMPT', '')
- if custom_prompt is not '':
+ if custom_prompt != '':
custom_prompt += "\n"
default_prompt = custom_prompt + "cqlsh> "
continue_prompt = " ... "
@@ -2234,7 +2235,7 @@ def should_use_color():
def read_options(cmdlineargs, environment):
- configs = configparser.SafeConfigParser()
+ configs = configparser.SafeConfigParser() if sys.version_info < (3, 2) else configparser.ConfigParser()
configs.read(CONFIG_FILE)
rawconfigs = configparser.RawConfigParser()
diff --git a/pylib/Dockerfile.ubuntu.py3 b/pylib/Dockerfile.ubuntu.py3
index f402817..7bbb715 100644
--- a/pylib/Dockerfile.ubuntu.py3
+++ b/pylib/Dockerfile.ubuntu.py3
@@ -1,2 +1,2 @@
FROM ubuntu:bionic
-RUN apt-get update && apt-get install -y python3-minimal
+RUN apt-get update && apt-get install -y python3-minimal && update-alternatives --install /usr/bin/python python /usr/bin/python3.6 1
diff --git a/pylib/Dockerfile.ubuntu.py37 b/pylib/Dockerfile.ubuntu.py37
new file mode 100644
index 0000000..7b08508
--- /dev/null
+++ b/pylib/Dockerfile.ubuntu.py37
@@ -0,0 +1,2 @@
+FROM ubuntu:bionic
+RUN apt-get update && apt-get install -y python3.7-minimal && update-alternatives --install /usr/bin/python python /usr/bin/python3.7 1
diff --git a/pylib/Dockerfile.ubuntu.py38 b/pylib/Dockerfile.ubuntu.py38
new file mode 100644
index 0000000..74f9e3c
--- /dev/null
+++ b/pylib/Dockerfile.ubuntu.py38
@@ -0,0 +1,2 @@
+FROM ubuntu:bionic
+RUN apt-get update && apt-get install -y python3.8-minimal && update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1
diff --git a/pylib/README.asc b/pylib/README.asc
index 42478d9..b0b6c7d 100644
--- a/pylib/README.asc
+++ b/pylib/README.asc
@@ -22,7 +22,11 @@ build the Docker image containing the barebones Python installation -
Next, run cqlsh inside the newly built image -
- $ docker run -v $CASSANDRA_DIR:/code -it ubuntu-lts-py3:latest /code/cassandra/bin/cqlsh host.docker.internal
+ $ docker run -v $CASSANDRA_DIR:/code -it ubuntu-lts-py3:latest /code/bin/cqlsh host.docker.internal
+
+If `host.docker.internal` isn't supported, then you can use `--net="host"` with `docker run`:
+
+ $ docker run --net="host" -v $CASSANDRA_DIR:/code -it ubuntu-lts-py3:latest /code/bin/cqlsh
This will try to spawn a cqlsh instance inside the Docker container running Ubuntu LTS (18.04)
with minimal Python installation. It will try to connect to the Cassandra instance running on the
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org