You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2022/11/07 17:33:46 UTC
[cassandra] branch cassandra-4.0 updated: CircleCI: Fix j11_utests_fqltool executor
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-4.0 by this push:
new 7dbbe6907b CircleCI: Fix j11_utests_fqltool executor
7dbbe6907b is described below
commit 7dbbe6907be58138f2c88d0adaab5c99a038e2b1
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Mon Nov 7 15:41:47 2022 +0000
CircleCI: Fix j11_utests_fqltool executor
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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org