Commit3bb033f

authored

Merge pull request#20668 from adisazhar123/follow-up-fix-ci-tests

test: update juju-qa-bundle-test and pin ubuntu base

2 parents16001f4 +422d58d commit3bb033fCopy full SHA for 3bb033f

File tree

+21

-20

lines changed

+21

-20

lines changed

Lines changed: 18 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,37 +1,38 @@`
`1`	`1`	`name:juju-qa-bundle-test`
`2`		`-series:jammy`
	`2`	`+default-base:ubuntu@22.04`
`3`	`3`	`applications:`
`4`	`4`	`juju-qa-test:`
`5`	`5`	`charm:juju-qa-test`
`6`	`6`	`channel:2.0/stable`
`7`	`7`	`num_units:1`
`8`	`8`	`to:`
`9`		`- -"0"`
	`9`	`+-"0"`
`10`	`10`	`constraints:arch=amd64`
`11`	`11`	`juju-qa-test-focal:`
`12`	`12`	`charm:juju-qa-test`
`13`	`13`	`channel:latest/candidate`
`14`	`14`	`num_units:1`
`15`		`-series:focal`
	`15`	`+base:ubuntu@20.04`
`16`	`16`	`to:`
`17`		`- -"1"`
	`17`	`+-"1"`
`18`	`18`	`constraints:arch=amd64`
`19`		`-ntp:`
`20`		`-charm:ntp`
`21`		`-channel:stable`
`22`		`-ntp-focal:`
`23`		`-charm:ntp`
`24`		`-channel:stable`
`25`		`-series:focal`
	`19`	`+dummy-subordinate:`
	`20`	`+charm:juju-qa-dummy-subordinate`
	`21`	`+options:`
	`22`	`+token:token`
	`23`	`+dummy-subordinate-focal:`
	`24`	`+charm:juju-qa-dummy-subordinate`
	`25`	`+base:ubuntu@20.04`
	`26`	`+options:`
	`27`	`+token:token`
`26`	`28`	`machines:`
`27`	`29`	`"0":`
`28`	`30`	`constraints:arch=amd64`
`29`		`-series:jammy`
`30`	`31`	`"1":`
`31`	`32`	`constraints:arch=amd64`
`32`		`-series:focal`
	`33`	`+base:ubuntu@20.04`
`33`	`34`	`relations:`
`34`		`---ntp:juju-info`
`35`		`- -juju-qa-test:juju-info`
`36`		`---ntp-focal:juju-info`
`37`		`- -juju-qa-test-focal:juju-info`
	`35`	`+--dummy-subordinate:juju-info`
	`36`	`+-juju-qa-test:juju-info`
	`37`	`+--dummy-subordinate-focal:juju-info`
	`38`	`+-juju-qa-test-focal:juju-info`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ run_reboot_monitor_state_cleanup() {`
`83`	`83`	`ensure"${model_name}""${file}"`
`84`	`84`
`85`	`85`	`juju deploy juju-qa-test --base ubuntu@22.04`
`86`		`-juju deploy juju-qa-dummy-subordinate`
	`86`	`+juju deploy juju-qa-dummy-subordinate --base ubuntu@22.04`
`87`	`87`	`juju config dummy-subordinate token=becomegreen`
`88`	`88`	`juju integrate juju-qa-test:juju-info dummy-subordinate:juju-info`
`89`	`89`	`wait_for"juju-qa-test""$(idle_condition"juju-qa-test" 1)"`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ run_model_metrics() {`
`10`	`10`
`11`	`11`	`# Deploy ubuntu with a different name, check that the metric send the charm name, not the application name.`
`12`	`12`	`juju deploy ubuntu app-one --base ubuntu@22.04`
`13`		`-juju deploy juju-qa-test`
`14`		`-juju deploy juju-qa-dummy-subordinate`
	`13`	`+juju deploy juju-qa-test --base ubuntu@22.04`
	`14`	`+juju deploy juju-qa-dummy-subordinate --base ubuntu@22.04`
`15`	`15`	`juju config dummy-subordinate token=becomegreen`
`16`	`16`	`juju relate dummy-subordinate app-one`
`17`	`17`

Comments

(0)