From e437ce53e243313d43e702e3158236f069b9d42b Mon Sep 17 00:00:00 2001 From: Rafal Korepta Date: Thu, 27 Jul 2023 12:10:27 +0200 Subject: [PATCH] Fix chart testing configuration per individual Github action pipeline --- .github/{ct.yaml => ct-kminion.yaml} | 3 ++- .github/ct-operator.yaml | 22 +++++++++++++++++++ .github/ct-redpanda.yaml | 22 +++++++++++++++++++ .github/workflows/nightly.yaml | 7 +++--- .github/workflows/nightly_redpanda_tip.yaml | 5 ++--- .github/workflows/pull_requests-operator.yaml | 7 +++--- .github/workflows/pull_requests.yaml | 6 ++--- .../workflows/pull_requests_from_origin.yaml | 5 ++--- .github/workflows/pull_requests_kminion.yaml | 7 +++--- 9 files changed, 62 insertions(+), 22 deletions(-) rename .github/{ct.yaml => ct-kminion.yaml} (97%) create mode 100644 .github/ct-operator.yaml create mode 100644 .github/ct-redpanda.yaml diff --git a/.github/ct.yaml b/.github/ct-kminion.yaml similarity index 97% rename from .github/ct.yaml rename to .github/ct-kminion.yaml index b213659b55..6a09df9b54 100644 --- a/.github/ct.yaml +++ b/.github/ct-kminion.yaml @@ -18,4 +18,5 @@ target-branch: main helm-extra-args: --timeout 900s chart-repos: - redpanda=https://charts.redpanda.com - +charts: + - charts/kminion diff --git a/.github/ct-operator.yaml b/.github/ct-operator.yaml new file mode 100644 index 0000000000..0cdd3ae1b3 --- /dev/null +++ b/.github/ct-operator.yaml @@ -0,0 +1,22 @@ +# 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. +debug: true +remote: origin +target-branch: main +helm-extra-args: --timeout 900s +chart-repos: + - redpanda=https://charts.redpanda.com +charts: + - charts/operator diff --git a/.github/ct-redpanda.yaml b/.github/ct-redpanda.yaml new file mode 100644 index 0000000000..44f48b835d --- /dev/null +++ b/.github/ct-redpanda.yaml @@ -0,0 +1,22 @@ +# 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. +debug: true +remote: origin +target-branch: main +helm-extra-args: --timeout 900s +chart-repos: + - redpanda=https://charts.redpanda.com +charts: + - charts/redpanda diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 2ad132ccb5..4fdb18d96e 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -43,7 +43,7 @@ jobs: version: v3.8.0-1 - name: Run chart-testing (lint) - run: ct lint --all --config .github/ct.yaml + run: ct lint --all --config .github/ct-redpanda.yaml test: name: Run ct tests for ci values matching ${{ matrix.testvaluespattern }} for Redpanda version ${{ matrix.version }} strategy: @@ -136,7 +136,6 @@ jobs: ct install \ --github-groups \ --upgrade \ - --config .github/ct.yaml \ + --config .github/ct-redpanda.yaml \ --helm-extra-set-args="--set=image.tag=${{ matrix.version }}" \ - --skip-missing-values \ - --charts=charts/redpanda \ No newline at end of file + --skip-missing-values \ No newline at end of file diff --git a/.github/workflows/nightly_redpanda_tip.yaml b/.github/workflows/nightly_redpanda_tip.yaml index 612fee4599..c7d5f91485 100644 --- a/.github/workflows/nightly_redpanda_tip.yaml +++ b/.github/workflows/nightly_redpanda_tip.yaml @@ -119,7 +119,6 @@ jobs: run: | ct install \ --github-groups \ - --config .github/ct.yaml \ + --config .github/ct-redpanda.yaml \ --helm-extra-set-args="--set=image.tag=${{ steps.latestTag.outputs.TAG }} --set=image.repository=redpandadata/redpanda-nightly" \ - --skip-missing-values \ - --charts=charts/redpanda \ No newline at end of file + --skip-missing-values \ No newline at end of file diff --git a/.github/workflows/pull_requests-operator.yaml b/.github/workflows/pull_requests-operator.yaml index 79a5437b80..a4c094eb9c 100644 --- a/.github/workflows/pull_requests-operator.yaml +++ b/.github/workflows/pull_requests-operator.yaml @@ -52,7 +52,7 @@ jobs: version: v3.8.0-1 - name: Run chart-testing (lint) - run: ct lint --config .github/ct.yaml --github-groups --chart-dirs=charts/operator + run: ct lint --config .github/ct-operator.yaml --github-groups check-values: runs-on: ubuntu-22.04 @@ -102,7 +102,7 @@ jobs: - name: Run chart-testing (list-changed) id: list-changed run: | - changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }} --chart-dirs=charts/operator ) + changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }}) echo $changed if [[ -n "$changed" ]]; then echo changed="true" >> "$GITHUB_OUTPUT" @@ -141,9 +141,8 @@ jobs: ct install \ --github-groups \ --upgrade \ - --config .github/ct.yaml \ + --config .github/ct-operator.yaml \ --skip-missing-values \ - --chart-dirs=charts/operator \ --target-branch ${{ github.event.repository.default_branch }} summary: if: always() diff --git a/.github/workflows/pull_requests.yaml b/.github/workflows/pull_requests.yaml index e537db77fe..0d54e79a29 100644 --- a/.github/workflows/pull_requests.yaml +++ b/.github/workflows/pull_requests.yaml @@ -53,7 +53,7 @@ jobs: version: v3.8.0-1 - name: Run chart-testing (lint) - run: ct lint --config .github/ct.yaml --github-groups + run: ct lint --config .github/ct-redpanda.yaml --github-groups check-values: runs-on: ubuntu-22.04 @@ -114,7 +114,7 @@ jobs: - name: Run chart-testing (list-changed) id: list-changed run: | - changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }} --chart-dirs=charts/redpanda ) + changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }}) echo $changed if [[ -n "$changed" ]]; then echo changed="true" >> "$GITHUB_OUTPUT" @@ -187,7 +187,7 @@ jobs: ct install \ --github-groups \ --upgrade \ - --config .github/ct.yaml \ + --config .github/ct-redpanda.yaml \ --helm-extra-set-args="--set=image.tag=${{ matrix.version }}" \ --skip-missing-values \ --chart-dirs=charts/redpanda \ diff --git a/.github/workflows/pull_requests_from_origin.yaml b/.github/workflows/pull_requests_from_origin.yaml index 320e316225..273d35f80b 100644 --- a/.github/workflows/pull_requests_from_origin.yaml +++ b/.github/workflows/pull_requests_from_origin.yaml @@ -64,7 +64,7 @@ jobs: - name: Run chart-testing (list-changed) id: list-changed run: | - changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }} --chart-dirs=charts/redpanda ) + changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }}) echo $changed if [[ -n "$changed" ]]; then echo changed="true" >> "$GITHUB_OUTPUT" @@ -135,8 +135,7 @@ jobs: ct install \ --github-groups \ --upgrade \ - --config .github/ct.yaml \ + --config .github/ct-redpanda.yaml \ --helm-extra-set-args="--set=image.tag=${{ matrix.version }}" \ --skip-missing-values \ - --chart-dirs=charts/redpanda \ --target-branch ${{ github.event.repository.default_branch }} diff --git a/.github/workflows/pull_requests_kminion.yaml b/.github/workflows/pull_requests_kminion.yaml index 47ec2d1860..2c7960a044 100644 --- a/.github/workflows/pull_requests_kminion.yaml +++ b/.github/workflows/pull_requests_kminion.yaml @@ -52,7 +52,7 @@ jobs: version: v3.8.0-1 - name: Run chart-testing (lint) - run: ct lint --config .github/ct.yaml --github-groups --chart-dirs=charts/kminion + run: ct lint --config .github/ct-kminion.yaml --github-groups check-values: runs-on: ubuntu-22.04 @@ -98,7 +98,7 @@ jobs: - name: Run chart-testing (list-changed) id: list-changed run: | - changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }} --chart-dirs=charts/kminion ) + changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }}) echo $changed if [[ -n "$changed" ]]; then echo changed="true" >> "$GITHUB_OUTPUT" @@ -143,7 +143,6 @@ jobs: ct install \ --github-groups \ --upgrade \ - --config .github/ct.yaml \ + --config .github/ct-kminion.yaml \ --skip-missing-values \ - --chart-dirs=charts/kminion \ --target-branch ${{ github.event.repository.default_branch }}