From 9ebc688d42bf274a0b7115d8d9d1c346cb6b0707 Mon Sep 17 00:00:00 2001 From: Harry Pidcock Date: Wed, 11 Sep 2024 17:34:42 +1000 Subject: [PATCH 1/3] feat: allow arm/amd jobs to run concurrently --- jobs/ci-run/integration/gen/test-actions.yml | 4 + jobs/ci-run/integration/gen/test-agents.yml | 2 + jobs/ci-run/integration/gen/test-appdata.yml | 2 + .../integration/gen/test-authorized_keys.yml | 144 +++++-- jobs/ci-run/integration/gen/test-backup.yml | 2 + .../ci-run/integration/gen/test-bootstrap.yml | 1 + .../integration/gen/test-caasadmission.yml | 3 + jobs/ci-run/integration/gen/test-charmhub.yml | 6 + jobs/ci-run/integration/gen/test-cli.yml | 7 + .../integration/gen/test-cloud_azure.yml | 1 + jobs/ci-run/integration/gen/test-cmr.yml | 2 + .../integration/gen/test-constraints.yml | 2 + .../integration/gen/test-controller.yml | 8 + .../integration/gen/test-controllercharm.yml | 2 + jobs/ci-run/integration/gen/test-coslite.yml | 1 + .../integration/gen/test-credential.yml | 4 + .../ci-run/integration/gen/test-dashboard.yml | 2 + jobs/ci-run/integration/gen/test-deploy.yml | 10 + .../integration/gen/test-deploy_aks.yml | 1 + .../integration/gen/test-deploy_caas.yml | 1 + jobs/ci-run/integration/gen/test-firewall.yml | 3 + jobs/ci-run/integration/gen/test-hooks.yml | 4 + .../ci-run/integration/gen/test-hooktools.yml | 2 + jobs/ci-run/integration/gen/test-kubeflow.yml | 1 + jobs/ci-run/integration/gen/test-machine.yml | 2 + jobs/ci-run/integration/gen/test-magma.yml | 401 ++++++++++++++++++ jobs/ci-run/integration/gen/test-manual.yml | 4 + jobs/ci-run/integration/gen/test-model.yml | 27 ++ jobs/ci-run/integration/gen/test-network.yml | 4 + jobs/ci-run/integration/gen/test-refresh.yml | 4 + .../ci-run/integration/gen/test-relations.yml | 6 + .../ci-run/integration/gen/test-resources.yml | 4 + .../integration/gen/test-secrets_iaas.yml | 5 + .../integration/gen/test-secrets_k8s.yml | 4 + jobs/ci-run/integration/gen/test-sidecar.yml | 37 +- jobs/ci-run/integration/gen/test-smoke.yml | 4 + .../ci-run/integration/gen/test-smoke_k8s.yml | 1 + .../integration/gen/test-spaces_ec2.yml | 3 + jobs/ci-run/integration/gen/test-storage.yml | 2 + jobs/ci-run/integration/gen/test-unit.yml | 144 ------- jobs/ci-run/integration/gen/test-upgrade.yml | 1 + .../integration/gen/test-upgrade_series.yml | 34 ++ jobs/ci-run/integration/gen/test-user.yml | 6 + tools/gen-wire-tests/juju.config | 6 + tools/gen-wire-tests/main.go | 4 + 45 files changed, 724 insertions(+), 194 deletions(-) create mode 100644 jobs/ci-run/integration/gen/test-magma.yml create mode 100644 jobs/ci-run/integration/gen/test-upgrade_series.yml diff --git a/jobs/ci-run/integration/gen/test-actions.yml b/jobs/ci-run/integration/gen/test-actions.yml index 65ef5c2..a12584c 100644 --- a/jobs/ci-run/integration/gen/test-actions.yml +++ b/jobs/ci-run/integration/gen/test-actions.yml @@ -44,6 +44,7 @@ - job: name: test-actions-test-actions-params-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test actions suite on aws parameters: @@ -122,6 +123,7 @@ - job: name: test-actions-test-actions-params-azure node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test actions suite on azure parameters: @@ -200,6 +202,7 @@ - job: name: test-actions-test-actions-params-google node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test actions suite on google parameters: @@ -278,6 +281,7 @@ - job: name: test-actions-test-actions-params-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test actions suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-agents.yml b/jobs/ci-run/integration/gen/test-agents.yml index 6919af4..4a56487 100644 --- a/jobs/ci-run/integration/gen/test-agents.yml +++ b/jobs/ci-run/integration/gen/test-agents.yml @@ -40,6 +40,7 @@ - job: name: test-agents-test-charmrevisionupdater-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test agents suite on aws parameters: @@ -112,6 +113,7 @@ - job: name: test-agents-test-charmrevisionupdater-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test agents suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-appdata.yml b/jobs/ci-run/integration/gen/test-appdata.yml index 617edca..cca4f3f 100644 --- a/jobs/ci-run/integration/gen/test-appdata.yml +++ b/jobs/ci-run/integration/gen/test-appdata.yml @@ -40,6 +40,7 @@ - job: name: test-appdata-test-appdata-int-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test appdata suite on aws parameters: @@ -112,6 +113,7 @@ - job: name: test-appdata-test-appdata-int-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test appdata suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-authorized_keys.yml b/jobs/ci-run/integration/gen/test-authorized_keys.yml index bf0a937..d13c234 100644 --- a/jobs/ci-run/integration/gen/test-authorized_keys.yml +++ b/jobs/ci-run/integration/gen/test-authorized_keys.yml @@ -68,6 +68,7 @@ - job: name: test-authorized_keys-test-bootstrap-authorized-keys-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_bootstrap_authorized_keys in authorized_keys suite on aws parameters: @@ -146,6 +147,7 @@ - job: name: test-authorized_keys-test-bootstrap-authorized-keys-azure node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_bootstrap_authorized_keys in authorized_keys suite on azure parameters: @@ -224,6 +226,7 @@ - job: name: test-authorized_keys-test-bootstrap-authorized-keys-google node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_bootstrap_authorized_keys in authorized_keys suite on google parameters: @@ -302,6 +305,7 @@ - job: name: test-authorized_keys-test-bootstrap-authorized-keys-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_bootstrap_authorized_keys in authorized_keys suite on lxd parameters: @@ -376,6 +380,7 @@ - job: name: test-authorized_keys-test-machine-ssh-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_machine_ssh in authorized_keys suite on aws parameters: @@ -437,17 +442,24 @@ - select-oci-registry - wait-for-cloud-init - prepare-integration-test - - run-integration-test: - test_name: 'authorized_keys' - setup_steps: '' - task_name: 'test_machine_ssh' - skip_tasks: 'test_bootstrap_authorized_keys,test_migrate_authorized_keys,test_user_ssh_keys' + - conditional-step: + 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: 'authorized_keys' + setup_steps: '' + task_name: 'test_machine_ssh' + skip_tasks: 'test_bootstrap_authorized_keys,test_migrate_authorized_keys,test_user_ssh_keys' publishers: - integration-artifacts - job: name: test-authorized_keys-test-machine-ssh-azure node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_machine_ssh in authorized_keys suite on azure parameters: @@ -509,17 +521,24 @@ - select-oci-registry - wait-for-cloud-init - prepare-integration-test - - run-integration-test: - test_name: 'authorized_keys' - setup_steps: '' - task_name: 'test_machine_ssh' - skip_tasks: 'test_bootstrap_authorized_keys,test_migrate_authorized_keys,test_user_ssh_keys' + - conditional-step: + 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: 'authorized_keys' + setup_steps: '' + task_name: 'test_machine_ssh' + skip_tasks: 'test_bootstrap_authorized_keys,test_migrate_authorized_keys,test_user_ssh_keys' publishers: - integration-artifacts - job: name: test-authorized_keys-test-machine-ssh-google node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_machine_ssh in authorized_keys suite on google parameters: @@ -581,17 +600,24 @@ - select-oci-registry - wait-for-cloud-init - prepare-integration-test - - run-integration-test: - test_name: 'authorized_keys' - setup_steps: '' - task_name: 'test_machine_ssh' - skip_tasks: 'test_bootstrap_authorized_keys,test_migrate_authorized_keys,test_user_ssh_keys' + - conditional-step: + 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: 'authorized_keys' + setup_steps: '' + task_name: 'test_machine_ssh' + skip_tasks: 'test_bootstrap_authorized_keys,test_migrate_authorized_keys,test_user_ssh_keys' publishers: - integration-artifacts - job: name: test-authorized_keys-test-machine-ssh-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_machine_ssh in authorized_keys suite on lxd parameters: @@ -649,17 +675,24 @@ - select-oci-registry - wait-for-cloud-init - prepare-integration-test - - run-integration-test: - test_name: 'authorized_keys' - setup_steps: '' - task_name: 'test_machine_ssh' - skip_tasks: 'test_bootstrap_authorized_keys,test_migrate_authorized_keys,test_user_ssh_keys' + - conditional-step: + 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: 'authorized_keys' + setup_steps: '' + task_name: 'test_machine_ssh' + skip_tasks: 'test_bootstrap_authorized_keys,test_migrate_authorized_keys,test_user_ssh_keys' publishers: - integration-artifacts - job: name: test-authorized_keys-test-migrate-authorized-keys-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_migrate_authorized_keys in authorized_keys suite on aws parameters: @@ -738,6 +771,7 @@ - job: name: test-authorized_keys-test-migrate-authorized-keys-azure node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_migrate_authorized_keys in authorized_keys suite on azure parameters: @@ -816,6 +850,7 @@ - job: name: test-authorized_keys-test-migrate-authorized-keys-google node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_migrate_authorized_keys in authorized_keys suite on google parameters: @@ -894,6 +929,7 @@ - job: name: test-authorized_keys-test-migrate-authorized-keys-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_migrate_authorized_keys in authorized_keys suite on lxd parameters: @@ -968,6 +1004,7 @@ - job: name: test-authorized_keys-test-user-ssh-keys-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_user_ssh_keys in authorized_keys suite on aws parameters: @@ -1029,17 +1066,24 @@ - select-oci-registry - wait-for-cloud-init - prepare-integration-test - - run-integration-test: - test_name: 'authorized_keys' - setup_steps: '' - task_name: 'test_user_ssh_keys' - skip_tasks: 'test_bootstrap_authorized_keys,test_machine_ssh,test_migrate_authorized_keys' + - conditional-step: + 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: 'authorized_keys' + setup_steps: '' + task_name: 'test_user_ssh_keys' + skip_tasks: 'test_bootstrap_authorized_keys,test_machine_ssh,test_migrate_authorized_keys' publishers: - integration-artifacts - job: name: test-authorized_keys-test-user-ssh-keys-azure node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_user_ssh_keys in authorized_keys suite on azure parameters: @@ -1101,17 +1145,24 @@ - select-oci-registry - wait-for-cloud-init - prepare-integration-test - - run-integration-test: - test_name: 'authorized_keys' - setup_steps: '' - task_name: 'test_user_ssh_keys' - skip_tasks: 'test_bootstrap_authorized_keys,test_machine_ssh,test_migrate_authorized_keys' + - conditional-step: + 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: 'authorized_keys' + setup_steps: '' + task_name: 'test_user_ssh_keys' + skip_tasks: 'test_bootstrap_authorized_keys,test_machine_ssh,test_migrate_authorized_keys' publishers: - integration-artifacts - job: name: test-authorized_keys-test-user-ssh-keys-google node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_user_ssh_keys in authorized_keys suite on google parameters: @@ -1173,17 +1224,24 @@ - select-oci-registry - wait-for-cloud-init - prepare-integration-test - - run-integration-test: - test_name: 'authorized_keys' - setup_steps: '' - task_name: 'test_user_ssh_keys' - skip_tasks: 'test_bootstrap_authorized_keys,test_machine_ssh,test_migrate_authorized_keys' + - conditional-step: + 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: 'authorized_keys' + setup_steps: '' + task_name: 'test_user_ssh_keys' + skip_tasks: 'test_bootstrap_authorized_keys,test_machine_ssh,test_migrate_authorized_keys' publishers: - integration-artifacts - job: name: test-authorized_keys-test-user-ssh-keys-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_user_ssh_keys in authorized_keys suite on lxd parameters: @@ -1241,10 +1299,16 @@ - select-oci-registry - wait-for-cloud-init - prepare-integration-test - - run-integration-test: - test_name: 'authorized_keys' - setup_steps: '' - task_name: 'test_user_ssh_keys' - skip_tasks: 'test_bootstrap_authorized_keys,test_machine_ssh,test_migrate_authorized_keys' + - conditional-step: + 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: 'authorized_keys' + setup_steps: '' + task_name: 'test_user_ssh_keys' + skip_tasks: 'test_bootstrap_authorized_keys,test_machine_ssh,test_migrate_authorized_keys' publishers: - integration-artifacts diff --git a/jobs/ci-run/integration/gen/test-backup.yml b/jobs/ci-run/integration/gen/test-backup.yml index 894ea52..4b40d37 100644 --- a/jobs/ci-run/integration/gen/test-backup.yml +++ b/jobs/ci-run/integration/gen/test-backup.yml @@ -40,6 +40,7 @@ - job: name: test-backup-test-basic-backup-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test backup suite on aws parameters: @@ -112,6 +113,7 @@ - job: name: test-backup-test-basic-backup-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test backup suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-bootstrap.yml b/jobs/ci-run/integration/gen/test-bootstrap.yml index 5288694..c40cc05 100644 --- a/jobs/ci-run/integration/gen/test-bootstrap.yml +++ b/jobs/ci-run/integration/gen/test-bootstrap.yml @@ -38,6 +38,7 @@ - job: name: test-bootstrap-test-bootstrap-simplestream-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test bootstrap suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-caasadmission.yml b/jobs/ci-run/integration/gen/test-caasadmission.yml index a05ebfa..85e13b7 100644 --- a/jobs/ci-run/integration/gen/test-caasadmission.yml +++ b/jobs/ci-run/integration/gen/test-caasadmission.yml @@ -42,6 +42,7 @@ - job: name: test-caasadmission-test-controller-model-admission-microk8s node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_controller_model_admission in caasadmission suite on microk8s parameters: @@ -110,6 +111,7 @@ - job: name: test-caasadmission-test-model-chicken-and-egg-microk8s node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_model_chicken_and_egg in caasadmission suite on microk8s parameters: @@ -178,6 +180,7 @@ - job: name: test-caasadmission-test-new-model-admission-microk8s node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_new_model_admission in caasadmission suite on microk8s parameters: diff --git a/jobs/ci-run/integration/gen/test-charmhub.yml b/jobs/ci-run/integration/gen/test-charmhub.yml index 34fde6f..51a15e3 100644 --- a/jobs/ci-run/integration/gen/test-charmhub.yml +++ b/jobs/ci-run/integration/gen/test-charmhub.yml @@ -48,6 +48,7 @@ - job: name: test-charmhub-test-charmhub-download-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_charmhub_download in charmhub suite on aws parameters: @@ -120,6 +121,7 @@ - job: name: test-charmhub-test-charmhub-download-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_charmhub_download in charmhub suite on lxd parameters: @@ -188,6 +190,7 @@ - job: name: test-charmhub-test-charmhub-find-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_charmhub_find in charmhub suite on aws parameters: @@ -260,6 +263,7 @@ - job: name: test-charmhub-test-charmhub-find-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_charmhub_find in charmhub suite on lxd parameters: @@ -328,6 +332,7 @@ - job: name: test-charmhub-test-charmhub-info-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_charmhub_info in charmhub suite on aws parameters: @@ -400,6 +405,7 @@ - job: name: test-charmhub-test-charmhub-info-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_charmhub_info in charmhub suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-cli.yml b/jobs/ci-run/integration/gen/test-cli.yml index 1cb6101..883e63d 100644 --- a/jobs/ci-run/integration/gen/test-cli.yml +++ b/jobs/ci-run/integration/gen/test-cli.yml @@ -50,6 +50,7 @@ - job: name: test-cli-test-block-commands-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_block_commands in cli suite on lxd parameters: @@ -118,6 +119,7 @@ - job: name: test-cli-test-display-clouds-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_display_clouds in cli suite on lxd parameters: @@ -186,6 +188,7 @@ - job: name: test-cli-test-local-charms-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_local_charms in cli suite on lxd parameters: @@ -254,6 +257,7 @@ - job: name: test-cli-test-model-config-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_model_config in cli suite on lxd parameters: @@ -322,6 +326,7 @@ - job: name: test-cli-test-model-constraints-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_model_constraints in cli suite on lxd parameters: @@ -390,6 +395,7 @@ - job: name: test-cli-test-model-defaults-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_model_defaults in cli suite on lxd parameters: @@ -458,6 +464,7 @@ - job: name: test-cli-test-unregister-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_unregister in cli suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-cloud_azure.yml b/jobs/ci-run/integration/gen/test-cloud_azure.yml index e19c9d8..2b95b31 100644 --- a/jobs/ci-run/integration/gen/test-cloud_azure.yml +++ b/jobs/ci-run/integration/gen/test-cloud_azure.yml @@ -38,6 +38,7 @@ - job: name: test-cloud_azure-test-managed-identity-azure node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test cloud_azure suite on azure parameters: diff --git a/jobs/ci-run/integration/gen/test-cmr.yml b/jobs/ci-run/integration/gen/test-cmr.yml index d60a906..1ad1a6c 100644 --- a/jobs/ci-run/integration/gen/test-cmr.yml +++ b/jobs/ci-run/integration/gen/test-cmr.yml @@ -40,6 +40,7 @@ - job: name: test-cmr-test-offer-consume-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test cmr suite on aws parameters: @@ -112,6 +113,7 @@ - job: name: test-cmr-test-offer-consume-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test cmr suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-constraints.yml b/jobs/ci-run/integration/gen/test-constraints.yml index c685182..0edbb22 100644 --- a/jobs/ci-run/integration/gen/test-constraints.yml +++ b/jobs/ci-run/integration/gen/test-constraints.yml @@ -40,6 +40,7 @@ - job: name: test-constraints-test-constraints-common-google node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test constraints suite on google parameters: @@ -112,6 +113,7 @@ - job: name: test-constraints-test-constraints-common-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test constraints suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-controller.yml b/jobs/ci-run/integration/gen/test-controller.yml index c626c9b..ab453a5 100644 --- a/jobs/ci-run/integration/gen/test-controller.yml +++ b/jobs/ci-run/integration/gen/test-controller.yml @@ -52,6 +52,7 @@ - job: name: test-controller-test-enable-ha-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_enable_ha in controller suite on aws parameters: @@ -124,6 +125,7 @@ - job: name: test-controller-test-enable-ha-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_enable_ha in controller suite on lxd parameters: @@ -192,6 +194,7 @@ - job: name: test-controller-test-metrics-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_metrics in controller suite on aws parameters: @@ -264,6 +267,7 @@ - job: name: test-controller-test-metrics-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_metrics in controller suite on lxd parameters: @@ -332,6 +336,7 @@ - job: name: test-controller-test-mongo-memory-profile-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_mongo_memory_profile in controller suite on aws parameters: @@ -404,6 +409,7 @@ - job: name: test-controller-test-mongo-memory-profile-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_mongo_memory_profile in controller suite on lxd parameters: @@ -472,6 +478,7 @@ - job: name: test-controller-test-query-tracing-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_query_tracing in controller suite on aws parameters: @@ -550,6 +557,7 @@ - job: name: test-controller-test-query-tracing-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_query_tracing in controller suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-controllercharm.yml b/jobs/ci-run/integration/gen/test-controllercharm.yml index 561957b..5062be6 100644 --- a/jobs/ci-run/integration/gen/test-controllercharm.yml +++ b/jobs/ci-run/integration/gen/test-controllercharm.yml @@ -40,6 +40,7 @@ - job: name: test-controllercharm-test-prometheus-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test controllercharm suite on lxd parameters: @@ -114,6 +115,7 @@ - job: name: test-controllercharm-test-prometheus-microk8s node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test controllercharm suite on microk8s parameters: diff --git a/jobs/ci-run/integration/gen/test-coslite.yml b/jobs/ci-run/integration/gen/test-coslite.yml index 5a99c60..869de5f 100644 --- a/jobs/ci-run/integration/gen/test-coslite.yml +++ b/jobs/ci-run/integration/gen/test-coslite.yml @@ -38,6 +38,7 @@ - job: name: test-coslite-test-deploy-coslite-microk8s node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test coslite suite on microk8s parameters: diff --git a/jobs/ci-run/integration/gen/test-credential.yml b/jobs/ci-run/integration/gen/test-credential.yml index ba699b6..d99dc3d 100644 --- a/jobs/ci-run/integration/gen/test-credential.yml +++ b/jobs/ci-run/integration/gen/test-credential.yml @@ -44,6 +44,7 @@ - job: name: test-credential-test-add-remove-credential-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_add_remove_credential in credential suite on aws parameters: @@ -116,6 +117,7 @@ - job: name: test-credential-test-add-remove-credential-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_add_remove_credential in credential suite on lxd parameters: @@ -184,6 +186,7 @@ - job: name: test-credential-test-controller-credentials-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_controller_credentials in credential suite on aws parameters: @@ -256,6 +259,7 @@ - job: name: test-credential-test-controller-credentials-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_controller_credentials in credential suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-dashboard.yml b/jobs/ci-run/integration/gen/test-dashboard.yml index 6306dfe..84d5d36 100644 --- a/jobs/ci-run/integration/gen/test-dashboard.yml +++ b/jobs/ci-run/integration/gen/test-dashboard.yml @@ -40,6 +40,7 @@ - job: name: test-dashboard-test-dashboard-deploy-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test dashboard suite on aws parameters: @@ -118,6 +119,7 @@ - job: name: test-dashboard-test-dashboard-deploy-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test dashboard suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-deploy.yml b/jobs/ci-run/integration/gen/test-deploy.yml index 5ba0e7c..f95d008 100644 --- a/jobs/ci-run/integration/gen/test-deploy.yml +++ b/jobs/ci-run/integration/gen/test-deploy.yml @@ -56,6 +56,7 @@ - job: name: test-deploy-test-cmr-bundles-export-overlay-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_cmr_bundles_export_overlay in deploy suite on aws parameters: @@ -128,6 +129,7 @@ - job: name: test-deploy-test-cmr-bundles-export-overlay-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_cmr_bundles_export_overlay in deploy suite on lxd parameters: @@ -196,6 +198,7 @@ - job: name: test-deploy-test-deploy-bundles-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_deploy_bundles in deploy suite on aws parameters: @@ -268,6 +271,7 @@ - job: name: test-deploy-test-deploy-bundles-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_deploy_bundles in deploy suite on lxd parameters: @@ -336,6 +340,7 @@ - job: name: test-deploy-test-deploy-charms-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_deploy_charms in deploy suite on aws parameters: @@ -408,6 +413,7 @@ - job: name: test-deploy-test-deploy-charms-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_deploy_charms in deploy suite on lxd parameters: @@ -476,6 +482,7 @@ - job: name: test-deploy-test-deploy-default-series-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_deploy_default_series in deploy suite on aws parameters: @@ -548,6 +555,7 @@ - job: name: test-deploy-test-deploy-default-series-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_deploy_default_series in deploy suite on lxd parameters: @@ -616,6 +624,7 @@ - job: name: test-deploy-test-deploy-revision-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_deploy_revision in deploy suite on aws parameters: @@ -688,6 +697,7 @@ - job: name: test-deploy-test-deploy-revision-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_deploy_revision in deploy suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-deploy_aks.yml b/jobs/ci-run/integration/gen/test-deploy_aks.yml index 4d445a2..af8b6f4 100644 --- a/jobs/ci-run/integration/gen/test-deploy_aks.yml +++ b/jobs/ci-run/integration/gen/test-deploy_aks.yml @@ -38,6 +38,7 @@ - job: name: test-deploy_aks-test-deploy-aks-charms-azure node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test deploy_aks suite on azure parameters: diff --git a/jobs/ci-run/integration/gen/test-deploy_caas.yml b/jobs/ci-run/integration/gen/test-deploy_caas.yml index c4fa0c7..165b223 100644 --- a/jobs/ci-run/integration/gen/test-deploy_caas.yml +++ b/jobs/ci-run/integration/gen/test-deploy_caas.yml @@ -38,6 +38,7 @@ - job: name: test-deploy_caas-test-deploy-charm-microk8s node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test deploy_caas suite on microk8s parameters: diff --git a/jobs/ci-run/integration/gen/test-firewall.yml b/jobs/ci-run/integration/gen/test-firewall.yml index a2f1bdd..ecabcfc 100644 --- a/jobs/ci-run/integration/gen/test-firewall.yml +++ b/jobs/ci-run/integration/gen/test-firewall.yml @@ -42,6 +42,7 @@ - job: name: test-firewall-test-bundle-with-exposed-endpoints-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_bundle_with_exposed_endpoints in firewall suite on aws parameters: @@ -114,6 +115,7 @@ - job: name: test-firewall-test-expose-app-ec2-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_expose_app_ec2 in firewall suite on aws parameters: @@ -186,6 +188,7 @@ - job: name: test-firewall-test-firewall-ssh-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_firewall_ssh in firewall suite on aws parameters: diff --git a/jobs/ci-run/integration/gen/test-hooks.yml b/jobs/ci-run/integration/gen/test-hooks.yml index cc1143b..1965886 100644 --- a/jobs/ci-run/integration/gen/test-hooks.yml +++ b/jobs/ci-run/integration/gen/test-hooks.yml @@ -44,6 +44,7 @@ - job: name: test-hooks-test-dispatching-script-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_dispatching_script in hooks suite on aws parameters: @@ -116,6 +117,7 @@ - job: name: test-hooks-test-dispatching-script-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_dispatching_script in hooks suite on lxd parameters: @@ -184,6 +186,7 @@ - job: name: test-hooks-test-start-hook-fires-after-reboot-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_start_hook_fires_after_reboot in hooks suite on aws parameters: @@ -256,6 +259,7 @@ - job: name: test-hooks-test-start-hook-fires-after-reboot-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_start_hook_fires_after_reboot in hooks suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-hooktools.yml b/jobs/ci-run/integration/gen/test-hooktools.yml index 315ca3a..77c2c6e 100644 --- a/jobs/ci-run/integration/gen/test-hooktools.yml +++ b/jobs/ci-run/integration/gen/test-hooktools.yml @@ -40,6 +40,7 @@ - job: name: test-hooktools-test-state-hook-tools-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test hooktools suite on aws parameters: @@ -112,6 +113,7 @@ - job: name: test-hooktools-test-state-hook-tools-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test hooktools suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-kubeflow.yml b/jobs/ci-run/integration/gen/test-kubeflow.yml index 09e14a3..797b227 100644 --- a/jobs/ci-run/integration/gen/test-kubeflow.yml +++ b/jobs/ci-run/integration/gen/test-kubeflow.yml @@ -38,6 +38,7 @@ - job: name: test-kubeflow-test-deploy-kubeflow-microk8s node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test kubeflow suite on microk8s parameters: diff --git a/jobs/ci-run/integration/gen/test-machine.yml b/jobs/ci-run/integration/gen/test-machine.yml index e027b76..f2b97b0 100644 --- a/jobs/ci-run/integration/gen/test-machine.yml +++ b/jobs/ci-run/integration/gen/test-machine.yml @@ -40,6 +40,7 @@ - job: name: test-machine-test-logs-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test machine suite on aws parameters: @@ -112,6 +113,7 @@ - job: name: test-machine-test-logs-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test machine suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-magma.yml b/jobs/ci-run/integration/gen/test-magma.yml new file mode 100644 index 0000000..8eba385 --- /dev/null +++ b/jobs/ci-run/integration/gen/test-magma.yml @@ -0,0 +1,401 @@ + + +# Code generated by gen-wire-tests. DO NOT EDIT. +- job: + name: 'test-magma-multijob' + project-type: 'multijob' + description: |- + Test magma 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-magma' + projects: + - name: 'test-magma-test-deploy-magma-aws' + current-parameters: true + - name: 'test-magma-test-deploy-magma-azure' + current-parameters: true + - name: 'test-magma-test-deploy-magma-google' + current-parameters: true + - name: 'test-magma-test-deploy-magma-lxd' + current-parameters: true + - name: 'test-magma-test-deploy-magma-microk8s' + current-parameters: true + +- job: + name: test-magma-test-deploy-magma-aws + node: ephemeral-noble-small-amd64 + concurrent: true + description: |- + Test magma 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: 'magma' + setup_steps: '' + task_name: '' + skip_tasks: '' + publishers: + - integration-artifacts + +- job: + name: test-magma-test-deploy-magma-azure + node: ephemeral-noble-small-amd64 + concurrent: true + description: |- + Test magma 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: 'magma' + setup_steps: '' + task_name: '' + skip_tasks: '' + publishers: + - integration-artifacts + +- job: + name: test-magma-test-deploy-magma-google + node: ephemeral-noble-small-amd64 + concurrent: true + description: |- + Test magma 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 + - 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: 'magma' + setup_steps: '' + task_name: '' + skip_tasks: '' + publishers: + - integration-artifacts + +- job: + name: test-magma-test-deploy-magma-lxd + node: ephemeral-noble-8c-32g-amd64 + concurrent: true + description: |- + Test magma 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: 'magma' + setup_steps: '' + task_name: '' + skip_tasks: '' + publishers: + - integration-artifacts + +- job: + name: test-magma-test-deploy-magma-microk8s + node: ephemeral-noble-8c-32g-amd64 + concurrent: true + description: |- + Test magma 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 + 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-microk8s: + test_name: 'magma' + setup_steps: '' + task_name: '' + skip_tasks: '' + publishers: + - integration-artifacts diff --git a/jobs/ci-run/integration/gen/test-manual.yml b/jobs/ci-run/integration/gen/test-manual.yml index 092cb54..3f717a3 100644 --- a/jobs/ci-run/integration/gen/test-manual.yml +++ b/jobs/ci-run/integration/gen/test-manual.yml @@ -44,6 +44,7 @@ - job: name: test-manual-test-deploy-manual-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_deploy_manual in manual suite on aws parameters: @@ -116,6 +117,7 @@ - job: name: test-manual-test-deploy-manual-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_deploy_manual in manual suite on lxd parameters: @@ -184,6 +186,7 @@ - job: name: test-manual-test-spaces-manual-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_spaces_manual in manual suite on aws parameters: @@ -256,6 +259,7 @@ - job: name: test-manual-test-spaces-manual-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_spaces_manual in manual suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-model.yml b/jobs/ci-run/integration/gen/test-model.yml index de04942..0f14de1 100644 --- a/jobs/ci-run/integration/gen/test-model.yml +++ b/jobs/ci-run/integration/gen/test-model.yml @@ -90,6 +90,7 @@ - job: name: test-model-test-model-config-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_config in model suite on aws parameters: @@ -162,6 +163,7 @@ - job: name: test-model-test-model-config-google node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_config in model suite on google parameters: @@ -234,6 +236,7 @@ - job: name: test-model-test-model-config-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_model_config in model suite on lxd parameters: @@ -302,6 +305,7 @@ - job: name: test-model-test-model-destroy-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_destroy in model suite on aws parameters: @@ -374,6 +378,7 @@ - job: name: test-model-test-model-destroy-google node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_destroy in model suite on google parameters: @@ -446,6 +451,7 @@ - job: name: test-model-test-model-destroy-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_model_destroy in model suite on lxd parameters: @@ -514,6 +520,7 @@ - job: name: test-model-test-model-metrics-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_metrics in model suite on aws parameters: @@ -586,6 +593,7 @@ - job: name: test-model-test-model-metrics-google node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_metrics in model suite on google parameters: @@ -658,6 +666,7 @@ - job: name: test-model-test-model-metrics-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_model_metrics in model suite on lxd parameters: @@ -726,6 +735,7 @@ - job: name: test-model-test-model-migration-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_migration in model suite on aws parameters: @@ -798,6 +808,7 @@ - job: name: test-model-test-model-migration-google node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_migration in model suite on google parameters: @@ -870,6 +881,7 @@ - job: name: test-model-test-model-migration-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_model_migration in model suite on lxd parameters: @@ -938,6 +950,7 @@ - job: name: test-model-test-model-migration-saas-common-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_migration_saas_common in model suite on aws parameters: @@ -1010,6 +1023,7 @@ - job: name: test-model-test-model-migration-saas-common-google node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_migration_saas_common in model suite on google parameters: @@ -1082,6 +1096,7 @@ - job: name: test-model-test-model-migration-saas-common-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_model_migration_saas_common in model suite on lxd parameters: @@ -1150,6 +1165,7 @@ - job: name: test-model-test-model-migration-saas-external-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_migration_saas_external in model suite on aws parameters: @@ -1222,6 +1238,7 @@ - job: name: test-model-test-model-migration-saas-external-google node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_migration_saas_external in model suite on google parameters: @@ -1294,6 +1311,7 @@ - job: name: test-model-test-model-migration-saas-external-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_model_migration_saas_external in model suite on lxd parameters: @@ -1362,6 +1380,7 @@ - job: name: test-model-test-model-migration-version-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_migration_version in model suite on aws parameters: @@ -1434,6 +1453,7 @@ - job: name: test-model-test-model-migration-version-google node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_migration_version in model suite on google parameters: @@ -1506,6 +1526,7 @@ - job: name: test-model-test-model-migration-version-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_model_migration_version in model suite on lxd parameters: @@ -1574,6 +1595,7 @@ - job: name: test-model-test-model-multi-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_multi in model suite on aws parameters: @@ -1646,6 +1668,7 @@ - job: name: test-model-test-model-multi-google node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_multi in model suite on google parameters: @@ -1718,6 +1741,7 @@ - job: name: test-model-test-model-multi-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_model_multi in model suite on lxd parameters: @@ -1786,6 +1810,7 @@ - job: name: test-model-test-model-status-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_status in model suite on aws parameters: @@ -1858,6 +1883,7 @@ - job: name: test-model-test-model-status-google node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_model_status in model suite on google parameters: @@ -1930,6 +1956,7 @@ - job: name: test-model-test-model-status-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_model_status in model suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-network.yml b/jobs/ci-run/integration/gen/test-network.yml index 1eaeb53..f4e8439 100644 --- a/jobs/ci-run/integration/gen/test-network.yml +++ b/jobs/ci-run/integration/gen/test-network.yml @@ -44,6 +44,7 @@ - job: name: test-network-test-network-health-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test network suite on aws parameters: @@ -116,6 +117,7 @@ - job: name: test-network-test-network-health-azure node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test network suite on azure parameters: @@ -188,6 +190,7 @@ - job: name: test-network-test-network-health-google node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test network suite on google parameters: @@ -260,6 +263,7 @@ - job: name: test-network-test-network-health-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test network suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-refresh.yml b/jobs/ci-run/integration/gen/test-refresh.yml index c0d2e6f..21f7961 100644 --- a/jobs/ci-run/integration/gen/test-refresh.yml +++ b/jobs/ci-run/integration/gen/test-refresh.yml @@ -44,6 +44,7 @@ - job: name: test-refresh-test-basic-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_basic in refresh suite on aws parameters: @@ -116,6 +117,7 @@ - job: name: test-refresh-test-basic-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_basic in refresh suite on lxd parameters: @@ -184,6 +186,7 @@ - job: name: test-refresh-test-switch-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_switch in refresh suite on aws parameters: @@ -256,6 +259,7 @@ - job: name: test-refresh-test-switch-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_switch in refresh suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-relations.yml b/jobs/ci-run/integration/gen/test-relations.yml index 5079d9b..5b0300b 100644 --- a/jobs/ci-run/integration/gen/test-relations.yml +++ b/jobs/ci-run/integration/gen/test-relations.yml @@ -48,6 +48,7 @@ - job: name: test-relations-test-relation-data-exchange-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_relation_data_exchange in relations suite on aws parameters: @@ -120,6 +121,7 @@ - job: name: test-relations-test-relation-data-exchange-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_relation_data_exchange in relations suite on lxd parameters: @@ -188,6 +190,7 @@ - job: name: test-relations-test-relation-departing-unit-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_relation_departing_unit in relations suite on aws parameters: @@ -260,6 +263,7 @@ - job: name: test-relations-test-relation-departing-unit-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_relation_departing_unit in relations suite on lxd parameters: @@ -328,6 +332,7 @@ - job: name: test-relations-test-relation-list-app-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_relation_list_app in relations suite on aws parameters: @@ -400,6 +405,7 @@ - job: name: test-relations-test-relation-list-app-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_relation_list_app in relations suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-resources.yml b/jobs/ci-run/integration/gen/test-resources.yml index 5e9f532..d09eee5 100644 --- a/jobs/ci-run/integration/gen/test-resources.yml +++ b/jobs/ci-run/integration/gen/test-resources.yml @@ -44,6 +44,7 @@ - job: name: test-resources-test-basic-resources-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_basic_resources in resources suite on aws parameters: @@ -116,6 +117,7 @@ - job: name: test-resources-test-basic-resources-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_basic_resources in resources suite on lxd parameters: @@ -184,6 +186,7 @@ - job: name: test-resources-test-upgrade-resources-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_upgrade_resources in resources suite on aws parameters: @@ -256,6 +259,7 @@ - job: name: test-resources-test-upgrade-resources-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_upgrade_resources in resources suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-secrets_iaas.yml b/jobs/ci-run/integration/gen/test-secrets_iaas.yml index 448adda..debd9f6 100644 --- a/jobs/ci-run/integration/gen/test-secrets_iaas.yml +++ b/jobs/ci-run/integration/gen/test-secrets_iaas.yml @@ -46,6 +46,7 @@ - job: name: test-secrets_iaas-test-secret-drain-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_secret_drain in secrets_iaas suite on lxd parameters: @@ -120,6 +121,7 @@ - job: name: test-secrets_iaas-test-secrets-cmr-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_secrets_cmr in secrets_iaas suite on lxd parameters: @@ -194,6 +196,7 @@ - job: name: test-secrets_iaas-test-secrets-juju-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_secrets_juju in secrets_iaas suite on lxd parameters: @@ -268,6 +271,7 @@ - job: name: test-secrets_iaas-test-secrets-vault-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_secrets_vault in secrets_iaas suite on lxd parameters: @@ -342,6 +346,7 @@ - job: name: test-secrets_iaas-test-user-secret-drain-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_user_secret_drain in secrets_iaas suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-secrets_k8s.yml b/jobs/ci-run/integration/gen/test-secrets_k8s.yml index cae018e..0e7eff6 100644 --- a/jobs/ci-run/integration/gen/test-secrets_k8s.yml +++ b/jobs/ci-run/integration/gen/test-secrets_k8s.yml @@ -44,6 +44,7 @@ - job: name: test-secrets_k8s-test-secret-drain-microk8s node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_secret_drain in secrets_k8s suite on microk8s parameters: @@ -118,6 +119,7 @@ - job: name: test-secrets_k8s-test-secrets-microk8s node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_secrets in secrets_k8s suite on microk8s parameters: @@ -192,6 +194,7 @@ - job: name: test-secrets_k8s-test-user-secret-drain-microk8s node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_user_secret_drain in secrets_k8s suite on microk8s parameters: @@ -266,6 +269,7 @@ - job: name: test-secrets_k8s-test-user-secrets-microk8s node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_user_secrets in secrets_k8s suite on microk8s parameters: diff --git a/jobs/ci-run/integration/gen/test-sidecar.yml b/jobs/ci-run/integration/gen/test-sidecar.yml index 66b10f3..c4ca9b7 100644 --- a/jobs/ci-run/integration/gen/test-sidecar.yml +++ b/jobs/ci-run/integration/gen/test-sidecar.yml @@ -46,6 +46,7 @@ - job: name: test-sidecar-test-deploy-and-force-remove-application-microk8s node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_deploy_and_force_remove_application in sidecar suite on microk8s parameters: @@ -114,6 +115,7 @@ - job: name: test-sidecar-test-deploy-and-remove-application-microk8s node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_deploy_and_remove_application in sidecar suite on microk8s parameters: @@ -182,6 +184,7 @@ - job: name: test-sidecar-test-pebble-checks-microk8s node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_pebble_checks in sidecar suite on microk8s parameters: @@ -239,17 +242,24 @@ - select-oci-registry - wait-for-cloud-init - prepare-integration-test - - run-integration-test-microk8s: - test_name: 'sidecar' - setup_steps: '' - task_name: 'test_pebble_checks' - skip_tasks: 'test_deploy_and_force_remove_application,test_deploy_and_remove_application,test_pebble_notices,test_rootless' + - conditional-step: + condition-kind: regex-match + regex: "^[4-9].*|^3\\.([6-9]|\\d{{2,}})(\\.|-).*" + label: "${{JUJU_VERSION}}" + on-evaluation-failure: "dont-run" + steps: + - run-integration-test-microk8s: + test_name: 'sidecar' + setup_steps: '' + task_name: 'test_pebble_checks' + skip_tasks: 'test_deploy_and_force_remove_application,test_deploy_and_remove_application,test_pebble_notices,test_rootless' publishers: - integration-artifacts - job: name: test-sidecar-test-pebble-notices-microk8s node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_pebble_notices in sidecar suite on microk8s parameters: @@ -324,6 +334,7 @@ - job: name: test-sidecar-test-rootless-microk8s node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_rootless in sidecar suite on microk8s parameters: @@ -381,10 +392,16 @@ - select-oci-registry - wait-for-cloud-init - prepare-integration-test - - run-integration-test-microk8s: - test_name: 'sidecar' - setup_steps: '' - task_name: 'test_rootless' - skip_tasks: 'test_deploy_and_force_remove_application,test_deploy_and_remove_application,test_pebble_checks,test_pebble_notices' + - conditional-step: + condition-kind: regex-match + regex: "^[4-9].*|^3\\.([6-9]|\\d{{2,}})(\\.|-).*" + label: "${{JUJU_VERSION}}" + on-evaluation-failure: "dont-run" + steps: + - run-integration-test-microk8s: + test_name: 'sidecar' + setup_steps: '' + task_name: 'test_rootless' + skip_tasks: 'test_deploy_and_force_remove_application,test_deploy_and_remove_application,test_pebble_checks,test_pebble_notices' publishers: - integration-artifacts diff --git a/jobs/ci-run/integration/gen/test-smoke.yml b/jobs/ci-run/integration/gen/test-smoke.yml index f855bc1..360ee52 100644 --- a/jobs/ci-run/integration/gen/test-smoke.yml +++ b/jobs/ci-run/integration/gen/test-smoke.yml @@ -44,6 +44,7 @@ - job: name: test-smoke-test-build-aws node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_build in smoke suite on aws parameters: @@ -116,6 +117,7 @@ - job: name: test-smoke-test-build-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_build in smoke suite on lxd parameters: @@ -184,6 +186,7 @@ - job: name: test-smoke-test-deploy-aws node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_deploy in smoke suite on aws parameters: @@ -256,6 +259,7 @@ - job: name: test-smoke-test-deploy-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_deploy in smoke suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-smoke_k8s.yml b/jobs/ci-run/integration/gen/test-smoke_k8s.yml index dfd075a..562e508 100644 --- a/jobs/ci-run/integration/gen/test-smoke_k8s.yml +++ b/jobs/ci-run/integration/gen/test-smoke_k8s.yml @@ -38,6 +38,7 @@ - job: name: test-smoke_k8s-test-deploy-microk8s node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test smoke_k8s suite on microk8s parameters: diff --git a/jobs/ci-run/integration/gen/test-spaces_ec2.yml b/jobs/ci-run/integration/gen/test-spaces_ec2.yml index a121efb..68bf853 100644 --- a/jobs/ci-run/integration/gen/test-spaces_ec2.yml +++ b/jobs/ci-run/integration/gen/test-spaces_ec2.yml @@ -42,6 +42,7 @@ - job: name: test-spaces_ec2-test-juju-bind-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_juju_bind in spaces_ec2 suite on aws parameters: @@ -114,6 +115,7 @@ - job: name: test-spaces_ec2-test-machines-in-spaces-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_machines_in_spaces in spaces_ec2 suite on aws parameters: @@ -186,6 +188,7 @@ - job: name: test-spaces_ec2-test-upgrade-charm-with-bind-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_upgrade_charm_with_bind in spaces_ec2 suite on aws parameters: diff --git a/jobs/ci-run/integration/gen/test-storage.yml b/jobs/ci-run/integration/gen/test-storage.yml index 10368b4..328b671 100644 --- a/jobs/ci-run/integration/gen/test-storage.yml +++ b/jobs/ci-run/integration/gen/test-storage.yml @@ -40,6 +40,7 @@ - job: name: test-storage-test-charm-storage-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_charm_storage in storage suite on aws parameters: @@ -112,6 +113,7 @@ - job: name: test-storage-test-persistent-storage-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_persistent_storage in storage suite on aws parameters: diff --git a/jobs/ci-run/integration/gen/test-unit.yml b/jobs/ci-run/integration/gen/test-unit.yml index 88ac200..9becea4 100644 --- a/jobs/ci-run/integration/gen/test-unit.yml +++ b/jobs/ci-run/integration/gen/test-unit.yml @@ -32,147 +32,3 @@ - multijob: name: 'IntegrationTests-unit' projects: - - name: 'test-unit-test-unit-series-aws' - current-parameters: true - - name: 'test-unit-test-unit-series-lxd' - current-parameters: true - -- job: - name: test-unit-test-unit-series-aws - node: ephemeral-noble-small-amd64 - description: |- - Test unit 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: 'unit' - setup_steps: '' - task_name: '' - skip_tasks: '' - publishers: - - integration-artifacts - -- job: - name: test-unit-test-unit-series-lxd - node: ephemeral-noble-8c-32g-amd64 - description: |- - Test unit 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: 'unit' - setup_steps: '' - task_name: '' - skip_tasks: '' - publishers: - - integration-artifacts diff --git a/jobs/ci-run/integration/gen/test-upgrade.yml b/jobs/ci-run/integration/gen/test-upgrade.yml index 23c3a72..14e21e0 100644 --- a/jobs/ci-run/integration/gen/test-upgrade.yml +++ b/jobs/ci-run/integration/gen/test-upgrade.yml @@ -38,6 +38,7 @@ - job: name: test-upgrade-test-upgrade-simplestream-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test upgrade suite on lxd parameters: diff --git a/jobs/ci-run/integration/gen/test-upgrade_series.yml b/jobs/ci-run/integration/gen/test-upgrade_series.yml new file mode 100644 index 0000000..81d9ae4 --- /dev/null +++ b/jobs/ci-run/integration/gen/test-upgrade_series.yml @@ -0,0 +1,34 @@ + + +# Code generated by gen-wire-tests. DO NOT EDIT. +- job: + name: 'test-upgrade_series-multijob' + project-type: 'multijob' + description: |- + Test upgrade_series 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-upgrade_series' + projects: diff --git a/jobs/ci-run/integration/gen/test-user.yml b/jobs/ci-run/integration/gen/test-user.yml index 3d5efaf..84f2b2b 100644 --- a/jobs/ci-run/integration/gen/test-user.yml +++ b/jobs/ci-run/integration/gen/test-user.yml @@ -48,6 +48,7 @@ - job: name: test-user-test-user-login-password-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_user_login_password in user suite on aws parameters: @@ -120,6 +121,7 @@ - job: name: test-user-test-user-login-password-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_user_login_password in user suite on lxd parameters: @@ -188,6 +190,7 @@ - job: name: test-user-test-user-manage-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_user_manage in user suite on aws parameters: @@ -260,6 +263,7 @@ - job: name: test-user-test-user-manage-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_user_manage in user suite on lxd parameters: @@ -328,6 +332,7 @@ - job: name: test-user-test-user-register-aws node: ephemeral-noble-small-amd64 + concurrent: true description: |- Test test_user_register in user suite on aws parameters: @@ -400,6 +405,7 @@ - job: name: test-user-test-user-register-lxd node: ephemeral-noble-8c-32g-amd64 + concurrent: true description: |- Test test_user_register in user suite on lxd parameters: diff --git a/tools/gen-wire-tests/juju.config b/tools/gen-wire-tests/juju.config index 61d49c5..94e7a81 100644 --- a/tools/gen-wire-tests/juju.config +++ b/tools/gen-wire-tests/juju.config @@ -32,6 +32,12 @@ folders: 3.5 test_pebble_notices: 3.4 + test_pebble_checks: + 3.6 + test_rootless: + 3.6 + authorized_keys-*: + 4.0 test_actions_params: 4.0 smoke_k8s-test_deploy: diff --git a/tools/gen-wire-tests/main.go b/tools/gen-wire-tests/main.go index 0233a8a..be4017b 100644 --- a/tools/gen-wire-tests/main.go +++ b/tools/gen-wire-tests/main.go @@ -281,6 +281,9 @@ func writeJobDefinitions( if introduced, ok := config.Folders.Introduced[suiteName+"-"+task]; ok { minVersions[suiteName+"-"+task] = minVersionRegex[introduced] } + if introduced, ok := config.Folders.Introduced[suiteName+"-*"]; ok { + minVersions[suiteName+"-"+task] = minVersionRegex[introduced] + } } if err := t.Execute(f, struct { @@ -472,6 +475,7 @@ const Template = ` - job: name: {{$full_task_name}} node: {{$run_on}} + concurrent: true description: |- {{- if eq (len $node.SkipTasks) 1 }} Test {{$.SuiteName}} suite on {{$cloud.Name}} From 7ebec6aa5bc53cfcb3718cb26cf53386aba422e4 Mon Sep 17 00:00:00 2001 From: Harry Pidcock Date: Tue, 19 Nov 2024 17:27:19 +1000 Subject: [PATCH 2/3] fix: add 24.04 ecr copy --- jobs/ci-run/scripts/snippet_setup_ecr_public.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/jobs/ci-run/scripts/snippet_setup_ecr_public.sh b/jobs/ci-run/scripts/snippet_setup_ecr_public.sh index 9d19242..1ada373 100644 --- a/jobs/ci-run/scripts/snippet_setup_ecr_public.sh +++ b/jobs/ci-run/scripts/snippet_setup_ecr_public.sh @@ -16,8 +16,9 @@ aws ecr-public create-repository --repository-name "build-${SHORT_GIT_COMMIT}/ch aws ecr-public get-login-password | skopeo login -u AWS --password-stdin public.ecr.aws # use the latest skopeo for doing the actual copy. -podman run --rm -v $XDG_RUNTIME_DIR/containers/auth.json:/auth.json quay.io/skopeo/stable:latest copy --authfile /auth.json --all docker://public.ecr.aws/juju/juju-db:4.4 docker://public.ecr.aws/jujuqabot/build-${SHORT_GIT_COMMIT}/juju-db:4.4 -podman run --rm -v $XDG_RUNTIME_DIR/containers/auth.json:/auth.json quay.io/skopeo/stable:latest copy --authfile /auth.json --all docker://public.ecr.aws/juju/charm-base:ubuntu-18.04 docker://public.ecr.aws/jujuqabot/build-${SHORT_GIT_COMMIT}/charm-base:ubuntu-18.04 -podman run --rm -v $XDG_RUNTIME_DIR/containers/auth.json:/auth.json quay.io/skopeo/stable:latest copy --authfile /auth.json --all docker://public.ecr.aws/juju/charm-base:ubuntu-20.04 docker://public.ecr.aws/jujuqabot/build-${SHORT_GIT_COMMIT}/charm-base:ubuntu-20.04 -podman run --rm -v $XDG_RUNTIME_DIR/containers/auth.json:/auth.json quay.io/skopeo/stable:latest copy --authfile /auth.json --all docker://public.ecr.aws/juju/charm-base:ubuntu-22.04 docker://public.ecr.aws/jujuqabot/build-${SHORT_GIT_COMMIT}/charm-base:ubuntu-22.04 -podman run --rm -v $XDG_RUNTIME_DIR/containers/auth.json:/auth.json quay.io/skopeo/stable:latest copy --authfile /auth.json --all docker://public.ecr.aws/juju/charm-base:ubuntu-24.04 docker://public.ecr.aws/jujuqabot/build-${SHORT_GIT_COMMIT}/charm-base:ubuntu-24.04 +podman run --rm -v $XDG_RUNTIME_DIR/containers/auth.json:/auth.json quay.io/skopeo/stable:latest copy --authfile /auth.json --all docker://public.ecr.aws/juju/juju-db:4.4 docker://public.ecr.aws/jujuqabot/build-${SHORT_GIT_COMMIT}/juju-db:4.4 & +podman run --rm -v $XDG_RUNTIME_DIR/containers/auth.json:/auth.json quay.io/skopeo/stable:latest copy --authfile /auth.json --all docker://public.ecr.aws/juju/charm-base:ubuntu-18.04 docker://public.ecr.aws/jujuqabot/build-${SHORT_GIT_COMMIT}/charm-base:ubuntu-18.04 & +podman run --rm -v $XDG_RUNTIME_DIR/containers/auth.json:/auth.json quay.io/skopeo/stable:latest copy --authfile /auth.json --all docker://public.ecr.aws/juju/charm-base:ubuntu-20.04 docker://public.ecr.aws/jujuqabot/build-${SHORT_GIT_COMMIT}/charm-base:ubuntu-20.04 & +podman run --rm -v $XDG_RUNTIME_DIR/containers/auth.json:/auth.json quay.io/skopeo/stable:latest copy --authfile /auth.json --all docker://public.ecr.aws/juju/charm-base:ubuntu-22.04 docker://public.ecr.aws/jujuqabot/build-${SHORT_GIT_COMMIT}/charm-base:ubuntu-22.04 & +podman run --rm -v $XDG_RUNTIME_DIR/containers/auth.json:/auth.json quay.io/skopeo/stable:latest copy --authfile /auth.json --all docker://public.ecr.aws/juju/charm-base:ubuntu-24.04 docker://public.ecr.aws/jujuqabot/build-${SHORT_GIT_COMMIT}/charm-base:ubuntu-24.04 & +wait From d3d3761ba0d32cb23ace88a2903f3a699ae8e3fc Mon Sep 17 00:00:00 2001 From: Harry Pidcock Date: Tue, 19 Nov 2024 18:14:02 +1000 Subject: [PATCH 3/3] fix: tweak gen-wire-tests to not emit empty multijob --- jobs/ci-run/integration/gen/test-magma.yml | 401 ------------------ jobs/ci-run/integration/gen/test-unit.yml | 3 - .../integration/gen/test-upgrade_series.yml | 3 - tools/gen-wire-tests/juju.config | 1 + tools/gen-wire-tests/main.go | 42 +- 5 files changed, 23 insertions(+), 427 deletions(-) delete mode 100644 jobs/ci-run/integration/gen/test-magma.yml diff --git a/jobs/ci-run/integration/gen/test-magma.yml b/jobs/ci-run/integration/gen/test-magma.yml deleted file mode 100644 index 8eba385..0000000 --- a/jobs/ci-run/integration/gen/test-magma.yml +++ /dev/null @@ -1,401 +0,0 @@ - - -# Code generated by gen-wire-tests. DO NOT EDIT. -- job: - name: 'test-magma-multijob' - project-type: 'multijob' - description: |- - Test magma 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-magma' - projects: - - name: 'test-magma-test-deploy-magma-aws' - current-parameters: true - - name: 'test-magma-test-deploy-magma-azure' - current-parameters: true - - name: 'test-magma-test-deploy-magma-google' - current-parameters: true - - name: 'test-magma-test-deploy-magma-lxd' - current-parameters: true - - name: 'test-magma-test-deploy-magma-microk8s' - current-parameters: true - -- job: - name: test-magma-test-deploy-magma-aws - node: ephemeral-noble-small-amd64 - concurrent: true - description: |- - Test magma 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: 'magma' - setup_steps: '' - task_name: '' - skip_tasks: '' - publishers: - - integration-artifacts - -- job: - name: test-magma-test-deploy-magma-azure - node: ephemeral-noble-small-amd64 - concurrent: true - description: |- - Test magma 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: 'magma' - setup_steps: '' - task_name: '' - skip_tasks: '' - publishers: - - integration-artifacts - -- job: - name: test-magma-test-deploy-magma-google - node: ephemeral-noble-small-amd64 - concurrent: true - description: |- - Test magma 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 - - 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: 'magma' - setup_steps: '' - task_name: '' - skip_tasks: '' - publishers: - - integration-artifacts - -- job: - name: test-magma-test-deploy-magma-lxd - node: ephemeral-noble-8c-32g-amd64 - concurrent: true - description: |- - Test magma 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: 'magma' - setup_steps: '' - task_name: '' - skip_tasks: '' - publishers: - - integration-artifacts - -- job: - name: test-magma-test-deploy-magma-microk8s - node: ephemeral-noble-8c-32g-amd64 - concurrent: true - description: |- - Test magma 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 - 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-microk8s: - test_name: 'magma' - setup_steps: '' - task_name: '' - skip_tasks: '' - publishers: - - integration-artifacts diff --git a/jobs/ci-run/integration/gen/test-unit.yml b/jobs/ci-run/integration/gen/test-unit.yml index 9becea4..6425184 100644 --- a/jobs/ci-run/integration/gen/test-unit.yml +++ b/jobs/ci-run/integration/gen/test-unit.yml @@ -29,6 +29,3 @@ builders: - get-build-details - set-test-description - - multijob: - name: 'IntegrationTests-unit' - projects: diff --git a/jobs/ci-run/integration/gen/test-upgrade_series.yml b/jobs/ci-run/integration/gen/test-upgrade_series.yml index 81d9ae4..10ad77e 100644 --- a/jobs/ci-run/integration/gen/test-upgrade_series.yml +++ b/jobs/ci-run/integration/gen/test-upgrade_series.yml @@ -29,6 +29,3 @@ builders: - get-build-details - set-test-description - - multijob: - name: 'IntegrationTests-upgrade_series' - projects: diff --git a/tools/gen-wire-tests/juju.config b/tools/gen-wire-tests/juju.config index 94e7a81..c324307 100644 --- a/tools/gen-wire-tests/juju.config +++ b/tools/gen-wire-tests/juju.config @@ -69,6 +69,7 @@ folders: - ovs_maas - static_analysis - ck + - magma skip-lxd: - caasadmission - cloud_azure diff --git a/tools/gen-wire-tests/main.go b/tools/gen-wire-tests/main.go index be4017b..98b7705 100644 --- a/tools/gen-wire-tests/main.go +++ b/tools/gen-wire-tests/main.go @@ -21,26 +21,26 @@ import ( // Config represents the different ways to config the linter type Config struct { Folders struct { - Skip []string `yaml:"skip-all"` - SkipLXD []string `yaml:"skip-lxd"` - SkipAWS []string `yaml:"skip-aws"` - SkipGoogle []string `yaml:"skip-google"` - SkipAzure []string `yaml:"skip-azure"` - SkipMicrok8s []string `yaml:"skip-microk8s"` - SkipSubTasks []string `yaml:"skip-subtasks"` - PreventSplit []string `yaml:"prevent-split"` - Ephemeral []string `yaml:"ephemeral"` - CrossCloud []string `yaml:"cross-cloud"` - Timeout map[string]map[string]int `yaml:"timeout"` - Introduced map[string]string `yaml:"introduced"` + Skip []string `yaml:"skip-all"` + SkipLXD []string `yaml:"skip-lxd"` + SkipAWS []string `yaml:"skip-aws"` + SkipGoogle []string `yaml:"skip-google"` + SkipAzure []string `yaml:"skip-azure"` + SkipMicrok8s []string `yaml:"skip-microk8s"` + SkipSubTasks []string `yaml:"skip-subtasks"` + PreventSplit []string `yaml:"prevent-split"` + Ephemeral []string `yaml:"ephemeral"` + CrossCloud []string `yaml:"cross-cloud"` + Timeout map[string]map[string]int `yaml:"timeout"` + Introduced map[string]string `yaml:"introduced"` } } type Task struct { - Clouds []Cloud - SubTasks []string - ExcludedTasks []string - Timeout map[string]int + Clouds []Cloud + SubTasks []string + ExcludedTasks []string + Timeout map[string]int } type Cloud struct { @@ -180,10 +180,10 @@ func main() { } testSuites[suiteName] = Task{ - Clouds: clouds, - SubTasks: taskNames, - ExcludedTasks: excluded, - Timeout: config.Folders.Timeout[suiteName], + Clouds: clouds, + SubTasks: taskNames, + ExcludedTasks: excluded, + Timeout: config.Folders.Timeout[suiteName], } } @@ -443,6 +443,7 @@ const Template = ` builders: - get-build-details - set-test-description +{{- if gt (len $node.TaskNames) 0 }} - multijob: name: 'IntegrationTests-{{.SuiteName}}' projects: @@ -453,6 +454,7 @@ const Template = ` current-parameters: true {{- end}} {{- end}} +{{- end}} {{- range $k, $skip_tasks := $node.SkipTasks -}} {{- range $cloud := $node.Clouds -}}