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

Circleci should run cqlshlib tests as well 

patch by Berenguer Blasi; reviewed by David Capwell, Ekaterina Dimitrova for CASSANDRA-16121
This commit is contained in:
Berenguer Blasi 2020-11-05 15:12:56 -08:00 committed by David Capwell
parent 001767de2d
commit 0700d795bc
8 changed files with 457 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,12 @@ j8_small_par_executor: &j8_small_par_executor
#exec_resource_class: xlarge
parallelism: 1
j8_small_executor: &j8_small_executor
executor:
name: java8-executor
exec_resource_class: medium
parallelism: 1
j8_medium_par_executor: &j8_medium_par_executor
executor:
name: java8-executor
@ -52,6 +58,12 @@ j11_small_par_executor: &j11_small_par_executor
#exec_resource_class: xlarge
parallelism: 1
j11_small_executor: &j11_small_executor
executor:
name: java11-executor
#exec_resource_class: medium
parallelism: 1
j8_with_dtests_jobs: &j8_with_dtests_jobs
jobs:
- j8_build
@ -70,6 +82,9 @@ j8_with_dtests_jobs: &j8_with_dtests_jobs
- start_j11_unit_tests
- j8_build
# specialized unit tests (all run on request using Java 8)
- j8_cqlshlib_tests:
requires:
- j8_build
- start_utests_long:
type: approval
- utests_long:
@ -202,6 +217,9 @@ j11_with_dtests_jobs: &j11_with_dtests_jobs
- j11_jvm_dtests:
requires:
- j11_build
- j11_cqlshlib_tests:
requires:
- j11_build
# Java 11 dtests (on request)
- start_j11_dtests:
type: approval
@ -389,6 +407,20 @@ jobs:
- log_environment
- run_parallel_junit_tests
j8_cqlshlib_tests:
<<: *j8_small_executor
steps:
- attach_workspace:
at: /home/cassandra
- run_cqlshlib_tests
j11_cqlshlib_tests:
<<: *j11_small_executor
steps:
- attach_workspace:
at: /home/cassandra
- run_cqlshlib_tests
utests_long:
<<: *j8_seq_executor
steps:
@ -866,6 +898,23 @@ commands:
path: /tmp/cassandra/build/test/logs
destination: logs
run_cqlshlib_tests:
parameters:
no_output_timeout:
type: string
default: 15m
steps:
- run:
name: Run cqlshlib Unit Tests
command: |
export PATH=$JAVA_HOME/bin:$PATH
time mv ~/cassandra /tmp
cd /tmp/cassandra/pylib
./cassandra-cqlsh-tests.sh ..
no_output_timeout: <<parameters.no_output_timeout>>
- store_test_results:
path: /tmp/cassandra/pylib
run_parallel_junit_tests:
parameters:
target:

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

@ -1,34 +1,62 @@
22,23c22,23
< #exec_resource_class: xlarge
< parallelism: 4
---
> exec_resource_class: xlarge
> parallelism: 100
28,29c28,29
< #exec_resource_class: xlarge
< parallelism: 1
---
> exec_resource_class: xlarge
> parallelism: 5
34,35c34,35
< #exec_resource_class: xlarge
< parallelism: 1
---
> exec_resource_class: xlarge
> parallelism: 2
40c40
< #exec_resource_class: xlarge
---
> exec_resource_class: xlarge
46,47c46,47
< #exec_resource_class: xlarge
< parallelism: 4
---
> exec_resource_class: xlarge
> parallelism: 100
52,53c52,53
< #exec_resource_class: xlarge
< parallelism: 1
---
> exec_resource_class: xlarge
> parallelism: 2
@@ -19,14 +19,14 @@ default_env_vars: &default_env_vars
j8_par_executor: &j8_par_executor
executor:
name: java8-executor
- #exec_resource_class: xlarge
- parallelism: 4
+ exec_resource_class: xlarge
+ parallelism: 100
j8_small_par_executor: &j8_small_par_executor
executor:
name: java8-executor
- #exec_resource_class: xlarge
- parallelism: 1
+ exec_resource_class: xlarge
+ parallelism: 5
j8_small_executor: &j8_small_executor
executor:
@@ -37,32 +37,32 @@ j8_small_executor: &j8_small_executor
j8_medium_par_executor: &j8_medium_par_executor
executor:
name: java8-executor
- #exec_resource_class: xlarge
- parallelism: 1
+ exec_resource_class: xlarge
+ parallelism: 2
j8_seq_executor: &j8_seq_executor
executor:
name: java8-executor
- #exec_resource_class: xlarge
+ exec_resource_class: xlarge
parallelism: 1 # sequential, single container tests: no parallelism benefits
j11_par_executor: &j11_par_executor
executor:
name: java11-executor
- #exec_resource_class: xlarge
- parallelism: 4
+ exec_resource_class: xlarge
+ parallelism: 100
-j11_small_par_executor: &j11_small_par_executor
+j11_small_executor: &j11_small_executor
executor:
name: java11-executor
- #exec_resource_class: xlarge
+ exec_resource_class: medium
parallelism: 1
-j11_small_executor: &j11_small_executor
+j11_small_par_executor: &j11_small_par_executor
executor:
name: java11-executor
- #exec_resource_class: medium
- parallelism: 1
+ exec_resource_class: xlarge
+ parallelism: 2
j8_with_dtests_jobs: &j8_with_dtests_jobs
jobs:

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

@ -1,8 +1,4 @@
diff --git .circleci/config-2_1.yml .circleci/config-2_1.yml
index ab621241a4..9c11f60d5d 100644
--- .circleci/config-2_1.yml
+++ .circleci/config-2_1.yml
@@ -19,32 +19,44 @@ default_env_vars: &default_env_vars
@@ -19,14 +19,14 @@ default_env_vars: &default_env_vars
j8_par_executor: &j8_par_executor
executor:
name: java8-executor
@ -19,6 +15,9 @@ index ab621241a4..9c11f60d5d 100644
+ exec_resource_class: large
+ parallelism: 10
j8_small_executor: &j8_small_executor
executor:
@@ -37,20 +37,32 @@ j8_small_executor: &j8_small_executor
j8_medium_par_executor: &j8_medium_par_executor
executor:
name: java8-executor
@ -56,8 +55,8 @@ index ab621241a4..9c11f60d5d 100644
j11_small_par_executor: &j11_small_par_executor
executor:
@@ -52,6 +64,12 @@ j11_small_par_executor: &j11_small_par_executor
#exec_resource_class: xlarge
@@ -64,6 +76,12 @@ j11_small_executor: &j11_small_executor
#exec_resource_class: medium
parallelism: 1
+j11_large_par_executor: &j11_large_par_executor
@ -69,7 +68,7 @@ index ab621241a4..9c11f60d5d 100644
j8_with_dtests_jobs: &j8_with_dtests_jobs
jobs:
- j8_build
@@ -425,7 +443,7 @@ jobs:
@@ -456,7 +474,7 @@ jobs:
target: fqltool-test
j8_dtests-with-vnodes:
@ -78,7 +77,7 @@ index ab621241a4..9c11f60d5d 100644
steps:
- attach_workspace:
at: /home/cassandra
@@ -439,7 +457,7 @@ jobs:
@@ -470,7 +488,7 @@ jobs:
pytest_extra_args: '--use-vnodes --num-tokens=32 --skip-resource-intensive-tests'
j11_dtests-with-vnodes:
@ -87,7 +86,7 @@ index ab621241a4..9c11f60d5d 100644
steps:
- attach_workspace:
at: /home/cassandra
@@ -454,7 +472,7 @@ jobs:
@@ -485,7 +503,7 @@ jobs:
pytest_extra_args: '--use-vnodes --num-tokens=32 --skip-resource-intensive-tests'
j8_dtests-no-vnodes:
@ -96,7 +95,7 @@ index ab621241a4..9c11f60d5d 100644
steps:
- attach_workspace:
at: /home/cassandra
@@ -468,7 +486,7 @@ jobs:
@@ -499,7 +517,7 @@ jobs:
pytest_extra_args: '--skip-resource-intensive-tests'
j11_dtests-no-vnodes:
@ -105,7 +104,7 @@ index ab621241a4..9c11f60d5d 100644
steps:
- attach_workspace:
at: /home/cassandra
@@ -483,7 +501,7 @@ jobs:
@@ -514,7 +532,7 @@ jobs:
pytest_extra_args: '--skip-resource-intensive-tests'
j8_upgradetests-no-vnodes:
@ -114,7 +113,7 @@ index ab621241a4..9c11f60d5d 100644
steps:
- attach_workspace:
at: /home/cassandra
@@ -500,7 +518,7 @@ jobs:
@@ -531,7 +549,7 @@ jobs:
pytest_extra_args: '--execute-upgrade-tests'
j8_cqlsh-dtests-py2-with-vnodes:
@ -123,7 +122,7 @@ index ab621241a4..9c11f60d5d 100644
steps:
- attach_workspace:
at: /home/cassandra
@@ -515,7 +533,7 @@ jobs:
@@ -546,7 +564,7 @@ jobs:
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j8_cqlsh-dtests-py3-with-vnodes:
@ -132,7 +131,7 @@ index ab621241a4..9c11f60d5d 100644
steps:
- attach_workspace:
at: /home/cassandra
@@ -530,7 +548,7 @@ jobs:
@@ -561,7 +579,7 @@ jobs:
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j8_cqlsh-dtests-py38-with-vnodes:
@ -141,7 +140,7 @@ index ab621241a4..9c11f60d5d 100644
steps:
- attach_workspace:
at: /home/cassandra
@@ -548,7 +566,7 @@ jobs:
@@ -579,7 +597,7 @@ jobs:
python_version: '3.8'
j8_cqlsh-dtests-py2-no-vnodes:
@ -150,7 +149,7 @@ index ab621241a4..9c11f60d5d 100644
steps:
- attach_workspace:
at: /home/cassandra
@@ -563,7 +581,7 @@ jobs:
@@ -594,7 +612,7 @@ jobs:
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j8_cqlsh-dtests-py3-no-vnodes:
@ -159,7 +158,7 @@ index ab621241a4..9c11f60d5d 100644
steps:
- attach_workspace:
at: /home/cassandra
@@ -578,7 +596,7 @@ jobs:
@@ -609,7 +627,7 @@ jobs:
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j8_cqlsh-dtests-py38-no-vnodes:
@ -168,7 +167,7 @@ index ab621241a4..9c11f60d5d 100644
steps:
- attach_workspace:
at: /home/cassandra
@@ -596,7 +614,7 @@ jobs:
@@ -627,7 +645,7 @@ jobs:
python_version: '3.8'
j11_cqlsh-dtests-py2-with-vnodes:
@ -177,7 +176,7 @@ index ab621241a4..9c11f60d5d 100644
steps:
- attach_workspace:
at: /home/cassandra
@@ -611,7 +629,7 @@ jobs:
@@ -642,7 +660,7 @@ jobs:
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j11_cqlsh-dtests-py3-with-vnodes:
@ -186,7 +185,7 @@ index ab621241a4..9c11f60d5d 100644
steps:
- attach_workspace:
at: /home/cassandra
@@ -626,7 +644,7 @@ jobs:
@@ -657,7 +675,7 @@ jobs:
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j11_cqlsh-dtests-py38-with-vnodes:
@ -195,7 +194,7 @@ index ab621241a4..9c11f60d5d 100644
steps:
- attach_workspace:
at: /home/cassandra
@@ -644,7 +662,7 @@ jobs:
@@ -675,7 +693,7 @@ jobs:
python_version: '3.8'
j11_cqlsh-dtests-py2-no-vnodes:
@ -204,7 +203,7 @@ index ab621241a4..9c11f60d5d 100644
steps:
- attach_workspace:
at: /home/cassandra
@@ -659,7 +677,7 @@ jobs:
@@ -690,7 +708,7 @@ jobs:
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
j11_cqlsh-dtests-py3-no-vnodes:
@ -213,7 +212,7 @@ index ab621241a4..9c11f60d5d 100644
steps:
- attach_workspace:
at: /home/cassandra
@@ -674,7 +692,7 @@ jobs:
@@ -705,7 +723,7 @@ jobs:
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j11_cqlsh-dtests-py38-no-vnodes:
@ -222,3 +221,8 @@ index ab621241a4..9c11f60d5d 100644
steps:
- attach_workspace:
at: /home/cassandra
@@ -1063,3 +1081,4 @@ commands:
- store_artifacts:
path: ~/cassandra-dtest/logs
destination: dtest_<<parameters.file_tag>>_logs
+

79
.circleci/config.yml
View File

@ -1428,6 +1428,43 @@ jobs:
- JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- CASSANDRA_USE_JDK11: true
j11_cqlshlib_tests:
docker:
- image: nastra/cassandra-testing-ubuntu1910-java11:20200603
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
parallelism: 1
steps:
- attach_workspace:
at: /home/cassandra
- run:
name: Run cqlshlib Unit Tests
command: |
export PATH=$JAVA_HOME/bin:$PATH
time mv ~/cassandra /tmp
cd /tmp/cassandra/pylib
./cassandra-cqlsh-tests.sh ..
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/pylib
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: trunk
- 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_dtests-with-vnodes:
docker:
- image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603
@ -1934,6 +1971,42 @@ jobs:
- CCM_HEAP_NEWSIZE: 256M
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlshlib_tests:
docker:
- image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
parallelism: 1
steps:
- attach_workspace:
at: /home/cassandra
- run:
name: Run cqlshlib Unit Tests
command: |
export PATH=$JAVA_HOME/bin:$PATH
time mv ~/cassandra /tmp
cd /tmp/cassandra/pylib
./cassandra-cqlsh-tests.sh ..
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/pylib
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: trunk
- 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_fqltool:
docker:
- image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603
@ -2242,6 +2315,9 @@ workflows:
requires:
- start_j11_unit_tests
- j8_build
- j8_cqlshlib_tests:
requires:
- j8_build
- start_utests_long:
type: approval
- utests_long:
@ -2369,6 +2445,9 @@ workflows:
- j11_jvm_dtests:
requires:
- j11_build
- j11_cqlshlib_tests:
requires:
- j11_build
- start_j11_dtests:
type: approval
- j11_dtests-with-vnodes:

79
.circleci/config.yml.HIGHRES
View File

@ -1428,6 +1428,43 @@ jobs:
- JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- CASSANDRA_USE_JDK11: true
j11_cqlshlib_tests:
docker:
- image: nastra/cassandra-testing-ubuntu1910-java11:20200603
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
parallelism: 1
steps:
- attach_workspace:
at: /home/cassandra
- run:
name: Run cqlshlib Unit Tests
command: |
export PATH=$JAVA_HOME/bin:$PATH
time mv ~/cassandra /tmp
cd /tmp/cassandra/pylib
./cassandra-cqlsh-tests.sh ..
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/pylib
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: trunk
- 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_dtests-with-vnodes:
docker:
- image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603
@ -1934,6 +1971,42 @@ jobs:
- CCM_HEAP_NEWSIZE: 256M
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlshlib_tests:
docker:
- image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
parallelism: 1
steps:
- attach_workspace:
at: /home/cassandra
- run:
name: Run cqlshlib Unit Tests
command: |
export PATH=$JAVA_HOME/bin:$PATH
time mv ~/cassandra /tmp
cd /tmp/cassandra/pylib
./cassandra-cqlsh-tests.sh ..
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/pylib
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: trunk
- 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_fqltool:
docker:
- image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603
@ -2242,6 +2315,9 @@ workflows:
requires:
- start_j11_unit_tests
- j8_build
- j8_cqlshlib_tests:
requires:
- j8_build
- start_utests_long:
type: approval
- utests_long:
@ -2369,6 +2445,9 @@ workflows:
- j11_jvm_dtests:
requires:
- j11_build
- j11_cqlshlib_tests:
requires:
- j11_build
- start_j11_dtests:
type: approval
- j11_dtests-with-vnodes:

79
.circleci/config.yml.LOWRES
View File

