From a8f046a2aa3d1bec7de110204208f1138f05b451 Mon Sep 17 00:00:00 2001 From: Harry Pidcock Date: Tue, 28 Nov 2023 13:30:31 +1000 Subject: [PATCH] Disable coslite test on 2.9 --- Makefile | 2 +- jobs/ci-run/integration/gen/test-coslite.yml | 16 +++++++++++----- tools/gen-wire-tests/juju.config | 2 ++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 7cc6cba..7fc3da2 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ gen-wire-tests: @go run ./tools/gen-wire-tests/main.go \ "${JUJU_REPO_PATH}/tests/suites" \ "./jobs/ci-run/integration/gen" \ - "3.3" \ + "3.4" \ <"${config}" .PHONY: clean diff --git a/jobs/ci-run/integration/gen/test-coslite.yml b/jobs/ci-run/integration/gen/test-coslite.yml index 78ecc83..17dd014 100644 --- a/jobs/ci-run/integration/gen/test-coslite.yml +++ b/jobs/ci-run/integration/gen/test-coslite.yml @@ -101,10 +101,16 @@ OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT} - wait-for-cloud-init - prepare-integration-test - - run-integration-test-microk8s: - test_name: 'coslite' - setup_steps: '' - task_name: '' - skip_tasks: '' + - conditional-step: + condition-kind: regex-match + regex: "^[4-9].*|^3\\.([1-9]|\\d{2,})(\\.|-).*" + label: "${JUJU_VERSION}" + on-evaluation-failure: "dont-run" + steps: + - run-integration-test-microk8s: + test_name: 'coslite' + setup_steps: '' + task_name: '' + skip_tasks: '' publishers: - integration-artifacts diff --git a/tools/gen-wire-tests/juju.config b/tools/gen-wire-tests/juju.config index 78ce9ec..a2c990b 100644 --- a/tools/gen-wire-tests/juju.config +++ b/tools/gen-wire-tests/juju.config @@ -22,6 +22,8 @@ folders: 3.3 test_dashboard_deploy: 3.1 + test_deploy_coslite: + 3.1 timeout: secrets_iaas: test_secrets_vault: 60