From a63b69c984c021932648627a58e65365d44366d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 00:08:55 +0000 Subject: [PATCH 1/6] chore(deps): bump helm/chart-testing-action from 2.4.0 to 2.6.0 Bumps [helm/chart-testing-action](https://github.com/helm/chart-testing-action) from 2.4.0 to 2.6.0. - [Release notes](https://github.com/helm/chart-testing-action/releases) - [Commits](https://github.com/helm/chart-testing-action/compare/v2.4.0...v2.6.0) --- updated-dependencies: - dependency-name: helm/chart-testing-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/lint-test-matrix.yaml | 2 +- .github/workflows/lint-test.yaml | 2 +- .github/workflows/test-suite.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint-test-matrix.yaml b/.github/workflows/lint-test-matrix.yaml index 4b30c1e2..a3aab68c 100644 --- a/.github/workflows/lint-test-matrix.yaml +++ b/.github/workflows/lint-test-matrix.yaml @@ -26,7 +26,7 @@ jobs: run: sudo apt-get -y install python3-wheel - name: Set up chart-testing - uses: helm/chart-testing-action@v2.4.0 + uses: helm/chart-testing-action@v2.6.0 - name: Run chart-testing (list-changed) id: list-changed diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index adaf9e72..85cad656 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -69,7 +69,7 @@ jobs: run: sudo apt-get -y install python3-wheel - name: Set up chart-testing - uses: helm/chart-testing-action@v2.4.0 + uses: helm/chart-testing-action@v2.6.0 - name: Run chart-testing (list-changed) id: list-changed diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml index ddc97a6d..a87f2b8a 100644 --- a/.github/workflows/test-suite.yaml +++ b/.github/workflows/test-suite.yaml @@ -48,7 +48,7 @@ jobs: run: sudo apt-get -y install python3-wheel - name: Set up chart-testing - uses: helm/chart-testing-action@v2.4.0 + uses: helm/chart-testing-action@v2.6.0 - name: Run chart-testing (list-changed) id: list-changed From bf0029446bc3309dedab008eec2505ed2e4e0bff Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 1 Nov 2023 12:46:17 +1100 Subject: [PATCH 2/6] split ct lint and install --- .github/workflows/test-suite.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml index a87f2b8a..3e52f9c5 100644 --- a/.github/workflows/test-suite.yaml +++ b/.github/workflows/test-suite.yaml @@ -136,7 +136,9 @@ jobs: if: | (steps.list-changed.outputs.changed == 'true') || (contains(github.event.pull_request.labels.*.name, 'needs-testing')) - run: ct lint-and-install --config ./test-suite-run.ct.yaml + run: | + ct lint --config ./test-suite-run.ct.yaml + ct install --config ./test-suite-run.ct.yaml # the following steps gather various debug information on test failure From 0b0b703764c986e17494a3e006e2d6e14c91e6c1 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 1 Nov 2023 13:33:00 +1100 Subject: [PATCH 3/6] verify default.ct doesn't work --- .github/workflows/lint-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 85cad656..ca918202 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -81,7 +81,7 @@ jobs: fi - name: Run chart-testing (lint) - run: ct lint --config ./default.ct.yaml + run: ct lint --config ./default.ct.yaml --all - name: Create kind cluster uses: helm/kind-action@v1.8.0 From d2c71ffafef67e9872e2c49eef3fcb0cd787dd84 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 1 Nov 2023 13:35:52 +1100 Subject: [PATCH 4/6] move helm-extra-args to install --- .github/workflows/lint-test.yaml | 2 +- .github/workflows/test-suite.yaml | 2 +- default.ct.yaml | 1 - test-suite-lint.ct.yaml | 1 - test-suite-run.ct.yaml | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index ca918202..85cad656 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -81,7 +81,7 @@ jobs: fi - name: Run chart-testing (lint) - run: ct lint --config ./default.ct.yaml --all + run: ct lint --config ./default.ct.yaml - name: Create kind cluster uses: helm/kind-action@v1.8.0 diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml index 3e52f9c5..0e8a526e 100644 --- a/.github/workflows/test-suite.yaml +++ b/.github/workflows/test-suite.yaml @@ -138,7 +138,7 @@ jobs: (contains(github.event.pull_request.labels.*.name, 'needs-testing')) run: | ct lint --config ./test-suite-run.ct.yaml - ct install --config ./test-suite-run.ct.yaml + ct install --config ./test-suite-run.ct.yaml --helm-extra-args "--timeout 60m" # the following steps gather various debug information on test failure diff --git a/default.ct.yaml b/default.ct.yaml index 98f52a91..9341d51a 100644 --- a/default.ct.yaml +++ b/default.ct.yaml @@ -12,4 +12,3 @@ chart-repos: - kube-logging=https://kube-logging.github.io/helm-charts excluded-charts: - lagoon-test -helm-extra-args: --timeout 20m diff --git a/test-suite-lint.ct.yaml b/test-suite-lint.ct.yaml index 76aa8dcc..f9d87717 100644 --- a/test-suite-lint.ct.yaml +++ b/test-suite-lint.ct.yaml @@ -7,4 +7,3 @@ excluded-charts: - lagoon-logging - lagoon-logs-concentrator - lagoon-build-deploy -helm-extra-args: --timeout 20m diff --git a/test-suite-run.ct.yaml b/test-suite-run.ct.yaml index a24596d3..e9d890c6 100644 --- a/test-suite-run.ct.yaml +++ b/test-suite-run.ct.yaml @@ -6,4 +6,3 @@ namespace: lagoon # release-label is required when specifying namespace: # https://github.com/helm/chart-testing/blob/v3.1.1/pkg/config/config.go#L117 release-label: app.kubernetes.io/instance -helm-extra-args: --timeout 60m From c68ada7058c7df2fd59215d9d56b573136d86254 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 1 Nov 2023 13:58:34 +1100 Subject: [PATCH 5/6] add timeouts to ct install --- .github/workflows/lint-test-matrix.yaml | 4 ++-- .github/workflows/lint-test.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint-test-matrix.yaml b/.github/workflows/lint-test-matrix.yaml index a3aab68c..4e7a36ef 100644 --- a/.github/workflows/lint-test-matrix.yaml +++ b/.github/workflows/lint-test-matrix.yaml @@ -50,9 +50,9 @@ jobs: (contains(github.event.pull_request.labels.*.name, 'needs-testing')) - name: Run chart-testing (install) - run: ct install --config ./default.ct.yaml + run: ct install --config ./default.ct.yaml --helm-extra-args "--timeout 20m" - name: Run chart-testing (needs-testing) - run: ct install --config ./default.ct.yaml --all + run: ct install --config ./default.ct.yaml --helm-extra-args "--timeout 20m" --all if: | (contains(github.event.pull_request.labels.*.name, 'needs-testing')) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 85cad656..d9c9054e 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -94,7 +94,7 @@ jobs: (contains(github.event.pull_request.labels.*.name, 'needs-testing')) - name: Run chart-testing (install) - run: ct install --config ./default.ct.yaml + run: ct install --config ./default.ct.yaml --helm-extra-args "--timeout 20m" artifacthub-changelog: runs-on: ubuntu-latest From fae186b6835deeb39ac460a78810156f7e039742 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 1 Nov 2023 14:33:32 +1100 Subject: [PATCH 6/6] use 30m timeout for lint test --- .github/workflows/lint-test-matrix.yaml | 4 ++-- .github/workflows/lint-test.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint-test-matrix.yaml b/.github/workflows/lint-test-matrix.yaml index 4e7a36ef..e5ed6588 100644 --- a/.github/workflows/lint-test-matrix.yaml +++ b/.github/workflows/lint-test-matrix.yaml @@ -50,9 +50,9 @@ jobs: (contains(github.event.pull_request.labels.*.name, 'needs-testing')) - name: Run chart-testing (install) - run: ct install --config ./default.ct.yaml --helm-extra-args "--timeout 20m" + run: ct install --config ./default.ct.yaml --helm-extra-args "--timeout 30m" - name: Run chart-testing (needs-testing) - run: ct install --config ./default.ct.yaml --helm-extra-args "--timeout 20m" --all + run: ct install --config ./default.ct.yaml --helm-extra-args "--timeout 30m" --all if: | (contains(github.event.pull_request.labels.*.name, 'needs-testing')) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index d9c9054e..a16a362c 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -94,7 +94,7 @@ jobs: (contains(github.event.pull_request.labels.*.name, 'needs-testing')) - name: Run chart-testing (install) - run: ct install --config ./default.ct.yaml --helm-extra-args "--timeout 20m" + run: ct install --config ./default.ct.yaml --helm-extra-args "--timeout 30m" artifacthub-changelog: runs-on: ubuntu-latest