Skip to content

Commit

Permalink
Merge pull request #193 from wallyworld/ci-updates
Browse files Browse the repository at this point in the history
chore: maintain ci tests
  • Loading branch information
wallyworld authored Jul 1, 2024
2 parents d7e6dac + 0f29390 commit 8408438
Show file tree
Hide file tree
Showing 6 changed files with 131 additions and 195 deletions.
108 changes: 108 additions & 0 deletions jobs/ci-run/integration/gen/test-cloud_azure.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@


# Code generated by gen-wire-tests. DO NOT EDIT.
- job:
name: 'test-cloud_azure-multijob'
project-type: 'multijob'
description: |-
Test cloud_azure 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-cloud_azure'
projects:
- name: 'test-cloud_azure-test-managed-identity-azure'
current-parameters: true

- job:
name: test-cloud_azure-test-managed-identity-azure
node: ephemeral-focal-small-amd64
description: |-
Test cloud_azure suite on azure
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: 'azure'
description: 'Cloud to use when bootstrapping Juju'
name: BOOTSTRAP_CLOUD
- string:
default: 'azure'
description: 'Provider to use when bootstrapping Juju'
name: BOOTSTRAP_PROVIDER
- string:
default: 'eastus'
description: 'Cloud Region to use when bootstrapping Juju'
name: BOOTSTRAP_REGION
- string:
default: ''
description: 'Ubuntu series to use when bootstrapping Juju'
name: BOOTSTRAP_SERIES
wrappers:
- default-integration-test-wrapper
- timeout:
timeout: 30
fail: true
type: absolute
builders:
- select-oci-registry
- wait-for-cloud-init
- prepare-integration-test
- run-integration-test:
test_name: 'cloud_azure'
setup_steps: ''
task_name: ''
skip_tasks: ''
publishers:
- integration-artifacts
38 changes: 0 additions & 38 deletions jobs/ci-run/integration/gen/test-deploy-unstable.yml

This file was deleted.

164 changes: 12 additions & 152 deletions jobs/ci-run/integration/gen/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
current-parameters: true
- name: 'test-deploy-test-deploy-bundles-aws'
current-parameters: true
- name: 'test-deploy-test-deploy-bundles-lxd'
current-parameters: true
- name: 'test-deploy-test-deploy-charms-aws'
current-parameters: true
- name: 'test-deploy-test-deploy-charms-lxd'
Expand All @@ -46,8 +48,6 @@
current-parameters: true
- name: 'test-deploy-test-deploy-default-series-lxd'
current-parameters: true
- name: 'test-deploy-test-deploy-os-lxd'
current-parameters: true
- name: 'test-deploy-test-deploy-revision-aws'
current-parameters: true
- name: 'test-deploy-test-deploy-revision-lxd'
Expand Down Expand Up @@ -121,7 +121,7 @@
test_name: 'deploy'
setup_steps: ''
task_name: 'test_cmr_bundles_export_overlay'
skip_tasks: 'test_deploy_bundles,test_deploy_charms,test_deploy_default_series,test_deploy_os,test_deploy_revision'
skip_tasks: 'test_deploy_bundles,test_deploy_charms,test_deploy_default_series,test_deploy_revision'
publishers:
- integration-artifacts

Expand Down Expand Up @@ -189,7 +189,7 @@
test_name: 'deploy'
setup_steps: ''
task_name: 'test_cmr_bundles_export_overlay'
skip_tasks: 'test_deploy_bundles,test_deploy_charms,test_deploy_default_series,test_deploy_os,test_deploy_revision'
skip_tasks: 'test_deploy_bundles,test_deploy_charms,test_deploy_default_series,test_deploy_revision'
publishers:
- integration-artifacts

Expand Down Expand Up @@ -261,7 +261,7 @@
test_name: 'deploy'
setup_steps: ''
task_name: 'test_deploy_bundles'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_charms,test_deploy_default_series,test_deploy_os,test_deploy_revision'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_charms,test_deploy_default_series,test_deploy_revision'
publishers:
- integration-artifacts

Expand Down Expand Up @@ -329,7 +329,7 @@
test_name: 'deploy'
setup_steps: ''
task_name: 'test_deploy_bundles'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_charms,test_deploy_default_series,test_deploy_os,test_deploy_revision'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_charms,test_deploy_default_series,test_deploy_revision'
publishers:
- integration-artifacts

Expand Down Expand Up @@ -401,7 +401,7 @@
test_name: 'deploy'
setup_steps: ''
task_name: 'test_deploy_charms'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_default_series,test_deploy_os,test_deploy_revision'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_default_series,test_deploy_revision'
publishers:
- integration-artifacts

Expand Down Expand Up @@ -469,7 +469,7 @@
test_name: 'deploy'
setup_steps: ''
task_name: 'test_deploy_charms'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_default_series,test_deploy_os,test_deploy_revision'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_default_series,test_deploy_revision'
publishers:
- integration-artifacts

Expand Down Expand Up @@ -541,7 +541,7 @@
test_name: 'deploy'
setup_steps: ''
task_name: 'test_deploy_default_series'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_os,test_deploy_revision'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_revision'
publishers:
- integration-artifacts

Expand Down Expand Up @@ -609,147 +609,7 @@
test_name: 'deploy'
setup_steps: ''
task_name: 'test_deploy_default_series'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_os,test_deploy_revision'
publishers:
- integration-artifacts

- job:
name: test-deploy-test-deploy-os-aws
node: ephemeral-focal-small-amd64
description: |-
Test test_deploy_os in deploy 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
wrappers:
- default-integration-test-wrapper
- timeout:
timeout: 30
fail: true
type: absolute
builders:
- select-oci-registry
- wait-for-cloud-init
- prepare-integration-test
- run-integration-test:
test_name: 'deploy'
setup_steps: ''
task_name: 'test_deploy_os'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_default_series,test_deploy_revision'
publishers:
- integration-artifacts

- job:
name: test-deploy-test-deploy-os-lxd
node: ephemeral-focal-8c-32g-amd64
description: |-
Test test_deploy_os in deploy 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: 'localhost'
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
wrappers:
- default-integration-test-wrapper
- timeout:
timeout: 30
fail: true
type: absolute
builders:
- select-oci-registry
- wait-for-cloud-init
- prepare-integration-test
- run-integration-test:
test_name: 'deploy'
setup_steps: ''
task_name: 'test_deploy_os'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_default_series,test_deploy_revision'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_revision'
publishers:
- integration-artifacts

Expand Down Expand Up @@ -821,7 +681,7 @@
test_name: 'deploy'
setup_steps: ''
task_name: 'test_deploy_revision'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_default_series,test_deploy_os'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_default_series'
publishers:
- integration-artifacts

Expand Down Expand Up @@ -889,6 +749,6 @@
test_name: 'deploy'
setup_steps: ''
task_name: 'test_deploy_revision'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_default_series,test_deploy_os'
skip_tasks: 'test_cmr_bundles_export_overlay,test_deploy_bundles,test_deploy_charms,test_deploy_default_series'
publishers:
- integration-artifacts
Loading

0 comments on commit 8408438

Please sign in to comment.