Merge pull request #1992 from mwhudson/rename-core-integration-test
rename "core" examples to "core-desktop"
This commit is contained in:
commit
b2e9393ddb
|
@ -1,4 +1,4 @@
|
||||||
#source-catalog: examples/sources/core.yaml
|
#source-catalog: examples/sources/core-desktop.yaml
|
||||||
Source:
|
Source:
|
||||||
source: ubuntu-core
|
source: ubuntu-core
|
||||||
Welcome:
|
Welcome:
|
|
@ -39,7 +39,7 @@ validate () {
|
||||||
autoinstall-reset-only)
|
autoinstall-reset-only)
|
||||||
python3 scripts/validate-yaml.py --no-root-mount "${cfgs[@]}"
|
python3 scripts/validate-yaml.py --no-root-mount "${cfgs[@]}"
|
||||||
;;
|
;;
|
||||||
answers-core)
|
answers-core-desktop)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
python3 scripts/validate-yaml.py "${cfgs[@]}"
|
python3 scripts/validate-yaml.py "${cfgs[@]}"
|
||||||
|
@ -50,7 +50,7 @@ validate () {
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
case $testname in
|
case $testname in
|
||||||
answers-core)
|
answers-core-desktop)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
python3 scripts/validate-autoinstall-user-data.py < $tmpdir/var/log/installer/autoinstall-user-data
|
python3 scripts/validate-autoinstall-user-data.py < $tmpdir/var/log/installer/autoinstall-user-data
|
||||||
|
@ -223,7 +223,7 @@ for answers in examples/answers/*.yaml; do
|
||||||
--snaps-from-examples \
|
--snaps-from-examples \
|
||||||
--source-catalog $catalog
|
--source-catalog $catalog
|
||||||
validate install
|
validate install
|
||||||
if [ $answers != examples/answers/core.yaml ]; then
|
if [ $answers != examples/answers/core-desktop.yaml ]; then
|
||||||
grep -q 'finish: subiquity/Install/install/postinstall/run_unattended_upgrades: SUCCESS: downloading and installing security updates' $tmpdir/subiquity-server-debug.log
|
grep -q 'finish: subiquity/Install/install/postinstall/run_unattended_upgrades: SUCCESS: downloading and installing security updates' $tmpdir/subiquity-server-debug.log
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue