Skip to content
Permalink
Browse files
Merge branch 'cassandra-2.2' into cassandra-3.0
  • Loading branch information
ekaterinadimitrova2 committed Nov 12, 2021
2 parents e4d9672 + 97265dd commit e0bdf10f9702098ce47a4d07d99593014c9690ad
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 57 deletions.
@@ -327,7 +327,7 @@ executors:
type: string
default: medium
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
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:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -128,7 +128,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
repeated_jvm_upgrade_dtest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -302,7 +302,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
repeated_upgrade_dtest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -422,7 +422,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_repeated_dtest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -542,7 +542,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
build:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -639,7 +639,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_dtests-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -713,7 +713,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_upgradetests-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -828,7 +828,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_unit_tests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -936,7 +936,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_dtests-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1010,7 +1010,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_jvm_dtests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1118,7 +1118,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_long:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1180,7 +1180,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_compression:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1288,7 +1288,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_repeated_utest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1462,7 +1462,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_dtest_jars_build:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
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:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -128,7 +128,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
repeated_jvm_upgrade_dtest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -302,7 +302,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
repeated_upgrade_dtest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -422,7 +422,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_repeated_dtest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -542,7 +542,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
build:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -639,7 +639,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_dtests-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -713,7 +713,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_upgradetests-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -828,7 +828,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_unit_tests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -936,7 +936,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_dtests-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1010,7 +1010,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_jvm_dtests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1118,7 +1118,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_long:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1180,7 +1180,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_compression:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1288,7 +1288,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_repeated_utest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1462,7 +1462,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_dtest_jars_build:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
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:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -128,7 +128,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
repeated_jvm_upgrade_dtest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -302,7 +302,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
repeated_upgrade_dtest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -422,7 +422,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_repeated_dtest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -542,7 +542,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
build:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -639,7 +639,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_dtests-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -713,7 +713,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_upgradetests-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -828,7 +828,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_unit_tests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -936,7 +936,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_dtests-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1010,7 +1010,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_jvm_dtests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1118,7 +1118,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_long:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1180,7 +1180,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
utests_compression:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1288,7 +1288,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_repeated_utest:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@@ -1462,7 +1462,7 @@ jobs:
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
j8_dtest_jars_build:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l

0 comments on commit e0bdf10

Please sign in to comment.