This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 9dcba208667589aa2309e86cfdd90c7d09682ff1 Merge: acda6fad68 7dbbe6907b Author: Andrés de la Peña <[email protected]> AuthorDate: Mon Nov 7 17:31:02 2022 +0000 Merge branch 'cassandra-4.0' into cassandra-4.1 .circleci/config-2_1.yml | 2 +- .circleci/config.yml | 7 ++++--- .circleci/config.yml.HIGHRES | 7 ++++--- .circleci/config.yml.LOWRES | 7 ++++--- .circleci/config.yml.MIDRES | 7 ++++--- 5 files changed, 17 insertions(+), 13 deletions(-) diff --cc .circleci/config.yml index 238c4f12bf,ca564102a1..64d2e8f9a9 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@@ -1956,10 -2402,10 +1956,11 @@@ jobs - REPEATED_ANT_TEST_TARGET: testsome - REPEATED_ANT_TEST_CLASS: null - 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 diff --cc .circleci/config.yml.HIGHRES index d855f4dd94,e027af8dd6..2f411f18da --- a/.circleci/config.yml.HIGHRES +++ b/.circleci/config.yml.HIGHRES @@@ -1956,10 -2402,10 +1956,11 @@@ jobs - REPEATED_ANT_TEST_TARGET: testsome - REPEATED_ANT_TEST_CLASS: null - 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 diff --cc .circleci/config.yml.LOWRES index 1e0d88ab51,a056b63876..33923d8e69 --- a/.circleci/config.yml.LOWRES +++ b/.circleci/config.yml.LOWRES @@@ -1956,10 -2402,10 +1956,11 @@@ jobs - REPEATED_ANT_TEST_TARGET: testsome - REPEATED_ANT_TEST_CLASS: null - 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 diff --cc .circleci/config.yml.MIDRES index d903332c3b,88e6977806..50dffc5791 --- a/.circleci/config.yml.MIDRES +++ b/.circleci/config.yml.MIDRES @@@ -1956,10 -2402,10 +1956,11 @@@ jobs - REPEATED_ANT_TEST_TARGET: testsome - REPEATED_ANT_TEST_CLASS: null - 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 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
