Some image type test cases require additional repositories, which are not available for all architectures. However, when an image type test case is specified in the `format-request-map.json`, it is generated on any architecture. This behavior is creating issues when generating `*edge-commit` image type test cases. This is because the `format-request-map.json` contains one additional definition for `*edge-commit-rt`, which includes `kernel-rt` package. However repositories with this package are available only for x86_64. Therefore, when generating image test cases for `*edge-commit`, the `generate-test-cases` script always generates two test cases, but the generation of `*edge-commit-rt` always fails on non-x86_64 architectures. Add a new optional member to the image type test case object in `format-request-map.json`, called `supported_arches`. Its value is a list of strings, specifying the supported architectures of the image type test case. In case the member is not specified, the image test case is supported on any architecture. Extend the `generate-test-cases` script to skip image type test case generation in case the case has the `supported_arches` specified and the requested architecture is not in the list. Fix #1478 Signed-off-by: Tomas Hozza <thozza@redhat.com>
384 lines
12 KiB
JSON
384 lines
12 KiB
JSON
{
|
|
"ami": {
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "ami",
|
|
"repositories": [],
|
|
"filename": "image.raw",
|
|
"blueprint": {}
|
|
},
|
|
"overrides": {}
|
|
},
|
|
"ec2": {
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "ec2",
|
|
"repositories": [],
|
|
"filename": "image.raw.xz",
|
|
"blueprint": {}
|
|
},
|
|
"overrides": {}
|
|
},
|
|
"ec2-ha": {
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "ec2-ha",
|
|
"repositories": [],
|
|
"filename": "image.raw.xz",
|
|
"blueprint": {}
|
|
},
|
|
"overrides": {}
|
|
},
|
|
"edge-commit": {
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "edge-commit",
|
|
"repositories": [],
|
|
"filename": "commit.tar",
|
|
"blueprint": {}
|
|
},
|
|
"overrides": {}
|
|
},
|
|
"edge-container": {
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "edge-container",
|
|
"repositories": [],
|
|
"filename": "container.tar",
|
|
"blueprint": {}
|
|
},
|
|
"overrides": {}
|
|
},
|
|
"edge-commit-rt": {
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "edge-commit",
|
|
"repositories": [],
|
|
"filename": "commit.tar",
|
|
"blueprint": {
|
|
"customizations": {
|
|
"kernel": {
|
|
"name": "kernel-rt"
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"overrides": {},
|
|
"supported_arches": ["x86_64"]
|
|
},
|
|
"rhel-edge-commit": {
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "rhel-edge-commit",
|
|
"repositories": [],
|
|
"filename": "commit.tar",
|
|
"blueprint": {}
|
|
},
|
|
"overrides": {}
|
|
},
|
|
"rhel-edge-container": {
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "rhel-edge-container",
|
|
"repositories": [],
|
|
"filename": "rhel84-container.tar",
|
|
"blueprint": {}
|
|
},
|
|
"overrides": {}
|
|
},
|
|
"rhel-edge-commit-rt": {
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "rhel-edge-commit",
|
|
"repositories": [],
|
|
"filename": "commit.tar",
|
|
"blueprint": {
|
|
"customizations": {
|
|
"kernel": {
|
|
"name": "kernel-rt"
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"overrides": {},
|
|
"supported_arches": ["x86_64"]
|
|
},
|
|
"fedora-iot-commit": {
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "fedora-iot-commit",
|
|
"repositories": [],
|
|
"filename": "commit.tar",
|
|
"blueprint": {}
|
|
},
|
|
"overrides": {}
|
|
},
|
|
"fedora-iot-commit-debug": {
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "fedora-iot-commit",
|
|
"repositories": [],
|
|
"filename": "commit.tar",
|
|
"blueprint": {
|
|
"customizations": {
|
|
"kernel": {
|
|
"name": "kernel-debug"
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"overrides": {}
|
|
},
|
|
"openstack": {
|
|
"boot": {
|
|
"type": "openstack"
|
|
},
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "openstack",
|
|
"repositories": [],
|
|
"filename": "disk.qcow2",
|
|
"blueprint": {
|
|
"name": "openstack-boot-test",
|
|
"description": "Image for boot test",
|
|
"packages": [],
|
|
"modules": [],
|
|
"groups": [],
|
|
"customizations": {
|
|
"user": [
|
|
{
|
|
"name": "redhat",
|
|
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
},
|
|
"overrides": {
|
|
"rhel-8": {
|
|
"blueprint": {
|
|
"name": "openstack-boot-test",
|
|
"description": "Image for boot test",
|
|
"packages": [],
|
|
"modules": [],
|
|
"groups": [],
|
|
"customizations": {
|
|
"user": [
|
|
{
|
|
"name": "redhat",
|
|
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"tar": {
|
|
"boot": {
|
|
"type": "nspawn-extract"
|
|
},
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "tar",
|
|
"repositories": [],
|
|
"filename": "root.tar.xz",
|
|
"blueprint": {
|
|
"name": "tar-boot-test",
|
|
"description": "Image for boot test",
|
|
"packages": [
|
|
{
|
|
"name": "openssh-server",
|
|
"version": "*"
|
|
}
|
|
],
|
|
"modules": [],
|
|
"groups": [],
|
|
"customizations": {
|
|
"user": [
|
|
{
|
|
"name": "redhat",
|
|
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
},
|
|
"overrides": {
|
|
"rhel-8": {
|
|
"blueprint": {
|
|
"name": "tar-boot-test",
|
|
"description": "Image for boot test",
|
|
"packages": [
|
|
{
|
|
"name": "openssh-server",
|
|
"version": "*"
|
|
}
|
|
],
|
|
"modules": [],
|
|
"groups": [],
|
|
"customizations": {
|
|
"user": [
|
|
{
|
|
"name": "redhat",
|
|
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"image-installer": {
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "image-installer",
|
|
"repositories": [],
|
|
"filename": "installer.iso",
|
|
"blueprint": {}
|
|
},
|
|
"overrides": {}
|
|
},
|
|
"qcow2": {
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "qcow2",
|
|
"repositories": [],
|
|
"filename": "disk.qcow2",
|
|
"blueprint": {
|
|
"name": "qcow2-boot-test",
|
|
"description": "Image for boot test",
|
|
"packages": [],
|
|
"modules": [],
|
|
"groups": [],
|
|
"customizations": {
|
|
"user": [
|
|
{
|
|
"name": "redhat",
|
|
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
},
|
|
"overrides": {
|
|
"rhel-8": {
|
|
"blueprint": {
|
|
"name": "qcow2-boot-test",
|
|
"description": "Image for boot test",
|
|
"packages": [],
|
|
"modules": [],
|
|
"groups": [],
|
|
"customizations": {
|
|
"user": [
|
|
{
|
|
"name": "redhat",
|
|
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"vhd": {
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "vhd",
|
|
"repositories": [],
|
|
"filename": "disk.vhd",
|
|
"blueprint": {
|
|
"name": "vhd-boot-test",
|
|
"description": "Image for boot test",
|
|
"packages": [],
|
|
"modules": [],
|
|
"groups": [],
|
|
"customizations": {
|
|
"user": [
|
|
{
|
|
"name": "redhat",
|
|
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
},
|
|
"overrides": {
|
|
"rhel-8": {
|
|
"blueprint": {
|
|
"name": "vhd-boot-test",
|
|
"description": "Image for boot test",
|
|
"packages": [],
|
|
"modules": [],
|
|
"groups": [],
|
|
"customizations": {
|
|
"user": [
|
|
{
|
|
"name": "redhat",
|
|
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"vmdk": {
|
|
"compose-request": {
|
|
"distro": "",
|
|
"arch": "",
|
|
"image-type": "vmdk",
|
|
"filename": "disk.vmdk",
|
|
"blueprint": {
|
|
"name": "vmdk-boot-test",
|
|
"description": "Image for boot test",
|
|
"packages": [],
|
|
"modules": [],
|
|
"groups": [],
|
|
"customizations": {
|
|
"user": [
|
|
{
|
|
"name": "redhat",
|
|
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
},
|
|
"overrides": {
|
|
"rhel-8": {
|
|
"blueprint": {
|
|
"name": "vhd-boot-test",
|
|
"description": "Image for boot test",
|
|
"packages": [],
|
|
"modules": [],
|
|
"groups": [],
|
|
"customizations": {
|
|
"user": [
|
|
{
|
|
"name": "redhat",
|
|
"key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
|
|
}
|
|
]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|