From 457422ac1acc3c6e13c3738410def539af64d264 Mon Sep 17 00:00:00 2001 From: Mick Semb Wever Date: Wed, 6 Jan 2021 09:19:01 +0100 Subject: [PATCH] Use ubuntu2004_* docker testing images, from the apache organisation in dockerhub patch by Mick Semb Wever; reviewed by Sam Tunnicliffe for CASSANDRA-16373 --- .circleci/config-2_1.yml | 2 +- .circleci/config.yml | 16 ++++++++-------- .circleci/config.yml.HIGHRES | 16 ++++++++-------- .circleci/config.yml.LOWRES | 16 ++++++++-------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml index 44bf4ca048..38265751a7 100644 --- a/.circleci/config-2_1.yml +++ b/.circleci/config-2_1.yml @@ -102,7 +102,7 @@ executors: type: string default: medium docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: << parameters.exec_resource_class >> working_directory: ~/ shell: /bin/bash -eo pipefail -l diff --git a/.circleci/config.yml b/.circleci/config.yml index 862d4a164b..8627e96684 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -77,7 +77,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_unit_tests: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -166,7 +166,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_jvm_dtests: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -255,7 +255,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 utests_long: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -298,7 +298,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 utests_compression: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -387,7 +387,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_dtests-with-vnodes: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -445,7 +445,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_dtests-no-vnodes: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -503,7 +503,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_upgradetests-no-vnodes: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l diff --git a/.circleci/config.yml.HIGHRES b/.circleci/config.yml.HIGHRES index 6e5a50baa8..c825bf142f 100644 --- a/.circleci/config.yml.HIGHRES +++ b/.circleci/config.yml.HIGHRES @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -77,7 +77,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_unit_tests: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -166,7 +166,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_jvm_dtests: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -255,7 +255,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 utests_long: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -298,7 +298,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 utests_compression: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -387,7 +387,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_dtests-with-vnodes: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -445,7 +445,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_dtests-no-vnodes: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -503,7 +503,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_upgradetests-no-vnodes: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l diff --git a/.circleci/config.yml.LOWRES b/.circleci/config.yml.LOWRES index 862d4a164b..8627e96684 100644 --- a/.circleci/config.yml.LOWRES +++ b/.circleci/config.yml.LOWRES @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -77,7 +77,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_unit_tests: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -166,7 +166,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_jvm_dtests: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -255,7 +255,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 utests_long: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -298,7 +298,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 utests_compression: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -387,7 +387,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_dtests-with-vnodes: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -445,7 +445,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_dtests-no-vnodes: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -503,7 +503,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_upgradetests-no-vnodes: docker: - - image: beobal/cassandra-testing-ubuntu1910-java11-w-dependencies:20201130 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l