test/cases: start to unify boot tests with other image tests

We now have three top-level maps, that can be combined in any way:

boot-test: information about how to boot the image
compose: information about how to generate the pipeline
pipeline: the pipeline to generate the image
expected: the expected image-info

This creates compose entries for all the boot tests, but the blueprints
are named 'blueprint-draft', as we are not yet verifynig that the pipeline
is correct.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2019-12-07 17:55:51 +01:00 committed by Lars Karlitski
parent 49387604e4
commit 4ec7ac1ecd
9 changed files with 38 additions and 17 deletions

View file

@ -1,9 +1,12 @@
{
"boot-test": {
"type": "qemu"
},
"compose": {
"distro": "fedora-30",
"output-format": "ami",
"filename": "image.raw.xz",
"boot-type": "qemu",
"blueprint": {
"blueprint-draft": {
"name": "ami-boot-test",
"description": "Image for boot test",
"packages": [],

View file

@ -1,9 +1,12 @@
{
"boot-test": {
"type": "nspawn"
},
"compose": {
"distro": "fedora-30",
"output-format": "partitioned-disk",
"filename": "disk.img",
"boot-type": "nspawn",
"blueprint": {
"blueprint-draft": {
"name": "partitioned-disk-boot-test",
"description": "Image for boot test",
"packages": [],

View file

@ -1,9 +1,12 @@
{
"boot-test": {
"type": "nspawn"
},
"compose": {
"distro": "fedora-30",
"output-format": "ext4",
"filename": "filesystem.img",
"boot-type": "nspawn",
"blueprint": {
"blueprint-draft": {
"name": "ext4-boot-test",
"description": "Image for boot test",
"packages": [],

View file

@ -1,9 +1,12 @@
{
"boot-test": {
"type": "qemu"
},
"compose": {
"distro": "fedora-30",
"output-format": "openstack",
"filename": "image.qcow2",
"boot-type": "qemu",
"blueprint": {
"blueprint-draft": {
"name": "openstack-boot-test",
"description": "Image for boot test",
"packages": [],

View file

@ -1,9 +1,12 @@
{
"boot-test": {
"type": "qemu"
},
"compose": {
"distro": "fedora-30",
"output-format": "qcow2",
"filename": "image.qcow2",
"boot-type": "qemu",
"blueprint": {
"blueprint-draft": {
"name": "qcow2-boot-test",
"description": "Image for boot test",
"packages": [],

View file

@ -1,9 +1,11 @@
{
"boot-test": {
"type": "nspawn-extract"
},
"compose": {
"output-format": "tar",
"filename": "root.tar.xz",
"boot-type": "nspawn-extract",
"blueprint": {
"blueprint-draft": {
"name": "tar-boot-test",
"description": "Image for boot test",
"packages": [],

View file

@ -1,9 +1,11 @@
{
"boot-test": {
"type": "qemu"
},
"compose": {
"output-format": "vhd",
"filename": "image.vhd",
"boot-type": "qemu",
"blueprint": {
"blueprint-draft": {
"name": "vhd-boot-test",
"description": "Image for boot test",
"packages": [],

View file

@ -1,9 +1,11 @@
{
"boot-test": {
"type": "qemu"
},
"compose": {
"output-format": "vmdk",
"filename": "disk.vmdk",
"boot-type": "qemu",
"blueprint": {
"blueprint-draft": {
"name": "vmdk-boot-test",
"description": "Image for boot test",
"packages": [],

View file

@ -194,7 +194,7 @@ def get_local_boot_test_case(fname: str) -> Union[Tuple[str, str, Dict[Any, Any]
return None
pipeline_dict = test_case_dict["pipeline"]
return test_case_dict["boot-test"]["boot-type"], test_case_dict["boot-test"]["filename"], pipeline_dict
return test_case_dict["boot-test"]["type"], test_case_dict["compose"]["filename"], pipeline_dict
def run_ssh_test(private_key):