tests: use consistent order for subiquity cmdlines
In order we place: * the arguments that are for client & server * the arguments for the client only * the arguments for the server only Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
This commit is contained in:
parent
5d3e0b4675
commit
fdd3ffdfa8
|
@ -155,13 +155,13 @@ for answers in examples/answers*.yaml; do
|
||||||
# The --foreground is important to avoid subiquity getting SIGTTOU-ed.
|
# The --foreground is important to avoid subiquity getting SIGTTOU-ed.
|
||||||
LANG=C.UTF-8 timeout --foreground 60 \
|
LANG=C.UTF-8 timeout --foreground 60 \
|
||||||
python3 -m subiquity.cmd.tui < "$tty" \
|
python3 -m subiquity.cmd.tui < "$tty" \
|
||||||
--bootloader uefi \
|
|
||||||
--answers "$answers" \
|
|
||||||
--dry-run \
|
--dry-run \
|
||||||
--snaps-from-examples \
|
|
||||||
--machine-config "$config" \
|
|
||||||
--output-base "$tmpdir" \
|
--output-base "$tmpdir" \
|
||||||
"${opts[@]}"
|
--answers "$answers" \
|
||||||
|
"${opts[@]}" \
|
||||||
|
--machine-config "$config" \
|
||||||
|
--bootloader uefi \
|
||||||
|
--snaps-from-examples
|
||||||
validate
|
validate
|
||||||
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
|
||||||
else
|
else
|
||||||
|
@ -176,9 +176,9 @@ for answers in examples/answers*.yaml; do
|
||||||
fi
|
fi
|
||||||
DRYRUN_RECONFIG="$reconf_settings" LANG=C.UTF-8 timeout --foreground 60 \
|
DRYRUN_RECONFIG="$reconf_settings" LANG=C.UTF-8 timeout --foreground 60 \
|
||||||
python3 -m system_setup.cmd.tui < "$tty" \
|
python3 -m system_setup.cmd.tui < "$tty" \
|
||||||
|
--dry-run \
|
||||||
--answers "$answers" \
|
--answers "$answers" \
|
||||||
--output-base "$tmpdir" \
|
--output-base "$tmpdir"
|
||||||
--dry-run
|
|
||||||
validate "system_setup" "$validate_subtype"
|
validate "system_setup" "$validate_subtype"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -187,13 +187,13 @@ done
|
||||||
|
|
||||||
LANG=C.UTF-8 timeout --foreground 60 \
|
LANG=C.UTF-8 timeout --foreground 60 \
|
||||||
python3 -m subiquity.cmd.tui \
|
python3 -m subiquity.cmd.tui \
|
||||||
--autoinstall examples/autoinstall.yaml \
|
|
||||||
--dry-run \
|
--dry-run \
|
||||||
|
--output-base "$tmpdir" \
|
||||||
--machine-config examples/existing-partitions.json \
|
--machine-config examples/existing-partitions.json \
|
||||||
--bootloader bios \
|
--bootloader bios \
|
||||||
|
--autoinstall examples/autoinstall.yaml \
|
||||||
--kernel-cmdline autoinstall \
|
--kernel-cmdline autoinstall \
|
||||||
--output-base "$tmpdir" \
|
--source-catalog examples/install-sources.yaml
|
||||||
--source-catalog=examples/install-sources.yaml
|
|
||||||
validate
|
validate
|
||||||
python3 scripts/check-yaml-fields.py $tmpdir/var/log/installer/subiquity-curtin-apt.conf \
|
python3 scripts/check-yaml-fields.py $tmpdir/var/log/installer/subiquity-curtin-apt.conf \
|
||||||
apt.disable_components='[non-free, restricted]' \
|
apt.disable_components='[non-free, restricted]' \
|
||||||
|
@ -220,10 +220,10 @@ grep -q 'finish: subiquity/Install/install/postinstall/run_unattended_upgrades:
|
||||||
clean
|
clean
|
||||||
LANG=C.UTF-8 timeout --foreground 60 \
|
LANG=C.UTF-8 timeout --foreground 60 \
|
||||||
python3 -m subiquity.cmd.tui \
|
python3 -m subiquity.cmd.tui \
|
||||||
--autoinstall examples/autoinstall-user-data.yaml \
|
|
||||||
--output-base "$tmpdir" \
|
|
||||||
--dry-run \
|
--dry-run \
|
||||||
|
--output-base "$tmpdir" \
|
||||||
--machine-config examples/simple.json \
|
--machine-config examples/simple.json \
|
||||||
|
--autoinstall examples/autoinstall-user-data.yaml \
|
||||||
--kernel-cmdline autoinstall
|
--kernel-cmdline autoinstall
|
||||||
validate
|
validate
|
||||||
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
|
||||||
|
@ -234,9 +234,9 @@ if [ "${RELEASE%.*}" -ge 20 ]; then
|
||||||
clean
|
clean
|
||||||
LANG=C.UTF-8 timeout --foreground 60 \
|
LANG=C.UTF-8 timeout --foreground 60 \
|
||||||
python3 -m system_setup.cmd.tui \
|
python3 -m system_setup.cmd.tui \
|
||||||
--autoinstall "examples/autoinstall-system-setup${mode}.yaml" \
|
--dry-run \
|
||||||
--output-base "$tmpdir" \
|
--output-base "$tmpdir" \
|
||||||
--dry-run
|
--autoinstall "examples/autoinstall-system-setup${mode}.yaml"
|
||||||
validate "system_setup" "autoinstall${mode}"
|
validate "system_setup" "autoinstall${mode}"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue