From 97265ddb2c6c2364b91176e1b7e170d2d8a49e37 Mon Sep 17 00:00:00 2001 From: Ekaterina Dimitrova Date: Wed, 10 Nov 2021 13:36:58 -0500 Subject: [PATCH] Update Docker image for testing in CircleCI config patch by Ekaterina Dimitrova; reviewed by Brandon Williams and David Capwell for CASSANDRA-17134 --- .circleci/config-2_1.yml | 2 +- .circleci/config.yml | 17 ++++++++--------- .circleci/config.yml.HIGHRES | 17 ++++++++--------- .circleci/config.yml.LOWRES | 17 ++++++++--------- .circleci/generate.sh | 17 +++++++++++++---- .circleci/license.yml | 17 +++++++++++++++++ 6 files changed, 55 insertions(+), 32 deletions(-) create mode 100644 .circleci/license.yml diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml index a35be2328d..f76e769f2c 100644 --- a/.circleci/config-2_1.yml +++ b/.circleci/config-2_1.yml @@ -120,7 +120,7 @@ executors: type: string default: medium docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 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 acfd6c9c4b..c000ea493d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,12 +15,11 @@ # See the License for the specific language governing permissions and # limitations under the License. # - version: 2 jobs: build: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -95,7 +94,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_unit_tests: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -184,7 +183,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_jvm_dtests: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -273,7 +272,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 utests_long: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -316,7 +315,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 utests_compression: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -405,7 +404,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_dtests-with-vnodes: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -463,7 +462,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_dtests-no-vnodes: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -521,7 +520,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_upgradetests-no-vnodes: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l diff --git a/.circleci/config.yml.HIGHRES b/.circleci/config.yml.HIGHRES index e00060231d..f2d67e4d0f 100644 --- a/.circleci/config.yml.HIGHRES +++ b/.circleci/config.yml.HIGHRES @@ -15,12 +15,11 @@ # See the License for the specific language governing permissions and # limitations under the License. # - version: 2 jobs: build: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -95,7 +94,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_unit_tests: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -184,7 +183,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_jvm_dtests: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -273,7 +272,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 utests_long: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -316,7 +315,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 utests_compression: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -405,7 +404,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_dtests-with-vnodes: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -463,7 +462,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_dtests-no-vnodes: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -521,7 +520,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_upgradetests-no-vnodes: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l diff --git a/.circleci/config.yml.LOWRES b/.circleci/config.yml.LOWRES index fbc8c1f348..c000ea493d 100644 --- a/.circleci/config.yml.LOWRES +++ b/.circleci/config.yml.LOWRES @@ -15,12 +15,11 @@ # See the License for the specific language governing permissions and # limitations under the License. # - version: 2 jobs: build: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -95,7 +94,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_unit_tests: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -184,7 +183,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_jvm_dtests: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -273,7 +272,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 utests_long: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -316,7 +315,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 utests_compression: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -405,7 +404,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_dtests-with-vnodes: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -463,7 +462,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_dtests-no-vnodes: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l @@ -521,7 +520,7 @@ jobs: - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_upgradetests-no-vnodes: docker: - - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304 + - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210929 resource_class: medium working_directory: ~/ shell: /bin/bash -eo pipefail -l diff --git a/.circleci/generate.sh b/.circleci/generate.sh index 0ba497b2d1..c4b5a23f90 100755 --- a/.circleci/generate.sh +++ b/.circleci/generate.sh @@ -19,8 +19,17 @@ BASEDIR=`dirname $0` -circleci config process $BASEDIR/config-2_1.yml > $BASEDIR/config.yml.LOWRES -patch -o $BASEDIR/config-2_1.yml.HIGHRES $BASEDIR/config-2_1.yml $BASEDIR/config-2_1.yml.high_res.patch -circleci config process $BASEDIR/config-2_1.yml.HIGHRES > $BASEDIR/config.yml.HIGHRES -rm $BASEDIR/config-2_1.yml.HIGHRES +# setup lowres +circleci config process $BASEDIR/config-2_1.yml > $BASEDIR/config.yml.LOWRES.tmp +cat $BASEDIR/license.yml $BASEDIR/config.yml.LOWRES.tmp > $BASEDIR/config.yml.LOWRES +rm $BASEDIR/config.yml.LOWRES.tmp + +#setup highres +patch -o $BASEDIR/config-2_1.yml.HIGHRES $BASEDIR/config-2_1.yml $BASEDIR/config-2_1.yml.high_res.patch +circleci config process $BASEDIR/config-2_1.yml.HIGHRES > $BASEDIR/config.yml.HIGHRES.tmp +cat $BASEDIR/license.yml $BASEDIR/config.yml.HIGHRES.tmp > $BASEDIR/config.yml.HIGHRES +rm $BASEDIR/config-2_1.yml.HIGHRES $BASEDIR/config.yml.HIGHRES.tmp + +# copy lower into config.yml to make sure this gets updated +cp $BASEDIR/config.yml.LOWRES $BASEDIR/config.yml diff --git a/.circleci/license.yml b/.circleci/license.yml new file mode 100644 index 0000000000..3df60b02f7 --- /dev/null +++ b/.circleci/license.yml @@ -0,0 +1,17 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#