From 7dbbe6907be58138f2c88d0adaab5c99a038e2b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20de=20la=20Pe=C3=B1a?= Date: Mon, 7 Nov 2022 15:41:47 +0000 Subject: [PATCH] CircleCI: Fix j11_utests_fqltool executor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit patch by Andrés de la Peña; reviewed by Ekaterina Dimitrova for CASSANDRA-18020 --- .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 --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml index ff20ec4a16..918fa8a574 100644 --- a/.circleci/config-2_1.yml +++ b/.circleci/config-2_1.yml @@ -1303,7 +1303,7 @@ jobs: target: fqltool-test j11_utests_fqltool: - <<: *j8_seq_executor + <<: *j11_seq_executor steps: - attach_workspace: at: /home/cassandra diff --git a/.circleci/config.yml b/.circleci/config.yml index e4feeed771..ca564102a1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2339,7 +2339,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 @@ -2403,8 +2403,9 @@ jobs: - REPEATED_ANT_TEST_CLASS: null - REPEATED_ANT_TEST_METHODS: null - 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 --git a/.circleci/config.yml.HIGHRES b/.circleci/config.yml.HIGHRES index d2c0721ed1..e027af8dd6 100644 --- a/.circleci/config.yml.HIGHRES +++ b/.circleci/config.yml.HIGHRES @@ -2339,7 +2339,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 @@ -2403,8 +2403,9 @@ jobs: - REPEATED_ANT_TEST_CLASS: null - REPEATED_ANT_TEST_METHODS: null - 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 --git a/.circleci/config.yml.LOWRES b/.circleci/config.yml.LOWRES index 657c8a8624..a056b63876 100644 --- a/.circleci/config.yml.LOWRES +++ b/.circleci/config.yml.LOWRES @@ -2339,7 +2339,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 @@ -2403,8 +2403,9 @@ jobs: - REPEATED_ANT_TEST_CLASS: null - REPEATED_ANT_TEST_METHODS: null - 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 --git a/.circleci/config.yml.MIDRES b/.circleci/config.yml.MIDRES index 8937f0f703..88e6977806 100644 --- a/.circleci/config.yml.MIDRES +++ b/.circleci/config.yml.MIDRES @@ -2339,7 +2339,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 @@ -2403,8 +2403,9 @@ jobs: - REPEATED_ANT_TEST_CLASS: null - REPEATED_ANT_TEST_METHODS: null - 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