From 91bcce3216735399bbec86e853a9f1107fb94821 Mon Sep 17 00:00:00 2001 From: Harry Pidcock Date: Thu, 30 May 2024 21:44:58 +1000 Subject: [PATCH] Fix localhost cloudname for local lxd cloud. --- jobs/ci-run/integration/gen/test-actions.yml | 2 +- jobs/ci-run/integration/gen/test-agents.yml | 2 +- jobs/ci-run/integration/gen/test-appdata.yml | 2 +- jobs/ci-run/integration/gen/test-backup.yml | 2 +- .../ci-run/integration/gen/test-bootstrap.yml | 2 +- jobs/ci-run/integration/gen/test-branches.yml | 4 +-- jobs/ci-run/integration/gen/test-charmhub.yml | 6 ++--- jobs/ci-run/integration/gen/test-cli.yml | 14 +++++------ 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 +- .../integration/gen/test-credential.yml | 4 +-- .../ci-run/integration/gen/test-dashboard.yml | 2 +- jobs/ci-run/integration/gen/test-deploy.yml | 12 ++++----- jobs/ci-run/integration/gen/test-hooks.yml | 4 +-- .../ci-run/integration/gen/test-hooktools.yml | 2 +- jobs/ci-run/integration/gen/test-machine.yml | 2 +- jobs/ci-run/integration/gen/test-manual.yml | 4 +-- jobs/ci-run/integration/gen/test-model.yml | 18 ++++++------- jobs/ci-run/integration/gen/test-network.yml | 2 +- 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 | 10 ++++---- jobs/ci-run/integration/gen/test-smoke.yml | 4 +-- jobs/ci-run/integration/gen/test-unit.yml | 2 +- jobs/ci-run/integration/gen/test-upgrade.yml | 2 +- .../integration/gen/test-upgrade_series.yml | 2 +- jobs/ci-run/integration/gen/test-user.yml | 6 ++--- tools/gen-wire-tests/main.go | 25 ++++++++++--------- 31 files changed, 82 insertions(+), 81 deletions(-) diff --git a/jobs/ci-run/integration/gen/test-actions.yml b/jobs/ci-run/integration/gen/test-actions.yml index 91635e8..7eb3189 100644 --- a/jobs/ci-run/integration/gen/test-actions.yml +++ b/jobs/ci-run/integration/gen/test-actions.yml @@ -314,7 +314,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-agents.yml b/jobs/ci-run/integration/gen/test-agents.yml index f867327..e195ecf 100644 --- a/jobs/ci-run/integration/gen/test-agents.yml +++ b/jobs/ci-run/integration/gen/test-agents.yml @@ -148,7 +148,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-appdata.yml b/jobs/ci-run/integration/gen/test-appdata.yml index 3998ce1..1deb3fb 100644 --- a/jobs/ci-run/integration/gen/test-appdata.yml +++ b/jobs/ci-run/integration/gen/test-appdata.yml @@ -148,7 +148,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-backup.yml b/jobs/ci-run/integration/gen/test-backup.yml index 40241e0..59f8515 100644 --- a/jobs/ci-run/integration/gen/test-backup.yml +++ b/jobs/ci-run/integration/gen/test-backup.yml @@ -148,7 +148,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-bootstrap.yml b/jobs/ci-run/integration/gen/test-bootstrap.yml index 4e1c427..b7a81ce 100644 --- a/jobs/ci-run/integration/gen/test-bootstrap.yml +++ b/jobs/ci-run/integration/gen/test-bootstrap.yml @@ -74,7 +74,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-branches.yml b/jobs/ci-run/integration/gen/test-branches.yml index 15da3ee..aac0e07 100644 --- a/jobs/ci-run/integration/gen/test-branches.yml +++ b/jobs/ci-run/integration/gen/test-branches.yml @@ -152,7 +152,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -292,7 +292,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-charmhub.yml b/jobs/ci-run/integration/gen/test-charmhub.yml index 09c541c..038ff3f 100644 --- a/jobs/ci-run/integration/gen/test-charmhub.yml +++ b/jobs/ci-run/integration/gen/test-charmhub.yml @@ -156,7 +156,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -296,7 +296,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -436,7 +436,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-cli.yml b/jobs/ci-run/integration/gen/test-cli.yml index 2cf4a20..9b86b81 100644 --- a/jobs/ci-run/integration/gen/test-cli.yml +++ b/jobs/ci-run/integration/gen/test-cli.yml @@ -86,7 +86,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -154,7 +154,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -222,7 +222,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -290,7 +290,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -358,7 +358,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -426,7 +426,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -494,7 +494,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-cmr.yml b/jobs/ci-run/integration/gen/test-cmr.yml index 35bc1fa..4075dc1 100644 --- a/jobs/ci-run/integration/gen/test-cmr.yml +++ b/jobs/ci-run/integration/gen/test-cmr.yml @@ -148,7 +148,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-constraints.yml b/jobs/ci-run/integration/gen/test-constraints.yml index 660872b..da1d100 100644 --- a/jobs/ci-run/integration/gen/test-constraints.yml +++ b/jobs/ci-run/integration/gen/test-constraints.yml @@ -148,7 +148,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-controller.yml b/jobs/ci-run/integration/gen/test-controller.yml index 01ed26f..182f92f 100644 --- a/jobs/ci-run/integration/gen/test-controller.yml +++ b/jobs/ci-run/integration/gen/test-controller.yml @@ -160,7 +160,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -300,7 +300,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -440,7 +440,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -586,7 +586,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-controllercharm.yml b/jobs/ci-run/integration/gen/test-controllercharm.yml index 5b68663..95b8283 100644 --- a/jobs/ci-run/integration/gen/test-controllercharm.yml +++ b/jobs/ci-run/integration/gen/test-controllercharm.yml @@ -76,7 +76,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-credential.yml b/jobs/ci-run/integration/gen/test-credential.yml index 25cbd08..8670c1b 100644 --- a/jobs/ci-run/integration/gen/test-credential.yml +++ b/jobs/ci-run/integration/gen/test-credential.yml @@ -152,7 +152,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -292,7 +292,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-dashboard.yml b/jobs/ci-run/integration/gen/test-dashboard.yml index 212f67a..51c3ef0 100644 --- a/jobs/ci-run/integration/gen/test-dashboard.yml +++ b/jobs/ci-run/integration/gen/test-dashboard.yml @@ -314,7 +314,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-deploy.yml b/jobs/ci-run/integration/gen/test-deploy.yml index ebb0083..aa6564e 100644 --- a/jobs/ci-run/integration/gen/test-deploy.yml +++ b/jobs/ci-run/integration/gen/test-deploy.yml @@ -164,7 +164,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -304,7 +304,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -444,7 +444,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -584,7 +584,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -724,7 +724,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -864,7 +864,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-hooks.yml b/jobs/ci-run/integration/gen/test-hooks.yml index 93e9034..e60c165 100644 --- a/jobs/ci-run/integration/gen/test-hooks.yml +++ b/jobs/ci-run/integration/gen/test-hooks.yml @@ -152,7 +152,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -292,7 +292,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-hooktools.yml b/jobs/ci-run/integration/gen/test-hooktools.yml index 62ded65..721b33f 100644 --- a/jobs/ci-run/integration/gen/test-hooktools.yml +++ b/jobs/ci-run/integration/gen/test-hooktools.yml @@ -148,7 +148,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-machine.yml b/jobs/ci-run/integration/gen/test-machine.yml index 8476c9a..27e265b 100644 --- a/jobs/ci-run/integration/gen/test-machine.yml +++ b/jobs/ci-run/integration/gen/test-machine.yml @@ -148,7 +148,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-manual.yml b/jobs/ci-run/integration/gen/test-manual.yml index cb2f99f..3871505 100644 --- a/jobs/ci-run/integration/gen/test-manual.yml +++ b/jobs/ci-run/integration/gen/test-manual.yml @@ -152,7 +152,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -292,7 +292,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-model.yml b/jobs/ci-run/integration/gen/test-model.yml index 963ce78..25f76ce 100644 --- a/jobs/ci-run/integration/gen/test-model.yml +++ b/jobs/ci-run/integration/gen/test-model.yml @@ -258,7 +258,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -470,7 +470,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -682,7 +682,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -894,7 +894,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -1106,7 +1106,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -1318,7 +1318,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -1530,7 +1530,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -1742,7 +1742,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -1954,7 +1954,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-network.yml b/jobs/ci-run/integration/gen/test-network.yml index 7e03e9a..e928394 100644 --- a/jobs/ci-run/integration/gen/test-network.yml +++ b/jobs/ci-run/integration/gen/test-network.yml @@ -296,7 +296,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-refresh.yml b/jobs/ci-run/integration/gen/test-refresh.yml index a053191..df661ec 100644 --- a/jobs/ci-run/integration/gen/test-refresh.yml +++ b/jobs/ci-run/integration/gen/test-refresh.yml @@ -152,7 +152,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -292,7 +292,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-relations.yml b/jobs/ci-run/integration/gen/test-relations.yml index d56dce0..7f0e047 100644 --- a/jobs/ci-run/integration/gen/test-relations.yml +++ b/jobs/ci-run/integration/gen/test-relations.yml @@ -156,7 +156,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -296,7 +296,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -436,7 +436,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-resources.yml b/jobs/ci-run/integration/gen/test-resources.yml index 15a1ed6..3c58433 100644 --- a/jobs/ci-run/integration/gen/test-resources.yml +++ b/jobs/ci-run/integration/gen/test-resources.yml @@ -152,7 +152,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -292,7 +292,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-secrets_iaas.yml b/jobs/ci-run/integration/gen/test-secrets_iaas.yml index 3d4d090..7514404 100644 --- a/jobs/ci-run/integration/gen/test-secrets_iaas.yml +++ b/jobs/ci-run/integration/gen/test-secrets_iaas.yml @@ -82,7 +82,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -156,7 +156,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -230,7 +230,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -304,7 +304,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -378,7 +378,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-smoke.yml b/jobs/ci-run/integration/gen/test-smoke.yml index 1c3cb54..b227f92 100644 --- a/jobs/ci-run/integration/gen/test-smoke.yml +++ b/jobs/ci-run/integration/gen/test-smoke.yml @@ -152,7 +152,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -292,7 +292,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-unit.yml b/jobs/ci-run/integration/gen/test-unit.yml index f19e87b..47564d8 100644 --- a/jobs/ci-run/integration/gen/test-unit.yml +++ b/jobs/ci-run/integration/gen/test-unit.yml @@ -148,7 +148,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-upgrade.yml b/jobs/ci-run/integration/gen/test-upgrade.yml index 5a223fb..1a623ce 100644 --- a/jobs/ci-run/integration/gen/test-upgrade.yml +++ b/jobs/ci-run/integration/gen/test-upgrade.yml @@ -74,7 +74,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-upgrade_series.yml b/jobs/ci-run/integration/gen/test-upgrade_series.yml index b44d36a..f720163 100644 --- a/jobs/ci-run/integration/gen/test-upgrade_series.yml +++ b/jobs/ci-run/integration/gen/test-upgrade_series.yml @@ -74,7 +74,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/jobs/ci-run/integration/gen/test-user.yml b/jobs/ci-run/integration/gen/test-user.yml index 331d098..c223f3b 100644 --- a/jobs/ci-run/integration/gen/test-user.yml +++ b/jobs/ci-run/integration/gen/test-user.yml @@ -156,7 +156,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -296,7 +296,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: @@ -436,7 +436,7 @@ - s390x - ppc64el - string: - default: 'lxd' + default: 'localhost' description: 'Cloud to use when bootstrapping Juju' name: BOOTSTRAP_CLOUD - string: diff --git a/tools/gen-wire-tests/main.go b/tools/gen-wire-tests/main.go index 8c69830..d65ecc9 100644 --- a/tools/gen-wire-tests/main.go +++ b/tools/gen-wire-tests/main.go @@ -45,17 +45,18 @@ type Task struct { } type Cloud struct { + Name string CloudName string ProviderName string Region string } var ( - lxd = Cloud{CloudName: "lxd", ProviderName: "lxd"} - aws = Cloud{CloudName: "aws", ProviderName: "ec2", Region: "us-east-1"} - google = Cloud{CloudName: "google", ProviderName: "gce", Region: "us-east1"} - azure = Cloud{CloudName: "azure", ProviderName: "azure", Region: "eastus"} - microk8s = Cloud{CloudName: "microk8s", ProviderName: "k8s"} + lxd = Cloud{Name: "lxd", CloudName: "localhost", ProviderName: "lxd"} + aws = Cloud{Name: "aws", CloudName: "aws", ProviderName: "ec2", Region: "us-east-1"} + google = Cloud{Name: "google", CloudName: "google", ProviderName: "gce", Region: "us-east1"} + azure = Cloud{Name: "azure", CloudName: "azure", ProviderName: "azure", Region: "eastus"} + microk8s = Cloud{Name: "microk8s", CloudName: "microk8s", ProviderName: "k8s"} ) // minVersionRegex is a map from relevant minor semantic version releases @@ -460,10 +461,10 @@ const Template = ` projects: {{- range $k, $skip_tasks := $node.SkipTasks}} {{- range $cloud := $node.Clouds}} - {{- $unstableTasks := index $node.UnstableTasks $cloud.CloudName -}} + {{- $unstableTasks := index $node.UnstableTasks $cloud.Name -}} {{- $task_name := index $node.TaskNames $k -}} {{- if eq (contains $unstableTasks $task_name) $node.Unstable}} - - name: 'test-{{$.SuiteName}}-{{ensureHyphen $task_name}}-{{$cloud.CloudName}}' + - name: 'test-{{$.SuiteName}}-{{ensureHyphen $task_name}}-{{$cloud.Name}}' current-parameters: true {{- end -}} {{- end}} @@ -472,9 +473,9 @@ const Template = ` {{- range $k, $skip_tasks := $node.SkipTasks -}} {{- range $cloud := $node.Clouds -}} {{- $task_name := "" -}} - {{- $test_name := (printf "%s-%s" $.SuiteName $cloud.CloudName) -}} + {{- $test_name := (printf "%s-%s" $.SuiteName $cloud.Name) -}} {{- $task_name = index $node.TaskNames $k -}} - {{- $full_task_name := (printf "test-%s-%s-%s" $.SuiteName (ensureHyphen $task_name) $cloud.CloudName) -}} + {{- $full_task_name := (printf "test-%s-%s-%s" $.SuiteName (ensureHyphen $task_name) $cloud.Name) -}} {{- $builder := "run-integration-test" -}} {{- $run_on := "ephemeral-focal-small-amd64" -}} @@ -482,7 +483,7 @@ const Template = ` {{- $builder = "run-integration-test" -}} {{- $run_on = "ephemeral-focal-8c-32g-amd64" -}} {{- end }} - {{- if or (eq (index $node.CrossCloud $test_name) true) (eq $cloud.CloudName "microk8s") }} + {{- if or (eq (index $node.CrossCloud $test_name) true) (eq $cloud.Name "microk8s") }} {{- $builder = "run-integration-test-microk8s" -}} {{- $run_on = "ephemeral-focal-8c-32g-amd64" -}} {{- end }} @@ -494,9 +495,9 @@ const Template = ` node: {{$run_on}} description: |- {{- if eq (len $node.SkipTasks) 1 }} - Test {{$.SuiteName}} suite on {{$cloud.CloudName}} + Test {{$.SuiteName}} suite on {{$cloud.Name}} {{ else }} - Test {{$task_name}} in {{$.SuiteName}} suite on {{$cloud.CloudName}} + Test {{$task_name}} in {{$.SuiteName}} suite on {{$cloud.Name}} {{ end -}} parameters: - validating-string: