Skip to content
Permalink
Browse files
Merge branch 'cassandra-3.11' into cassandra-4.0
  • Loading branch information
ekaterinadimitrova2 committed May 10, 2022
2 parents a524cd4 + e5c9623 commit bbb11086c4e9a1bd889b4ba10f57f7dc3a6edd38
Showing 5 changed files with 154 additions and 154 deletions.
@@ -697,7 +697,7 @@ executors:
type: string
default: medium
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: << parameters.exec_resource_class >>
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -712,7 +712,7 @@ executors:
type: string
default: medium
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210304
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: << parameters.exec_resource_class >>
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -20,7 +20,7 @@ version: 2
jobs:
j8_jvm_upgrade_dtests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -129,7 +129,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
repeated_jvm_upgrade_dtest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -304,7 +304,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlsh-dtests-py2-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -399,7 +399,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_unit_tests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210304
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -509,7 +509,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
repeated_upgrade_dtest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -631,7 +631,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlsh-dtests-py38-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -726,7 +726,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_cqlsh-dtests-py3-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210304
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -822,7 +822,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_cqlsh-dtests-py3-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210304
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -918,7 +918,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_cqlsh-dtests-py38-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210304
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1014,7 +1014,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j8_cqlsh-dtests-py3-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1109,7 +1109,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlsh-dtests-py2-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1204,7 +1204,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_repeated_dtest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210304
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1349,7 +1349,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j8_repeated_dtest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1471,7 +1471,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_cqlsh-dtests-py2-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210304
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1567,7 +1567,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_dtests-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210304
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1666,7 +1666,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j8_dtests-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1742,7 +1742,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_upgradetests-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1818,7 +1818,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_stress:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1881,7 +1881,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_unit_tests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1990,7 +1990,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_jvm_dtests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210304
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -2100,7 +2100,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_build:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210304
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -2199,7 +2199,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_cqlsh-dtests-py2-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210304
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -2295,7 +2295,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_cqlshlib_tests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210304
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -2350,7 +2350,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_repeated_utest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210304
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -2526,7 +2526,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j8_dtests-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -2602,7 +2602,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_cqlsh-dtests-py38-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210304
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -2698,7 +2698,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j8_jvm_dtests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -2807,7 +2807,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_build:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -2905,7 +2905,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlsh-dtests-py3-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -3000,7 +3000,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlsh-dtests-py38-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -3095,7 +3095,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_long:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -3158,7 +3158,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_system_keyspace_directory:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -3267,7 +3267,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_cqlshlib_tests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -3321,7 +3321,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_fqltool:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -3384,7 +3384,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j11_dtests-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210304
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -3483,7 +3483,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
utests_compression:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -3592,7 +3592,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_repeated_utest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -3767,7 +3767,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_dtest_jars_build:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l

0 comments on commit bbb1108

Please sign in to comment.