diff --git a/jobs/ci-run/integration/gen/test-secrets_iaas.yml b/jobs/ci-run/integration/gen/test-secrets_iaas.yml index 02a6a9d..fe9774f 100644 --- a/jobs/ci-run/integration/gen/test-secrets_iaas.yml +++ b/jobs/ci-run/integration/gen/test-secrets_iaas.yml @@ -40,6 +40,8 @@ current-parameters: true - name: 'test-secrets_iaas-test-secrets-vault-lxd' current-parameters: true + - name: 'test-secrets_iaas-test-user-secret-drain-lxd' + current-parameters: true - job: name: test-secrets_iaas-test-secret-drain-lxd @@ -107,11 +109,17 @@ OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT} - wait-for-cloud-init - prepare-integration-test - - run-integration-test: - test_name: 'secrets_iaas' - setup_steps: '' - task_name: 'test_secret_drain' - skip_tasks: 'test_secrets_cmr,test_secrets_juju,test_secrets_vault' + - conditional-step: + condition-kind: regex-match + regex: "^[4-9].*|^3\\.([2-9]|\\d{2,})(\\.|-).*" + label: "${JUJU_VERSION}" + on-evaluation-failure: "dont-run" + steps: + - run-integration-test: + test_name: 'secrets_iaas' + setup_steps: '' + task_name: 'test_secret_drain' + skip_tasks: 'test_secrets_cmr,test_secrets_juju,test_secrets_vault,test_user_secret_drain' publishers: - integration-artifacts @@ -181,11 +189,17 @@ OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT} - wait-for-cloud-init - prepare-integration-test - - run-integration-test: - test_name: 'secrets_iaas' - setup_steps: '' - task_name: 'test_secrets_cmr' - skip_tasks: 'test_secret_drain,test_secrets_juju,test_secrets_vault' + - 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: + test_name: 'secrets_iaas' + setup_steps: '' + task_name: 'test_secrets_cmr' + skip_tasks: 'test_secret_drain,test_secrets_juju,test_secrets_vault,test_user_secret_drain' publishers: - integration-artifacts @@ -255,11 +269,17 @@ OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT} - wait-for-cloud-init - prepare-integration-test - - run-integration-test: - test_name: 'secrets_iaas' - setup_steps: '' - task_name: 'test_secrets_juju' - skip_tasks: 'test_secret_drain,test_secrets_cmr,test_secrets_vault' + - 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: + test_name: 'secrets_iaas' + setup_steps: '' + task_name: 'test_secrets_juju' + skip_tasks: 'test_secret_drain,test_secrets_cmr,test_secrets_vault,test_user_secret_drain' publishers: - integration-artifacts @@ -269,6 +289,86 @@ description: |- Test test_secrets_vault in secrets_iaas suite on lxd parameters: + - validating-string: + name: SHORT_GIT_COMMIT + description: 'Enable sub job to be run individually.' + regex: ^\S{7}$ + msg: Enter a valid 7 char git sha + - choice: + default: 'amd64' + description: 'Build arch used to download the build tar.gz.' + name: BUILD_ARCH + choices: + - amd64 + - arm64 + - s390x + - ppc64el + - choice: + default: '' + description: 'Arch used to boostrap controller.' + name: BOOTSTRAP_ARCH + choices: + - amd64 + - arm64 + - s390x + - ppc64el + - choice: + default: '' + description: 'Arch used for hosted models.' + name: MODEL_ARCH + choices: + - amd64 + - arm64 + - s390x + - ppc64el + - string: + default: 'lxd' + description: 'Cloud to use when bootstrapping Juju' + name: BOOTSTRAP_CLOUD + - string: + default: 'lxd' + description: 'Provider to use when bootstrapping Juju' + name: BOOTSTRAP_PROVIDER + - string: + default: '' + description: 'Ubuntu series to use when bootstrapping Juju' + name: BOOTSTRAP_SERIES + - string: + default: docker.io/jujuqabot + description: "Operator docker image account name." + name: PARAM_OPERATOR_IMAGE_ACCOUNT + wrappers: + - default-integration-test-wrapper + - timeout: + timeout: 60 + fail: true + type: absolute + builders: + - inject: + properties-content: |- + OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT} + - wait-for-cloud-init + - prepare-integration-test + - 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: + test_name: 'secrets_iaas' + setup_steps: '' + task_name: 'test_secrets_vault' + skip_tasks: 'test_secret_drain,test_secrets_cmr,test_secrets_juju,test_user_secret_drain' + publishers: + - integration-artifacts + +- job: + name: test-secrets_iaas-test-user-secret-drain-lxd + node: ephemeral-focal-8c-32g-amd64 + description: |- + Test test_user_secret_drain in secrets_iaas suite on lxd + parameters: - validating-string: name: SHORT_GIT_COMMIT description: 'Enable sub job to be run individually.' @@ -329,10 +429,16 @@ OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT} - wait-for-cloud-init - prepare-integration-test - - run-integration-test: - test_name: 'secrets_iaas' - setup_steps: '' - task_name: 'test_secrets_vault' - skip_tasks: 'test_secret_drain,test_secrets_cmr,test_secrets_juju' + - conditional-step: + condition-kind: regex-match + regex: "^[4-9].*|^3\\.([3-9]|\\d{2,})(\\.|-).*" + label: "${JUJU_VERSION}" + on-evaluation-failure: "dont-run" + steps: + - run-integration-test: + test_name: 'secrets_iaas' + setup_steps: '' + task_name: 'test_user_secret_drain' + skip_tasks: 'test_secret_drain,test_secrets_cmr,test_secrets_juju,test_secrets_vault' publishers: - integration-artifacts diff --git a/jobs/ci-run/integration/gen/test-secrets_k8s.yml b/jobs/ci-run/integration/gen/test-secrets_k8s.yml index a51013f..8c097e4 100644 --- a/jobs/ci-run/integration/gen/test-secrets_k8s.yml +++ b/jobs/ci-run/integration/gen/test-secrets_k8s.yml @@ -36,6 +36,10 @@ current-parameters: true - name: 'test-secrets_k8s-test-secrets-microk8s' current-parameters: true + - name: 'test-secrets_k8s-test-user-secret-drain-microk8s' + current-parameters: true + - name: 'test-secrets_k8s-test-user-secrets-microk8s' + current-parameters: true - job: name: test-secrets_k8s-test-secret-drain-microk8s @@ -103,11 +107,17 @@ OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT} - wait-for-cloud-init - prepare-integration-test - - run-integration-test-microk8s: - test_name: 'secrets_k8s' - setup_steps: '' - task_name: 'test_secret_drain' - skip_tasks: 'test_secrets' + - conditional-step: + condition-kind: regex-match + regex: "^[4-9].*|^3\\.([2-9]|\\d{2,})(\\.|-).*" + label: "${JUJU_VERSION}" + on-evaluation-failure: "dont-run" + steps: + - run-integration-test-microk8s: + test_name: 'secrets_k8s' + setup_steps: '' + task_name: 'test_secret_drain' + skip_tasks: 'test_secrets,test_user_secret_drain,test_user_secrets' publishers: - integration-artifacts @@ -177,10 +187,176 @@ OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT} - wait-for-cloud-init - prepare-integration-test - - run-integration-test-microk8s: - test_name: 'secrets_k8s' - setup_steps: '' - task_name: 'test_secrets' - skip_tasks: 'test_secret_drain' + - 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: 'secrets_k8s' + setup_steps: '' + task_name: 'test_secrets' + skip_tasks: 'test_secret_drain,test_user_secret_drain,test_user_secrets' + publishers: + - integration-artifacts + +- job: + name: test-secrets_k8s-test-user-secret-drain-microk8s + node: ephemeral-focal-8c-32g-amd64 + description: |- + Test test_user_secret_drain in secrets_k8s suite on microk8s + parameters: + - validating-string: + name: SHORT_GIT_COMMIT + description: 'Enable sub job to be run individually.' + regex: ^\S{7}$ + msg: Enter a valid 7 char git sha + - choice: + default: 'amd64' + description: 'Build arch used to download the build tar.gz.' + name: BUILD_ARCH + choices: + - amd64 + - arm64 + - s390x + - ppc64el + - choice: + default: '' + description: 'Arch used to boostrap controller.' + name: BOOTSTRAP_ARCH + choices: + - amd64 + - arm64 + - s390x + - ppc64el + - choice: + default: '' + description: 'Arch used for hosted models.' + name: MODEL_ARCH + choices: + - amd64 + - arm64 + - s390x + - ppc64el + - string: + default: 'microk8s' + description: 'Cloud to use when bootstrapping Juju' + name: BOOTSTRAP_CLOUD + - string: + default: 'k8s' + description: 'Provider to use when bootstrapping Juju' + name: BOOTSTRAP_PROVIDER + - string: + default: '' + description: 'Ubuntu series to use when bootstrapping Juju' + name: BOOTSTRAP_SERIES + - string: + default: docker.io/jujuqabot + description: "Operator docker image account name." + name: PARAM_OPERATOR_IMAGE_ACCOUNT + wrappers: + - default-integration-test-wrapper + - timeout: + timeout: 30 + fail: true + type: absolute + builders: + - inject: + properties-content: |- + OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT} + - wait-for-cloud-init + - prepare-integration-test + - conditional-step: + condition-kind: regex-match + regex: "^[4-9].*|^3\\.([3-9]|\\d{2,})(\\.|-).*" + label: "${JUJU_VERSION}" + on-evaluation-failure: "dont-run" + steps: + - run-integration-test-microk8s: + test_name: 'secrets_k8s' + setup_steps: '' + task_name: 'test_user_secret_drain' + skip_tasks: 'test_secret_drain,test_secrets,test_user_secrets' + publishers: + - integration-artifacts + +- job: + name: test-secrets_k8s-test-user-secrets-microk8s + node: ephemeral-focal-8c-32g-amd64 + description: |- + Test test_user_secrets in secrets_k8s suite on microk8s + parameters: + - validating-string: + name: SHORT_GIT_COMMIT + description: 'Enable sub job to be run individually.' + regex: ^\S{7}$ + msg: Enter a valid 7 char git sha + - choice: + default: 'amd64' + description: 'Build arch used to download the build tar.gz.' + name: BUILD_ARCH + choices: + - amd64 + - arm64 + - s390x + - ppc64el + - choice: + default: '' + description: 'Arch used to boostrap controller.' + name: BOOTSTRAP_ARCH + choices: + - amd64 + - arm64 + - s390x + - ppc64el + - choice: + default: '' + description: 'Arch used for hosted models.' + name: MODEL_ARCH + choices: + - amd64 + - arm64 + - s390x + - ppc64el + - string: + default: 'microk8s' + description: 'Cloud to use when bootstrapping Juju' + name: BOOTSTRAP_CLOUD + - string: + default: 'k8s' + description: 'Provider to use when bootstrapping Juju' + name: BOOTSTRAP_PROVIDER + - string: + default: '' + description: 'Ubuntu series to use when bootstrapping Juju' + name: BOOTSTRAP_SERIES + - string: + default: docker.io/jujuqabot + description: "Operator docker image account name." + name: PARAM_OPERATOR_IMAGE_ACCOUNT + wrappers: + - default-integration-test-wrapper + - timeout: + timeout: 30 + fail: true + type: absolute + builders: + - inject: + properties-content: |- + OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT} + - wait-for-cloud-init + - prepare-integration-test + - conditional-step: + condition-kind: regex-match + regex: "^[4-9].*|^3\\.([3-9]|\\d{2,})(\\.|-).*" + label: "${JUJU_VERSION}" + on-evaluation-failure: "dont-run" + steps: + - run-integration-test-microk8s: + test_name: 'secrets_k8s' + setup_steps: '' + task_name: 'test_user_secrets' + skip_tasks: 'test_secret_drain,test_secrets,test_user_secret_drain' publishers: - integration-artifacts diff --git a/tools/gen-wire-tests/juju.config b/tools/gen-wire-tests/juju.config index 7bda2ba..938f985 100644 --- a/tools/gen-wire-tests/juju.config +++ b/tools/gen-wire-tests/juju.config @@ -4,7 +4,23 @@ folders: 3.2 test_query_tracing: 3.2 + test_secrets_cmr: + 3.1 + test_secrets_juju: + 3.1 + test_secrets_vault: + 3.1 + test_secrets: + 3.1 + test_secret_drain: + 3.2 + test_user_secret_drain: + 3.3 + test_user_secrets: + 3.3 timeout: + secrets_iaas: + test_secrets_vault: 60 model: test_model_migration: 90 test_model_migration_version: 50