Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generate tests for user secrets and extend timeout to 60mins for test… #161

Merged
merged 2 commits into from
Nov 16, 2023
Merged

Generate tests for user secrets and extend timeout to 60mins for test… #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c1c19a
Generate tests for user secrets and extend timeout to 60mins for test…
ycliuhw Nov 2, 2023
4bf389f
Set min juju version for secret related tests;
ycliuhw Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 126 additions & 20 deletions jobs/ci-run/integration/gen/test-secrets_iaas.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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.'
Expand Down Expand Up @@ -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
Loading