natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into cassandra-4.0

This commit is contained in:
Ekaterina Dimitrova 2022-11-10 12:31:07 -05:00
parent 38806e795b 7572725def
commit 2b3d0d32a7
8 changed files with 5101 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

318
.circleci/config-2_1.yml
View File

@ -456,6 +456,19 @@ j8_separate_jobs: &j8_separate_jobs
requires:
- start_j8_dtests_vnode_repeat
- j8_build
# Java 8 off-heap dtests
- start_j8_dtests_offheap:
type: approval
- j8_dtests_offheap:
requires:
- start_j8_dtests_offheap
- j8_build
- start_j8_dtests_offheap_repeat:
type: approval
- j8_dtests_offheap_repeat:
requires:
- start_j8_dtests_offheap_repeat
- j8_build
# Java 11 dtests
- start_j11_dtests:
type: approval
@ -481,6 +494,19 @@ j8_separate_jobs: &j8_separate_jobs
requires:
- start_j11_dtests_vnode_repeat
- j8_build
# Java 11 off-heap dtests
- start_j11_dtests_offheap:
type: approval
- j11_dtests_offheap:
requires:
- start_j11_dtests_offheap
- j8_build
- start_j11_dtests_offheap_repeat:
type: approval
- j11_dtests_offheap_repeat:
requires:
- start_j11_dtests_offheap_repeat
- j8_build
# Java 8 upgrade tests
- start_upgrade_tests:
type: approval
@ -521,6 +547,21 @@ j8_separate_jobs: &j8_separate_jobs
requires:
- start_j8_cqlsh_tests
- j8_build
# Java 8 cqlsh offheap dtests offheap
- start_j8_cqlsh_tests_offheap:
type: approval
- j8_cqlsh-dtests-py2-offheap:
requires:
- start_j8_cqlsh_tests_offheap
- j8_build
- j8_cqlsh_dtests_py3_offheap:
requires:
- start_j8_cqlsh_tests_offheap
- j8_build
- j8_cqlsh_dtests_py38_offheap:
requires:
- start_j8_cqlsh_tests_offheap
- j8_build
# Java 11 cqlsh dtests
- start_j11_cqlsh_tests:
type: approval
@ -548,6 +589,21 @@ j8_separate_jobs: &j8_separate_jobs
requires:
- start_j11_cqlsh_tests
- j8_build
# Java 11 cqlsh dtests off-heap
- start_j11_cqlsh_tests_offheap:
type: approval
- j11_cqlsh-dtests-py2-offheap:
requires:
- start_j11_cqlsh_tests_offheap
- j8_build
- j11_cqlsh_dtests_py3_offheap:
requires:
- start_j11_cqlsh_tests_offheap
- j8_build
- j11_cqlsh_dtests_py38_offheap:
requires:
- start_j11_cqlsh_tests_offheap
- j8_build
# Java 8 repeated utest
- start_j8_repeated_ant_test:
type: approval
@ -725,6 +781,16 @@ j8_pre-commit_jobs: &j8_pre-commit_jobs
- j8_dtests_vnode_repeat:
requires:
- j8_build
- start_j8_dtests_offheap:
type: approval
- j8_dtests_offheap:
requires:
- start_j8_dtests_offheap
- j8_build
- j8_dtests_offheap_repeat:
requires:
- start_j8_dtests_offheap
- j8_build
# Java 11 dtests
- j11_dtests:
requires:
@ -738,6 +804,16 @@ j8_pre-commit_jobs: &j8_pre-commit_jobs
- j11_dtests_vnode_repeat:
requires:
- j8_build
- start_j11_dtests_offheap:
type: approval
- j11_dtests_offheap:
requires:
- start_j11_dtests_offheap
- j8_build
- j11_dtests_offheap_repeat:
requires:
- start_j11_dtests_offheap
- j8_build
# Java 8 upgrade tests (on request)
- start_upgrade_tests:
type: approval
@ -768,6 +844,21 @@ j8_pre-commit_jobs: &j8_pre-commit_jobs
- j8_cqlsh_dtests_py38:
requires:
- j8_build
# Java 8 cqlsh dtests offheap
- start_j8_cqlsh_dtests_offheap:
type: approval
- j8_cqlsh-dtests-py2-offheap:
requires:
- start_j8_cqlsh_dtests_offheap
- j8_build
- j8_cqlsh_dtests_py3_offheap:
requires:
- start_j8_cqlsh_dtests_offheap
- j8_build
- j8_cqlsh_dtests_py38_offheap:
requires:
- start_j8_cqlsh_dtests_offheap
- j8_build
# Java 11 cqlsh dtests
- j11_cqlsh-dtests-py2-with-vnodes:
requires:
@ -787,6 +878,21 @@ j8_pre-commit_jobs: &j8_pre-commit_jobs
- j11_cqlsh_dtests_py38:
requires:
- j8_build
# Java 11 cqlsh dtests off-heap
- start_j11_cqlsh-dtests-offheap:
type: approval
- j11_cqlsh-dtests-py2-offheap:
requires:
- start_j11_cqlsh-dtests-offheap
- j8_build
- j11_cqlsh_dtests_py3_offheap:
requires:
- start_j11_cqlsh-dtests-offheap
- j8_build
- j11_cqlsh_dtests_py38_offheap:
requires:
- start_j11_cqlsh-dtests-offheap
- j8_build
j11_separate_jobs: &j11_separate_jobs
jobs:
@ -851,6 +957,18 @@ j11_separate_jobs: &j11_separate_jobs
requires:
- start_j11_dtests_vnode_repeat
- j11_build
- start_j11_dtests_offheap:
type: approval
- j11_dtests_offheap:
requires:
- start_j11_dtests_offheap
- j11_build
- start_j11_dtests_offheap_repeat:
type: approval
- j11_dtests_offheap_repeat:
requires:
- start_j11_dtests_offheap_repeat
- j11_build
- start_j11_cqlsh_tests:
type: approval
- j11_cqlsh-dtests-py2-with-vnodes:
@ -877,6 +995,20 @@ j11_separate_jobs: &j11_separate_jobs
requires:
- start_j11_cqlsh_tests
- j11_build
- start_j11_cqlsh-dtests-offheap:
type: approval
- j11_cqlsh-dtests-py2-offheap:
requires:
- start_j11_cqlsh-dtests-offheap
- j11_build
- j11_cqlsh_dtests_py3_offheap:
requires:
- start_j11_cqlsh-dtests-offheap
- j11_build
- j11_cqlsh_dtests_py38_offheap:
requires:
- start_j11_cqlsh-dtests-offheap
- j11_build
# specialized unit tests (all run on request)
- start_j11_utests_long:
type: approval
@ -998,6 +1130,18 @@ j11_pre-commit_jobs: &j11_pre-commit_jobs
- j11_dtests_vnode_repeat:
requires:
- j11_build
- start_j11_dtests_offheap:
type: approval
- j11_dtests_offheap:
requires:
- start_j11_dtests_offheap
- j11_build
- start_j11_dtests_offheap_repeat:
type: approval
- j11_dtests_offheap_repeat:
requires:
- start_j11_dtests_offheap_repeat
- j11_build
- j11_cqlsh-dtests-py2-with-vnodes:
requires:
- j11_build
@ -1016,6 +1160,20 @@ j11_pre-commit_jobs: &j11_pre-commit_jobs
- j11_cqlsh_dtests_py38:
requires:
- j11_build
- start_j11_cqlsh-dtests-offheap:
type: approval
- j11_cqlsh-dtests-py2-offheap:
requires:
- start_j11_cqlsh-dtests-offheap
- j11_build
- j11_cqlsh_dtests_py3_offheap:
requires:
- start_j11_cqlsh-dtests-offheap
- j11_build
- j11_cqlsh_dtests_py38_offheap:
requires:
- start_j11_cqlsh-dtests-offheap
- j11_build
# specialized unit tests (all run on request)
- start_utests_long:
type: approval
@ -1344,6 +1502,20 @@ jobs:
file_tag: j8_with_vnodes
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
j8_dtests_offheap:
<<: *j8_par_executor
steps:
- attach_workspace:
at: /home/cassandra
- clone_dtest
- create_venv
- create_dtest_containers:
file_tag: j8_dtests_offheap
run_dtests_extra_args: "--use-vnodes --use-off-heap-memtables --skip-resource-intensive-tests --pytest-options '-k not cql'"
- run_dtests:
file_tag: j8_dtests_offheap
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
j11_dtests_vnode:
<<: *j11_par_executor
steps:
@ -1359,6 +1531,21 @@ jobs:
file_tag: j11_with_vnodes
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
j11_dtests_offheap:
<<: *j11_par_executor
steps:
- attach_workspace:
at: /home/cassandra
- log_environment
- clone_dtest
- create_venv
- create_dtest_containers:
file_tag: j11_dtests_offheap
run_dtests_extra_args: "--use-vnodes --use-off-heap-memtables --skip-resource-intensive-tests --pytest-options '-k not cql'"
- run_dtests:
file_tag: j11_dtests_offheap
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
j8_dtests:
<<: *j8_par_executor
steps:
@ -1417,6 +1604,21 @@ jobs:
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j8_cqlsh-dtests-py2-offheap:
<<: *j8_par_executor
steps:
- attach_workspace:
at: /home/cassandra
- clone_dtest
- create_venv
- create_dtest_containers:
file_tag: j8_dtests_offheap
run_dtests_extra_args: "--use-vnodes --use-off-heap-memtables --skip-resource-intensive-tests --pytest-options '-k cql'"
- run_dtests:
file_tag: j8_dtests_offheap
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j8_cqlsh_dtests_py3_vnode:
<<: *j8_par_executor
steps:
@ -1432,6 +1634,21 @@ jobs:
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j8_cqlsh_dtests_py3_offheap:
<<: *j8_par_executor
steps:
- attach_workspace:
at: /home/cassandra
- clone_dtest
- create_venv
- create_dtest_containers:
file_tag: j8_dtests_offheap
run_dtests_extra_args: "--use-vnodes --use-off-heap-memtables --skip-resource-intensive-tests --pytest-options '-k cql'"
- run_dtests:
file_tag: j8_dtests_offheap
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j8_cqlsh_dtests_py38_vnode:
<<: *j8_par_executor
steps:
@ -1450,6 +1667,24 @@ jobs:
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.8'
python_version: '3.8'
j8_cqlsh_dtests_py38_offheap:
<<: *j8_par_executor
steps:
- attach_workspace:
at: /home/cassandra
- clone_dtest
- create_venv:
python_version: '3.8'
- create_dtest_containers:
file_tag: j8_dtests_offheap
run_dtests_extra_args: "--use-vnodes --use-off-heap-memtables --skip-resource-intensive-tests --pytest-options '-k cql'"
python_version: '3.8'
- run_dtests:
file_tag: j8_dtests_offheap
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --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:
@ -1513,6 +1748,21 @@ jobs:
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j11_cqlsh-dtests-py2-offheap:
<<: *j11_par_executor
steps:
- attach_workspace:
at: /home/cassandra
- clone_dtest
- create_venv
- create_dtest_containers:
file_tag: j11_dtests_offheap
run_dtests_extra_args: "--use-vnodes --use-off-heap-memtables --skip-resource-intensive-tests --pytest-options '-k cql'"
- run_dtests:
file_tag: j11_dtests_offheap
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j11_cqlsh_dtests_py3_vnode:
<<: *j11_par_executor
steps:
@ -1528,6 +1778,21 @@ jobs:
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j11_cqlsh_dtests_py3_offheap:
<<: *j11_par_executor
steps:
- attach_workspace:
at: /home/cassandra
- clone_dtest
- create_venv
- create_dtest_containers:
file_tag: j11_dtests_offheap
run_dtests_extra_args: "--use-vnodes --use-off-heap-memtables --skip-resource-intensive-tests --pytest-options '-k cql'"
- run_dtests:
file_tag: j11_dtests_offheap
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j11_cqlsh_dtests_py38_vnode:
<<: *j11_par_executor
steps:
@ -1546,6 +1811,24 @@ jobs:
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.8'
python_version: '3.8'
j11_cqlsh_dtests_py38_offheap:
<<: *j11_par_executor
steps:
- attach_workspace:
at: /home/cassandra
- clone_dtest
- create_venv:
python_version: '3.8'
- create_dtest_containers:
file_tag: j11_dtests_offheap
run_dtests_extra_args: "--use-vnodes --use-off-heap-memtables --skip-resource-intensive-tests --pytest-options '-k cql'"
python_version: '3.8'
- run_dtests:
file_tag: j11_dtests_offheap
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --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:
@ -1784,6 +2067,21 @@ jobs:
count: ${REPEATED_DTESTS_COUNT}
stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
j8_dtests_offheap_repeat:
<<: *j8_repeated_dtest_executor
steps:
- attach_workspace:
at: /home/cassandra
- clone_dtest
- create_venv
- run_repeated_dtest:
tests: ${REPEATED_DTESTS}
vnodes: "true"
upgrade: "false"
count: ${REPEATED_DTESTS_COUNT}
stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
extra_dtest_args: "--use-off-heap-memtables --skip-resource-intensive-tests"
j11_dtests_repeat:
<<: *j11_repeated_dtest_executor
steps:
@ -1814,6 +2112,21 @@ jobs:
count: ${REPEATED_DTESTS_COUNT}
stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
j11_dtests_offheap_repeat:
<<: *j11_repeated_dtest_executor
steps:
- attach_workspace:
at: /home/cassandra
- clone_dtest
- create_venv
- run_repeated_dtest:
tests: ${REPEATED_DTESTS}
vnodes: "true"
upgrade: "false"
count: ${REPEATED_DTESTS_COUNT}
stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
extra_dtest_args: "--use-off-heap-memtables --skip-resource-intensive-tests"
j8_upgrade_dtests_repeat:
<<: *j8_repeated_upgrade_dtest_executor
steps:
@ -2514,6 +2827,9 @@ commands:
type: string
stop_on_failure:
type: string
extra_dtest_args:
type: string
default: ""
steps:
- run:
name: Run repeated Python dtest
@ -2568,7 +2884,7 @@ commands:
fi
# 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
set -o pipefail && cd ~/cassandra-dtest && pytest $vnodes_args --count=$count $stop_on_failure_arg $upgrade_arg --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $tests_arg | tee /tmp/dtest/stdout.txt
set -o pipefail && cd ~/cassandra-dtest && pytest $vnodes_args --count=$count $stop_on_failure_arg $upgrade_arg --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir <<parameters.extra_dtest_args>> $tests_arg | tee /tmp/dtest/stdout.txt
fi
fi
- store_test_results:

4
.circleci/config-2_1.yml.high_res.patch
View File

@ -1,5 +1,5 @@
--- config-2_1.yml 2022-10-27 10:22:41.868009084 +0100
+++ config-2_1.yml.HIGHRES 2022-10-27 10:23:05.374865893 +0100
--- config-2_1.yml 2022-11-07 21:17:20.000000000 -0500
+++ config-2_1.yml.HIGHRES 2022-11-07 21:20:40.000000000 -0500
@@ -136,14 +136,14 @@
j8_par_executor: &j8_par_executor
executor:

112
.circleci/config-2_1.yml.mid_res.patch
View File

@ -1,5 +1,5 @@
--- config-2_1.yml 2022-10-27 10:22:41.868009084 +0100
+++ config-2_1.yml.MIDRES 2022-10-27 10:23:05.368183086 +0100
--- config-2_1.yml 2022-11-08 15:19:25.000000000 -0500
+++ config-2_1.yml.MIDRES 2022-11-08 15:29:46.000000000 -0500
@@ -136,14 +136,14 @@
j8_par_executor: &j8_par_executor
executor:
@ -126,7 +126,7 @@
j8_separate_jobs: &j8_separate_jobs
jobs:
@@ -1331,7 +1355,7 @@
@@ -1489,7 +1513,7 @@
target: testclasslist-system-keyspace-directory
j8_dtests_vnode:
@ -135,25 +135,43 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1345,7 +1369,7 @@
@@ -1503,7 +1527,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
j8_dtests_offheap:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1517,7 +1541,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
j11_dtests_vnode:
- <<: *j11_par_executor
+ <<: *j11_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1360,7 +1384,7 @@
@@ -1532,7 +1556,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
j11_dtests_offheap:
- <<: *j11_par_executor
+ <<: *j11_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1547,7 +1571,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
j8_dtests:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1374,7 +1398,7 @@
@@ -1561,7 +1585,7 @@
pytest_extra_args: '--skip-resource-intensive-tests'
j11_dtests:
@ -162,7 +180,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1389,7 +1413,7 @@
@@ -1576,7 +1600,7 @@
pytest_extra_args: '--skip-resource-intensive-tests'
j8_upgrade_dtests:
@ -171,7 +189,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1403,7 +1427,7 @@
@@ -1590,7 +1614,7 @@
pytest_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all'
j8_cqlsh-dtests-py2-with-vnodes:
@ -180,7 +198,16 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1418,7 +1442,7 @@
@@ -1605,7 +1629,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j8_cqlsh-dtests-py2-offheap:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1620,7 +1644,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j8_cqlsh_dtests_py3_vnode:
@ -189,7 +216,16 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1433,7 +1457,7 @@
@@ -1635,7 +1659,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j8_cqlsh_dtests_py3_offheap:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1650,7 +1674,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j8_cqlsh_dtests_py38_vnode:
@ -198,7 +234,16 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1451,7 +1475,7 @@
@@ -1668,7 +1692,7 @@
python_version: '3.8'
j8_cqlsh_dtests_py38_offheap:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1686,7 +1710,7 @@
python_version: '3.8'
j8_cqlsh-dtests-py2-no-vnodes:
@ -207,7 +252,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1466,7 +1490,7 @@
@@ -1701,7 +1725,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j8_cqlsh_dtests_py3:
@ -216,7 +261,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1481,7 +1505,7 @@
@@ -1716,7 +1740,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j8_cqlsh_dtests_py38:
@ -225,7 +270,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1499,7 +1523,7 @@
@@ -1734,7 +1758,7 @@
python_version: '3.8'
j11_cqlsh-dtests-py2-with-vnodes:
@ -234,7 +279,16 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1514,7 +1538,7 @@
@@ -1749,7 +1773,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j11_cqlsh-dtests-py2-offheap:
- <<: *j11_par_executor
+ <<: *j11_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1764,7 +1788,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j11_cqlsh_dtests_py3_vnode:
@ -243,7 +297,16 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1529,7 +1553,7 @@
@@ -1779,7 +1803,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j11_cqlsh_dtests_py3_offheap:
- <<: *j11_par_executor
+ <<: *j11_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1794,7 +1818,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j11_cqlsh_dtests_py38_vnode:
@ -252,7 +315,16 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1547,7 +1571,7 @@
@@ -1812,7 +1836,7 @@
python_version: '3.8'
j11_cqlsh_dtests_py38_offheap:
- <<: *j11_par_executor
+ <<: *j11_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1830,7 +1854,7 @@
python_version: '3.8'
j11_cqlsh-dtests-py2-no-vnodes:
@ -261,7 +333,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1562,7 +1586,7 @@
@@ -1845,7 +1869,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j11_cqlsh_dtests_py3:
@ -270,7 +342,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1577,7 +1601,7 @@
@@ -1860,7 +1884,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j11_cqlsh_dtests_py38:
@ -279,7 +351,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -2579,3 +2603,4 @@
@@ -2895,3 +2919,4 @@
- store_artifacts:
path: ~/cassandra-dtest/logs
destination: dtest_logs

1177
.circleci/config.yml
View File

File diff suppressed because it is too large Load Diff

1177
.circleci/config.yml.HIGHRES
View File

File diff suppressed because it is too large Load Diff

1177
.circleci/config.yml.LOWRES
View File

File diff suppressed because it is too large Load Diff

1177
.circleci/config.yml.MIDRES
View File

File diff suppressed because it is too large Load Diff

2
.circleci/generate.sh
View File

@ -289,8 +289,10 @@ delete_repeated_jobs()
if (! (echo "$env_vars" | grep -q "REPEATED_DTESTS=")); then
delete_job "$1" "j8_dtests_repeat"
delete_job "$1" "j8_dtests_vnode_repeat"
delete_job "$1" "j8_dtests_offheap_repeat"
delete_job "$1" "j11_dtests_repeat"
delete_job "$1" "j11_dtests_vnode_repeat"
delete_job "$1" "j11_dtests_offheap_repeat"
fi
if (! (echo "$env_vars" | grep -q "REPEATED_UPGRADE_DTESTS=")); then
delete_job "$1" "j8_upgrade_dtests_repeat"