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

Merge branch 'cassandra-4.1' into trunk

This commit is contained in:
Andrés de la Peña 2022-11-07 17:31:41 +00:00
parent addc5748a7 9dcba20866
commit 037e709ee6
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1450,7 +1450,7 @@ jobs:
target: fqltool-test
j11_utests_fqltool:
<<: *j8_seq_executor
<<: *j11_seq_executor
steps:
- attach_workspace:
at: /home/cassandra

7
.circleci/config.yml
View File

@ -1981,7 +1981,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_utests_fqltool:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@ -2048,8 +2048,9 @@ jobs:
- REPEATED_ANT_TEST_METHODS: null
- REPEATED_ANT_TEST_VNODES: false
- REPEATED_ANT_TEST_COUNT: 500
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- CASSANDRA_USE_JDK11: true
j8_utests_system_keyspace_directory:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest

7
.circleci/config.yml.HIGHRES
View File

@ -1981,7 +1981,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_utests_fqltool:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@ -2048,8 +2048,9 @@ jobs:
- REPEATED_ANT_TEST_METHODS: null
- REPEATED_ANT_TEST_VNODES: false
- REPEATED_ANT_TEST_COUNT: 500
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- CASSANDRA_USE_JDK11: true
j8_utests_system_keyspace_directory:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest

7
.circleci/config.yml.LOWRES
View File

@ -1981,7 +1981,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_utests_fqltool:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@ -2048,8 +2048,9 @@ jobs:
- REPEATED_ANT_TEST_METHODS: null
- REPEATED_ANT_TEST_VNODES: false
- REPEATED_ANT_TEST_COUNT: 500
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- CASSANDRA_USE_JDK11: true
j8_utests_system_keyspace_directory:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest

7
.circleci/config.yml.MIDRES
View File

@ -1981,7 +1981,7 @@ jobs:
- CASSANDRA_USE_JDK11: true
j11_utests_fqltool:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
- image: apache/cassandra-testing-ubuntu2004-java11:latest
resource_class: medium
working_directory: ~/
shell: /bin/bash -eo pipefail -l
@ -2048,8 +2048,9 @@ jobs:
- REPEATED_ANT_TEST_METHODS: null
- REPEATED_ANT_TEST_VNODES: false
- REPEATED_ANT_TEST_COUNT: 500
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
- JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
- CASSANDRA_USE_JDK11: true
j8_utests_system_keyspace_directory:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest