Temp disable schema check on Impish (#1000)
Impish is adding more timezones, which is cool, but breaks my schema check, so disable this there for now and come back later with a better answer. Also schema check seems to need curtin.
This commit is contained in:
parent
40945f1823
commit
502c1193fd
2
Makefile
2
Makefile
|
@ -68,7 +68,7 @@ probert: snapcraft.yaml
|
|||
|
||||
gitdeps: curtin probert
|
||||
|
||||
schema: probert
|
||||
schema: gitdeps
|
||||
@$(PYTHON) -m subiquity.cmd.schema > autoinstall-schema.json
|
||||
|
||||
clean:
|
||||
|
|
|
@ -71,8 +71,15 @@ timeout --foreground 60 sh -c "LANG=C.UTF-8 python3 -m subiquity.cmd.tui --autoi
|
|||
validate
|
||||
grep -q 'finish: subiquity/Install/install/postinstall/run_unattended_upgrades: SUCCESS: downloading and installing security updates' .subiquity/subiquity-server-debug.log
|
||||
|
||||
# Limit schema check to Focal+ - the timezone list on bionic is different
|
||||
if (( $(echo "$(lsb_release -sr) >= 20.04" | bc -l) )); then
|
||||
python3 -m subiquity.cmd.schema > "$testschema"
|
||||
diff -u "autoinstall-schema.json" "$testschema"
|
||||
fi
|
||||
case "$(lsb_release -sr)" in
|
||||
# Limit schema check to Focal+ - the timezone list on bionic is different
|
||||
# And Impish adds more ...
|
||||
# Temporarily disable on Impish until a better answer is available
|
||||
"20.04"|"20.10"|"21.04")
|
||||
python3 -m subiquity.cmd.schema > "$testschema"
|
||||
diff -u "autoinstall-schema.json" "$testschema"
|
||||
;;
|
||||
esac
|
||||
|
||||
# if (( $(echo "$(lsb_release -sr) >= 20.04" | bc -l) )); then
|
||||
# fi
|
||||
|
|
Loading…
Reference in New Issue