This is an automated email from the ASF dual-hosted git repository.
dcapwell 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 1515a6e python upgrade tests include tests which are not impacted by
the version under test patch by David Capwell, Michael Semb Wever; reviewed by
Marcus Eriksson, Michael Semb Wever for CASSANDRA-16328
1515a6e is described below
commit 1515a6e60c0c0cee28ccc1ff261ccbee9ac0388c
Author: David Capwell <dcapw...@apache.org>
AuthorDate: Thu Dec 10 13:54:42 2020 -0800
python upgrade tests include tests which are not impacted by the version
under test
patch by David Capwell, Michael Semb Wever; reviewed by Marcus Eriksson,
Michael Semb Wever for CASSANDRA-16328
---
.circleci/config-2_1.yml | 6 ++----
.circleci/config.yml | 45 ++------------------------------------------
.circleci/config.yml.HIGHRES | 45 ++------------------------------------------
.circleci/config.yml.LOWRES | 45 ++------------------------------------------
.circleci/config.yml.MIDRES | 45 ++------------------------------------------
5 files changed, 10 insertions(+), 176 deletions(-)
diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml
index be9e96c..c80eaee 100644
--- a/.circleci/config-2_1.yml
+++ b/.circleci/config-2_1.yml
@@ -522,12 +522,10 @@ jobs:
- create_venv
- create_dtest_containers:
file_tag: j8_upgradetests_without_vnodes
- run_dtests_extra_args: '--execute-upgrade-tests-only'
- extra_env_args: 'RUN_STATIC_UPGRADE_MATRIX=true'
+ run_dtests_extra_args: '--execute-upgrade-tests-only
--upgrade-target-version-only --upgrade-version-selection all'
- run_dtests:
file_tag: j8_upgradetests_without_vnodes
- extra_env_args: 'RUN_STATIC_UPGRADE_MATRIX=true'
- pytest_extra_args: '--execute-upgrade-tests-only'
+ pytest_extra_args: '--execute-upgrade-tests-only
--upgrade-target-version-only --upgrade-version-selection all'
j8_cqlsh-dtests-py2-with-vnodes:
<<: *j8_par_executor
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 94fe9f5..7b49ca6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -971,52 +971,11 @@ jobs:
- run:
name: Determine Tests to Run (j8_upgradetests_without_vnodes)
no_output_timeout: 5m
- command: |
- # reminder: this code (along with all the steps) is independently
executed on every circle container
- # so the goal here is to get the circleci script to return the tests
*this* container will run
- # which we do via the `circleci` cli tool.
-
- cd cassandra-dtest
- 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
- fi
-
- echo "***Collected DTests (j8_upgradetests_without_vnodes)***"
- set -eo pipefail && ./run_dtests.py --execute-upgrade-tests-only
--dtest-print-tests-only
--dtest-print-tests-output=/tmp/all_dtest_tests_j8_upgradetests_without_vnodes_raw
--cassandra-dir=../cassandra
- if [ -z '' ]; then
- mv /tmp/all_dtest_tests_j8_upgradetests_without_vnodes_raw
/tmp/all_dtest_tests_j8_upgradetests_without_vnodes
- else
- grep -e '' /tmp/all_dtest_tests_j8_upgradetests_without_vnodes_raw
> /tmp/all_dtest_tests_j8_upgradetests_without_vnodes || { echo "Filter did not
match any tests! Exiting build."; exit 0; }
- fi
- set -eo pipefail && circleci tests split --split-by=timings
--timings-type=classname /tmp/all_dtest_tests_j8_upgradetests_without_vnodes >
/tmp/split_dtest_tests_j8_upgradetests_without_vnodes.txt
- cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes.txt | tr
'\n' ' ' > /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
- cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
+ 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_upgradetests_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py
--exe [...]
- run:
name: Run dtests (j8_upgradetests_without_vnodes)
no_output_timeout: 15m
- command: |
- echo "cat
/tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt"
- cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
-
- 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
- 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_upgradetests_without_vnodes_final.txt`
- set -o pipefail && cd ~/cassandra-dtest && pytest
--execute-upgrade-tests-only --log-cli-level=DEBUG
--junit-xml=/tmp/results/dtests/pytest_result_j8_upgradetests_without_vnodes.xml
-s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1
| tee /tmp/dtest/stdout.txt
+ command: "echo \"cat
/tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt\"\ncat
/tmp/split_dtest_tests_j8_upgradetests_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
u [...]
- store_test_results:
path: /tmp/results
- store_artifacts:
diff --git a/.circleci/config.yml.HIGHRES b/.circleci/config.yml.HIGHRES
index 4bd37d4..1fb38d2 100644
--- a/.circleci/config.yml.HIGHRES
+++ b/.circleci/config.yml.HIGHRES
@@ -971,52 +971,11 @@ jobs:
- run:
name: Determine Tests to Run (j8_upgradetests_without_vnodes)
no_output_timeout: 5m
- command: |
- # reminder: this code (along with all the steps) is independently
executed on every circle container
- # so the goal here is to get the circleci script to return the tests
*this* container will run
- # which we do via the `circleci` cli tool.
-
- cd cassandra-dtest
- 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
- fi
-
- echo "***Collected DTests (j8_upgradetests_without_vnodes)***"
- set -eo pipefail && ./run_dtests.py --execute-upgrade-tests-only
--dtest-print-tests-only
--dtest-print-tests-output=/tmp/all_dtest_tests_j8_upgradetests_without_vnodes_raw
--cassandra-dir=../cassandra
- if [ -z '' ]; then
- mv /tmp/all_dtest_tests_j8_upgradetests_without_vnodes_raw
/tmp/all_dtest_tests_j8_upgradetests_without_vnodes
- else
- grep -e '' /tmp/all_dtest_tests_j8_upgradetests_without_vnodes_raw
> /tmp/all_dtest_tests_j8_upgradetests_without_vnodes || { echo "Filter did not
match any tests! Exiting build."; exit 0; }
- fi
- set -eo pipefail && circleci tests split --split-by=timings
--timings-type=classname /tmp/all_dtest_tests_j8_upgradetests_without_vnodes >
/tmp/split_dtest_tests_j8_upgradetests_without_vnodes.txt
- cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes.txt | tr
'\n' ' ' > /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
- cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
+ 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_upgradetests_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py
--exe [...]
- run:
name: Run dtests (j8_upgradetests_without_vnodes)
no_output_timeout: 15m
- command: |
- echo "cat
/tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt"
- cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
-
- 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
- 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_upgradetests_without_vnodes_final.txt`
- set -o pipefail && cd ~/cassandra-dtest && pytest
--execute-upgrade-tests-only --log-cli-level=DEBUG
--junit-xml=/tmp/results/dtests/pytest_result_j8_upgradetests_without_vnodes.xml
-s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1
| tee /tmp/dtest/stdout.txt
+ command: "echo \"cat
/tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt\"\ncat
/tmp/split_dtest_tests_j8_upgradetests_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
u [...]
- store_test_results:
path: /tmp/results
- store_artifacts:
diff --git a/.circleci/config.yml.LOWRES b/.circleci/config.yml.LOWRES
index 94fe9f5..7b49ca6 100644
--- a/.circleci/config.yml.LOWRES
+++ b/.circleci/config.yml.LOWRES
@@ -971,52 +971,11 @@ jobs:
- run:
name: Determine Tests to Run (j8_upgradetests_without_vnodes)
no_output_timeout: 5m
- command: |
- # reminder: this code (along with all the steps) is independently
executed on every circle container
- # so the goal here is to get the circleci script to return the tests
*this* container will run
- # which we do via the `circleci` cli tool.
-
- cd cassandra-dtest
- 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
- fi
-
- echo "***Collected DTests (j8_upgradetests_without_vnodes)***"
- set -eo pipefail && ./run_dtests.py --execute-upgrade-tests-only
--dtest-print-tests-only
--dtest-print-tests-output=/tmp/all_dtest_tests_j8_upgradetests_without_vnodes_raw
--cassandra-dir=../cassandra
- if [ -z '' ]; then
- mv /tmp/all_dtest_tests_j8_upgradetests_without_vnodes_raw
/tmp/all_dtest_tests_j8_upgradetests_without_vnodes
- else
- grep -e '' /tmp/all_dtest_tests_j8_upgradetests_without_vnodes_raw
> /tmp/all_dtest_tests_j8_upgradetests_without_vnodes || { echo "Filter did not
match any tests! Exiting build."; exit 0; }
- fi
- set -eo pipefail && circleci tests split --split-by=timings
--timings-type=classname /tmp/all_dtest_tests_j8_upgradetests_without_vnodes >
/tmp/split_dtest_tests_j8_upgradetests_without_vnodes.txt
- cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes.txt | tr
'\n' ' ' > /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
- cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
+ 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_upgradetests_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py
--exe [...]
- run:
name: Run dtests (j8_upgradetests_without_vnodes)
no_output_timeout: 15m
- command: |
- echo "cat
/tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt"
- cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
-
- 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
- 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_upgradetests_without_vnodes_final.txt`
- set -o pipefail && cd ~/cassandra-dtest && pytest
--execute-upgrade-tests-only --log-cli-level=DEBUG
--junit-xml=/tmp/results/dtests/pytest_result_j8_upgradetests_without_vnodes.xml
-s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1
| tee /tmp/dtest/stdout.txt
+ command: "echo \"cat
/tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt\"\ncat
/tmp/split_dtest_tests_j8_upgradetests_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
u [...]
- store_test_results:
path: /tmp/results
- store_artifacts:
diff --git a/.circleci/config.yml.MIDRES b/.circleci/config.yml.MIDRES
index 330e669..2f928ef 100644
--- a/.circleci/config.yml.MIDRES
+++ b/.circleci/config.yml.MIDRES
@@ -971,52 +971,11 @@ jobs:
- run:
name: Determine Tests to Run (j8_upgradetests_without_vnodes)
no_output_timeout: 5m
- command: |
- # reminder: this code (along with all the steps) is independently
executed on every circle container
- # so the goal here is to get the circleci script to return the tests
*this* container will run
- # which we do via the `circleci` cli tool.
-
- cd cassandra-dtest
- 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
- fi
-
- echo "***Collected DTests (j8_upgradetests_without_vnodes)***"
- set -eo pipefail && ./run_dtests.py --execute-upgrade-tests-only
--dtest-print-tests-only
--dtest-print-tests-output=/tmp/all_dtest_tests_j8_upgradetests_without_vnodes_raw
--cassandra-dir=../cassandra
- if [ -z '' ]; then
- mv /tmp/all_dtest_tests_j8_upgradetests_without_vnodes_raw
/tmp/all_dtest_tests_j8_upgradetests_without_vnodes
- else
- grep -e '' /tmp/all_dtest_tests_j8_upgradetests_without_vnodes_raw
> /tmp/all_dtest_tests_j8_upgradetests_without_vnodes || { echo "Filter did not
match any tests! Exiting build."; exit 0; }
- fi
- set -eo pipefail && circleci tests split --split-by=timings
--timings-type=classname /tmp/all_dtest_tests_j8_upgradetests_without_vnodes >
/tmp/split_dtest_tests_j8_upgradetests_without_vnodes.txt
- cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes.txt | tr
'\n' ' ' > /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
- cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
+ 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_upgradetests_without_vnodes)***\"\nset -eo pipefail && ./run_dtests.py
--exe [...]
- run:
name: Run dtests (j8_upgradetests_without_vnodes)
no_output_timeout: 15m
- command: |
- echo "cat
/tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt"
- cat /tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt
-
- 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
- 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_upgradetests_without_vnodes_final.txt`
- set -o pipefail && cd ~/cassandra-dtest && pytest
--execute-upgrade-tests-only --log-cli-level=DEBUG
--junit-xml=/tmp/results/dtests/pytest_result_j8_upgradetests_without_vnodes.xml
-s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1
| tee /tmp/dtest/stdout.txt
+ command: "echo \"cat
/tmp/split_dtest_tests_j8_upgradetests_without_vnodes_final.txt\"\ncat
/tmp/split_dtest_tests_j8_upgradetests_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
u [...]
- store_test_results:
path: /tmp/results
- store_artifacts:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
