Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
155 changes: 153 additions & 2 deletions jobs/ci-run/integration/gen/test-cloud_gce.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,92 @@
- multijob:
name: 'IntegrationTests-cloud_gce'
projects:
- name: 'test-cloud_gce-test-create-storage-pool-google'
current-parameters: true
- name: 'test-cloud_gce-test-deploy-gpu-instance-google'
current-parameters: true
- name: 'test-cloud_gce-test-pro-images-google'
current-parameters: true
- name: 'test-cloud_gce-test-serviceaccount-credential-google'
current-parameters: true

- job:
name: test-cloud_gce-test-create-storage-pool-google
node: ephemeral-noble-small-amd64
concurrent: true
description: |-
Test test_create_storage_pool in cloud_gce suite on google
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: 'google'
description: 'Cloud to use when bootstrapping Juju'
name: BOOTSTRAP_CLOUD
- string:
default: 'gce'
description: 'Provider to use when bootstrapping Juju'
name: BOOTSTRAP_PROVIDER
- string:
default: 'us-east1'
description: 'Cloud Region to use when bootstrapping Juju'
name: BOOTSTRAP_REGION
wrappers:
- default-integration-test-wrapper
- timeout:
timeout: 30
fail: true
type: absolute
builders:
- common
- select-oci-registry
- prepare-integration-test
- conditional-step:
# Only run on regexp version match.
# Accounts for tests which do not exist
# until a given Juju version.
condition-kind: regex-match
regex: "^[4-9].*|^3\\.([6-9]|\\d{{2,}})(\\.|-).*"
label: "${{JUJU_VERSION}}"
on-evaluation-failure: "dont-run"
steps:
- run-integration-test:
test_name: 'cloud_gce'
setup_steps: ''
task_name: 'test_create_storage_pool'
skip_tasks: 'test_deploy_gpu_instance,test_pro_images,test_serviceaccount_credential'
publishers:
- integration-artifacts

- job:
name: test-cloud_gce-test-deploy-gpu-instance-google
Expand Down Expand Up @@ -107,7 +189,7 @@
test_name: 'cloud_gce'
setup_steps: ''
task_name: 'test_deploy_gpu_instance'
skip_tasks: 'test_pro_images'
skip_tasks: 'test_create_storage_pool,test_pro_images,test_serviceaccount_credential'
publishers:
- integration-artifacts

Expand Down Expand Up @@ -176,6 +258,75 @@
test_name: 'cloud_gce'
setup_steps: ''
task_name: 'test_pro_images'
skip_tasks: 'test_deploy_gpu_instance'
skip_tasks: 'test_create_storage_pool,test_deploy_gpu_instance,test_serviceaccount_credential'
publishers:
- integration-artifacts

- job:
name: test-cloud_gce-test-serviceaccount-credential-google
node: ephemeral-noble-small-amd64
concurrent: true
description: |-
Test test_serviceaccount_credential in cloud_gce suite on google
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: 'google'
description: 'Cloud to use when bootstrapping Juju'
name: BOOTSTRAP_CLOUD
- string:
default: 'gce'
description: 'Provider to use when bootstrapping Juju'
name: BOOTSTRAP_PROVIDER
- string:
default: 'us-east1'
description: 'Cloud Region to use when bootstrapping Juju'
name: BOOTSTRAP_REGION
wrappers:
- default-integration-test-wrapper
- timeout:
timeout: 30
fail: true
type: absolute
builders:
- common
- select-oci-registry
- prepare-integration-test
- run-integration-test:
test_name: 'cloud_gce'
setup_steps: ''
task_name: 'test_serviceaccount_credential'
skip_tasks: 'test_create_storage_pool,test_deploy_gpu_instance,test_pro_images'
publishers:
- integration-artifacts
84 changes: 64 additions & 20 deletions jobs/ci-run/integration/gen/test-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,22 @@
- common
- select-oci-registry
- prepare-integration-test
- run-integration-test:
test_name: 'manual'
setup_steps: ''
task_name: 'test_deploy_manual'
skip_tasks: 'test_spaces_manual'
- conditional-step:
# Do not run on regexp version match.
# Accounts for tests which do not exist
# in later Juju versions.
condition-kind: not
condition-operand:
condition-kind: regex-match
regex: "^[5-9].*|^4\\.([0-9]|\\d{{2,}})(\\.|-).*"
label: "${{JUJU_VERSION}}"
on-evaluation-failure: "dont-run"
steps:
- run-integration-test:
test_name: 'manual'
setup_steps: ''
task_name: 'test_deploy_manual'
skip_tasks: 'test_spaces_manual'
publishers:
- integration-artifacts

Expand Down Expand Up @@ -163,11 +174,22 @@
- common
- select-oci-registry
- prepare-integration-test
- run-integration-test:
test_name: 'manual'
setup_steps: ''
task_name: 'test_deploy_manual'
skip_tasks: 'test_spaces_manual'
- conditional-step:
# Do not run on regexp version match.
# Accounts for tests which do not exist
# in later Juju versions.
condition-kind: not
condition-operand:
condition-kind: regex-match
regex: "^[5-9].*|^4\\.([0-9]|\\d{{2,}})(\\.|-).*"
label: "${{JUJU_VERSION}}"
on-evaluation-failure: "dont-run"
steps:
- run-integration-test:
test_name: 'manual'
setup_steps: ''
task_name: 'test_deploy_manual'
skip_tasks: 'test_spaces_manual'
publishers:
- integration-artifacts

Expand Down Expand Up @@ -232,11 +254,22 @@
- common
- select-oci-registry
- prepare-integration-test
- run-integration-test:
test_name: 'manual'
setup_steps: ''
task_name: 'test_spaces_manual'
skip_tasks: 'test_deploy_manual'
- conditional-step:
# Do not run on regexp version match.
# Accounts for tests which do not exist
# in later Juju versions.
condition-kind: not
condition-operand:
condition-kind: regex-match
regex: "^[5-9].*|^4\\.([0-9]|\\d{{2,}})(\\.|-).*"
label: "${{JUJU_VERSION}}"
on-evaluation-failure: "dont-run"
steps:
- run-integration-test:
test_name: 'manual'
setup_steps: ''
task_name: 'test_spaces_manual'
skip_tasks: 'test_deploy_manual'
publishers:
- integration-artifacts

Expand Down Expand Up @@ -297,10 +330,21 @@
- common
- select-oci-registry
- prepare-integration-test
- run-integration-test:
test_name: 'manual'
setup_steps: ''
task_name: 'test_spaces_manual'
skip_tasks: 'test_deploy_manual'
- conditional-step:
# Do not run on regexp version match.
# Accounts for tests which do not exist
# in later Juju versions.
condition-kind: not
condition-operand:
condition-kind: regex-match
regex: "^[5-9].*|^4\\.([0-9]|\\d{{2,}})(\\.|-).*"
label: "${{JUJU_VERSION}}"
on-evaluation-failure: "dont-run"
steps:
- run-integration-test:
test_name: 'manual'
setup_steps: ''
task_name: 'test_spaces_manual'
skip_tasks: 'test_deploy_manual'
publishers:
- integration-artifacts
Loading
Loading