almalinux/lorax
12
0
Fork 0
Code Issues Pull Requests Releases Activity

lorax-composer: Enable ami on aarch64

Browse Source
This commit is contained in:
Brian C. Lane 2020-01-09 14:19:44 -08:00
parent 350baad384
commit b69e6d725d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pylorax/api/compose.py
View File

@ -877,7 +877,7 @@ def compose_types(share_dir):
disable_map = {
"arm": ["alibaba", "ami", "google", "hyper-v", "vhd", "vmdk"],
"armhfp": ["alibaba", "ami", "google", "hyper-v", "vhd", "vmdk"],
"aarch64": ["alibaba", "ami", "google", "hyper-v", "vhd", "vmdk"],
"aarch64": ["alibaba", "google", "hyper-v", "vhd", "vmdk"],
"ppc": ["alibaba", "ami", "google", "hyper-v", "vhd", "vmdk"],
"ppc64": ["alibaba", "ami", "google", "hyper-v", "vhd", "vmdk"],
"ppc64le": ["alibaba", "ami", "google", "hyper-v", "vhd", "vmdk"],

4
tests/cli/test_compose_sanity.sh
View File

@ -14,6 +14,10 @@ rlJournalStart
if [ "$(uname -m)" == "x86_64" ]; then
rlAssertEquals "lists all supported types" \
"`$CLI compose types | xargs`" "alibaba ami ext4-filesystem google hyper-v live-iso liveimg-tar openstack partitioned-disk qcow2 tar vhd vmdk"
elif [ "$(uname -m)" == "aarch64" ]; then
# ami is supported on aarch64
rlAssertEquals "lists all supported types" \
"`$CLI compose types | xargs`" "ami ext4-filesystem live-iso liveimg-tar openstack partitioned-disk qcow2 tar"
else
# non-x86 architectures disable alibaba
rlAssertEquals "lists all supported types" \