@ -1428,6 +1428,43 @@ jobs:
- JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- CASSANDRA_USE_JDK11: true
j11_cqlshlib_tests:
docker:
- image: nastra/cassandra-testing-ubuntu1910-java11:20200603
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
parallelism: 1
steps:
- attach_workspace:
at: /home/cassandra
- run:
name: Run cqlshlib Unit Tests
command: |
export PATH=$JAVA_HOME/bin:$PATH
time mv ~/cassandra /tmp
cd /tmp/cassandra/pylib
./cassandra-cqlsh-tests.sh ..
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/pylib
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: trunk
- 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_dtests-with-vnodes:
docker:
- image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603
@ -1934,6 +1971,42 @@ jobs:
- CCM_HEAP_NEWSIZE: 256M
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlshlib_tests:
docker:
- image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
parallelism: 1
steps:
- attach_workspace:
at: /home/cassandra
- run:
name: Run cqlshlib Unit Tests
command: |
export PATH=$JAVA_HOME/bin:$PATH
time mv ~/cassandra /tmp
cd /tmp/cassandra/pylib
./cassandra-cqlsh-tests.sh ..
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/pylib
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: trunk
- 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_fqltool:
docker:
- image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603
@ -2242,6 +2315,9 @@ workflows:
requires:
- start_j11_unit_tests
- j8_build
- j8_cqlshlib_tests:
requires:
- j8_build
- start_utests_long:
type: approval
- utests_long:
@ -2369,6 +2445,9 @@ workflows:
- j11_jvm_dtests:
requires:
- j11_build
- j11_cqlshlib_tests:
requires:
- j11_build
- start_j11_dtests:
type: approval
- j11_dtests-with-vnodes:

79
.circleci/config.yml.MIDRES
View File

@ -1428,6 +1428,43 @@ jobs:
- JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- CASSANDRA_USE_JDK11: true
j11_cqlshlib_tests:
docker:
- image: nastra/cassandra-testing-ubuntu1910-java11:20200603
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
parallelism: 1
steps:
- attach_workspace:
at: /home/cassandra
- run:
name: Run cqlshlib Unit Tests
command: |
export PATH=$JAVA_HOME/bin:$PATH
time mv ~/cassandra /tmp
cd /tmp/cassandra/pylib
./cassandra-cqlsh-tests.sh ..
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/pylib
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: trunk
- 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_dtests-with-vnodes:
docker:
- image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603
@ -1934,6 +1971,42 @@ jobs:
- CCM_HEAP_NEWSIZE: 256M
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlshlib_tests:
docker:
- image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
parallelism: 1
steps:
- attach_workspace:
at: /home/cassandra
- run:
name: Run cqlshlib Unit Tests
command: |
export PATH=$JAVA_HOME/bin:$PATH
time mv ~/cassandra /tmp
cd /tmp/cassandra/pylib
./cassandra-cqlsh-tests.sh ..
no_output_timeout: 15m
- store_test_results:
path: /tmp/cassandra/pylib
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: trunk
- 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_fqltool:
docker:
- image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603
@ -2242,6 +2315,9 @@ workflows:
requires:
- start_j11_unit_tests
- j8_build
- j8_cqlshlib_tests:
requires:
- j8_build
- start_utests_long:
type: approval
- utests_long:
@ -2369,6 +2445,9 @@ workflows:
- j11_jvm_dtests:
requires:
- j11_build
- j11_cqlshlib_tests:
requires:
- j11_build
- start_j11_dtests:
type: approval
- j11_dtests-with-vnodes:

4
pylib/cassandra-cqlsh-tests.sh
View File

@ -109,6 +109,7 @@ cd ${CASSANDRA_DIR}/pylib/cqlshlib/
set +e # disable immediate exit from this point
nosetests
RETURN="$?"
ccm remove
# hack around --xunit-prefix-with-testsuite-name not being available in nose 1.3.7
@ -125,5 +126,4 @@ mv nosetests.xml ${WORKSPACE}/cqlshlib.xml
# /virtualenv
deactivate
# Exit cleanly for usable "Unstable" status
exit 0
exit ${RETURN}