Skip to content

Commit

Permalink
Merge pull request #165 from wallyworld/add-gating-tests
Browse files Browse the repository at this point in the history
Move secrets,model,dashboard tests to gating
  • Loading branch information
wallyworld authored Nov 17, 2023
2 parents 509710f + 409998d commit 9e4d308
Show file tree
Hide file tree
Showing 9 changed files with 323 additions and 60 deletions.
266 changes: 266 additions & 0 deletions jobs/ci-run/integration/gen/test-controllercharm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,266 @@


# Code generated by gen-wire-tests. DO NOT EDIT.
- job:
name: 'test-controllercharm-multijob'
project-type: 'multijob'
description: |-
Test controllercharm Suite
condition: SUCCESSFUL
node: noop-parent-jobs
concurrent: true
wrappers:
- ansicolor
- workspace-cleanup
- timestamps
parameters:
- string:
default: ''
description: 'Enable sub job to be run individually.'
name: SHORT_GIT_COMMIT
- string:
default: ''
description: 'Build arch used to download the build tar.gz.'
name: BUILD_ARCH
- string:
default: ''
description: 'Ubuntu series to use when bootstrapping Juju'
name: BOOTSTRAP_SERIES
builders:
- get-build-details
- set-test-description
- multijob:
name: 'IntegrationTests-controllercharm'
projects:
- name: 'test-controllercharm-test-prometheus-aws'
current-parameters: true
- name: 'test-controllercharm-test-prometheus-lxd'
current-parameters: true
- name: 'test-controllercharm-test-prometheus-microk8s'
current-parameters: true

- job:
name: test-controllercharm-test-prometheus-aws
node: ephemeral-focal-small-amd64
description: |-
Test controllercharm suite on aws
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: 'aws'
description: 'Cloud to use when bootstrapping Juju'
name: BOOTSTRAP_CLOUD
- string:
default: 'ec2'
description: 'Provider to use when bootstrapping Juju'
name: BOOTSTRAP_PROVIDER
- string:
default: 'us-east-1'
description: 'Cloud Region to use when bootstrapping Juju'
name: BOOTSTRAP_REGION
- 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
- run-integration-test:
test_name: 'controllercharm'
setup_steps: ''
task_name: ''
skip_tasks: ''
publishers:
- integration-artifacts

- job:
name: test-controllercharm-test-prometheus-lxd
node: ephemeral-focal-8c-32g-amd64
description: |-
Test controllercharm 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: 30
fail: true
type: absolute
builders:
- inject:
properties-content: |-
OPERATOR_IMAGE_ACCOUNT=${PARAM_OPERATOR_IMAGE_ACCOUNT}
- wait-for-cloud-init
- prepare-integration-test
- run-integration-test:
test_name: 'controllercharm'
setup_steps: ''
task_name: ''
skip_tasks: ''
publishers:
- integration-artifacts

- job:
name: test-controllercharm-test-prometheus-microk8s
node: ephemeral-focal-8c-32g-amd64
description: |-
Test controllercharm 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
- run-integration-test-microk8s:
test_name: 'controllercharm'
setup_steps: ''
task_name: ''
skip_tasks: ''
publishers:
- integration-artifacts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

# Code generated by gen-wire-tests. DO NOT EDIT.
- job:
name: 'test-user-unstable-multijob'
name: 'test-dashboard-unstable-multijob'
project-type: 'multijob'
description: |-
Test user Suite
Test dashboard Suite
condition: SUCCESSFUL
node: noop-parent-jobs
concurrent: true
Expand All @@ -30,9 +30,7 @@
- get-build-details
- set-test-description
- multijob:
name: 'IntegrationTests-user'
name: 'IntegrationTests-dashboard'
projects:
- name: 'test-user-test-user-login-password-aws'
current-parameters: true
- name: 'test-user-test-user-login-password-lxd'
- name: 'test-dashboard-test-dashboard-deploy-microk8s'
current-parameters: true
2 changes: 0 additions & 2 deletions jobs/ci-run/integration/gen/test-dashboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
current-parameters: true
- name: 'test-dashboard-test-dashboard-deploy-lxd'
current-parameters: true
- name: 'test-dashboard-test-dashboard-deploy-microk8s'
current-parameters: true

- job:
name: test-dashboard-test-dashboard-deploy-aws
Expand Down
18 changes: 0 additions & 18 deletions jobs/ci-run/integration/gen/test-model-unstable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,6 @@
- multijob:
name: 'IntegrationTests-model'
projects:
- name: 'test-model-test-model-config-aws'
current-parameters: true
- name: 'test-model-test-model-config-google'
current-parameters: true
- name: 'test-model-test-model-config-lxd'
current-parameters: true
- name: 'test-model-test-model-metrics-aws'
current-parameters: true
- name: 'test-model-test-model-metrics-google'
current-parameters: true
- name: 'test-model-test-model-metrics-lxd'
current-parameters: true
- name: 'test-model-test-model-migration-saas-common-aws'
current-parameters: true
- name: 'test-model-test-model-migration-saas-common-google'
current-parameters: true
- name: 'test-model-test-model-migration-saas-common-lxd'
current-parameters: true
- name: 'test-model-test-model-migration-saas-external-aws'
current-parameters: true
- name: 'test-model-test-model-migration-saas-external-google'
Expand Down
18 changes: 18 additions & 0 deletions jobs/ci-run/integration/gen/test-model.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,36 @@
- multijob:
name: 'IntegrationTests-model'
projects:
- name: 'test-model-test-model-config-aws'
current-parameters: true
- name: 'test-model-test-model-config-google'
current-parameters: true
- name: 'test-model-test-model-config-lxd'
current-parameters: true
- name: 'test-model-test-model-destroy-aws'
current-parameters: true
- name: 'test-model-test-model-destroy-google'
current-parameters: true
- name: 'test-model-test-model-destroy-lxd'
current-parameters: true
- name: 'test-model-test-model-metrics-aws'
current-parameters: true
- name: 'test-model-test-model-metrics-google'
current-parameters: true
- name: 'test-model-test-model-metrics-lxd'
current-parameters: true
- name: 'test-model-test-model-migration-aws'
current-parameters: true
- name: 'test-model-test-model-migration-google'
current-parameters: true
- name: 'test-model-test-model-migration-lxd'
current-parameters: true
- name: 'test-model-test-model-migration-saas-common-aws'
current-parameters: true
- name: 'test-model-test-model-migration-saas-common-google'
current-parameters: true
- name: 'test-model-test-model-migration-saas-common-lxd'
current-parameters: true
- name: 'test-model-test-model-migration-version-aws'
current-parameters: true
- name: 'test-model-test-model-migration-version-google'
Expand Down
4 changes: 4 additions & 0 deletions jobs/ci-run/integration/gen/test-user.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@
- multijob:
name: 'IntegrationTests-user'
projects:
- name: 'test-user-test-user-login-password-aws'
current-parameters: true
- name: 'test-user-test-user-login-password-lxd'
current-parameters: true
- name: 'test-user-test-user-manage-aws'
current-parameters: true
- name: 'test-user-test-user-manage-lxd'
Expand Down
Loading

0 comments on commit 9e4d308

Please sign in to comment.