From 493ad8fbedb56cc6dd84648b1642151cd01d7bee Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Wed, 8 Mar 2023 10:59:27 +0100 Subject: [PATCH] Remove some duplication on chart-testing CI Signed-off-by: Marco Franssen --- .github/workflows/helm-chart-ci.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/helm-chart-ci.yaml b/.github/workflows/helm-chart-ci.yaml index cd25029..7cb6323 100644 --- a/.github/workflows/helm-chart-ci.yaml +++ b/.github/workflows/helm-chart-ci.yaml @@ -152,17 +152,18 @@ jobs: - name: Run chart-testing (install) run: | - [ "$VALUES" != "default" ] && kubectl create namespace "$VALUES" + scenario="$(basename "${TEST_DIR}")" + [ "${scenario}" != "default" ] && kubectl create namespace "${scenario}" post-install() { - [ -x .github/tests/$VALUES/post-install.sh ] && .github/tests/$VALUES/post-install.sh + [ -x "${TEST_DIR}/post-install.sh" ] && "${TEST_DIR}/post-install.sh" exit $1 } trap 'post-install $? $LINENO' EXIT - [ -x .github/tests/$VALUES/pre-install.sh ] && .github/tests/$VALUES/pre-install.sh + [ -x "${TEST_DIR}/pre-install.sh" ] && "${TEST_DIR}/pre-install.sh" ct install --debug \ - --namespace $VALUES \ + --namespace "${scenario}" \ --target-branch ${{ github.base_ref }} \ --exclude-deprecated \ - ${{ (matrix.values != 'default' && '--helm-extra-set-args "--values=.github/tests/$VALUES/values.yaml"') || '' }} + ${{ (matrix.values != 'default' && '--helm-extra-set-args "--values=${TEST_DIR}/values.yaml"') || '' }} env: - VALUES: ${{ matrix.values }} + TEST_DIR: .github/tests/${{ matrix.values }}