From 167fdc44bc82744b759a059b197d4415523e83da Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Sun, 7 Mar 2021 18:01:33 +0000
Subject: [PATCH] test/data/manifests: avoid duplicate booting

We have integration tests that boot most of the image types, let
the image tests focus on the actual content of the images, shaving
off considerable CI time.

The only missing one is OpenStack (which should be ported over) and
tar (which we need to define the integration test for).

Signed-off-by: Tom Gundersen <teg@jklm.no>
---
 test/data/manifests/centos_8-x86_64-ami-boot.json    |  3 ---
 test/data/manifests/centos_8-x86_64-qcow2-boot.json  |  3 ---
 test/data/manifests/centos_8-x86_64-vhd-boot.json    |  3 ---
 test/data/manifests/centos_8-x86_64-vmdk-boot.json   |  3 ---
 test/data/manifests/fedora_32-aarch64-ami-boot.json  |  3 ---
 .../data/manifests/fedora_32-aarch64-qcow2-boot.json |  3 ---
 test/data/manifests/fedora_32-x86_64-ami-boot.json   |  3 ---
 test/data/manifests/fedora_32-x86_64-qcow2-boot.json |  3 ---
 test/data/manifests/fedora_32-x86_64-vhd-boot.json   |  3 ---
 test/data/manifests/fedora_32-x86_64-vmdk-boot.json  |  3 ---
 test/data/manifests/fedora_33-aarch64-ami-boot.json  |  3 ---
 test/data/manifests/fedora_33-x86_64-ami-boot.json   |  3 ---
 test/data/manifests/fedora_33-x86_64-qcow2-boot.json |  3 ---
 test/data/manifests/fedora_33-x86_64-vhd-boot.json   |  3 ---
 test/data/manifests/fedora_33-x86_64-vmdk-boot.json  |  3 ---
 test/data/manifests/rhel_8-aarch64-ami-boot.json     |  3 ---
 test/data/manifests/rhel_8-aarch64-qcow2-boot.json   |  3 ---
 test/data/manifests/rhel_8-ppc64le-qcow2-boot.json   |  3 ---
 test/data/manifests/rhel_8-s390x-qcow2-boot.json     |  3 ---
 test/data/manifests/rhel_8-x86_64-ami-boot.json      |  3 ---
 test/data/manifests/rhel_8-x86_64-qcow2-boot.json    |  3 ---
 test/data/manifests/rhel_8-x86_64-vhd-boot.json      |  3 ---
 test/data/manifests/rhel_8-x86_64-vmdk-boot.json     |  3 ---
 test/data/manifests/rhel_84-aarch64-ami-boot.json    |  3 ---
 test/data/manifests/rhel_84-aarch64-qcow2-boot.json  |  3 ---
 test/data/manifests/rhel_84-ppc64le-qcow2-boot.json  |  3 ---
 test/data/manifests/rhel_84-s390x-qcow2-boot.json    |  3 ---
 test/data/manifests/rhel_84-x86_64-ami-boot.json     |  3 ---
 test/data/manifests/rhel_84-x86_64-qcow2-boot.json   |  3 ---
 test/data/manifests/rhel_84-x86_64-vhd-boot.json     |  3 ---
 test/data/manifests/rhel_84-x86_64-vmdk-boot.json    |  3 ---
 tools/test-case-generators/format-request-map.json   | 12 ------------
 32 files changed, 105 deletions(-)

diff --git a/test/data/manifests/centos_8-x86_64-ami-boot.json b/test/data/manifests/centos_8-x86_64-ami-boot.json
index c87758362..be839733a 100644
--- a/test/data/manifests/centos_8-x86_64-ami-boot.json
+++ b/test/data/manifests/centos_8-x86_64-ami-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "aws"
-  },
   "compose-request": {
     "distro": "centos-8",
     "arch": "x86_64",
diff --git a/test/data/manifests/centos_8-x86_64-qcow2-boot.json b/test/data/manifests/centos_8-x86_64-qcow2-boot.json
index 471240a61..b483362ac 100644
--- a/test/data/manifests/centos_8-x86_64-qcow2-boot.json
+++ b/test/data/manifests/centos_8-x86_64-qcow2-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "qemu"
-  },
   "compose-request": {
     "distro": "centos-8",
     "arch": "x86_64",
diff --git a/test/data/manifests/centos_8-x86_64-vhd-boot.json b/test/data/manifests/centos_8-x86_64-vhd-boot.json
index ee04db489..a08d1159b 100644
--- a/test/data/manifests/centos_8-x86_64-vhd-boot.json
+++ b/test/data/manifests/centos_8-x86_64-vhd-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "azure"
-  },
   "compose-request": {
     "distro": "centos-8",
     "arch": "x86_64",
diff --git a/test/data/manifests/centos_8-x86_64-vmdk-boot.json b/test/data/manifests/centos_8-x86_64-vmdk-boot.json
index 58d71b3cb..8a75a2a0c 100644
--- a/test/data/manifests/centos_8-x86_64-vmdk-boot.json
+++ b/test/data/manifests/centos_8-x86_64-vmdk-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "qemu"
-  },
   "compose-request": {
     "distro": "centos-8",
     "arch": "x86_64",
diff --git a/test/data/manifests/fedora_32-aarch64-ami-boot.json b/test/data/manifests/fedora_32-aarch64-ami-boot.json
index f898c6f03..87d1ff38b 100644
--- a/test/data/manifests/fedora_32-aarch64-ami-boot.json
+++ b/test/data/manifests/fedora_32-aarch64-ami-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "aws"
-  },
   "compose-request": {
     "distro": "fedora-32",
     "arch": "aarch64",
diff --git a/test/data/manifests/fedora_32-aarch64-qcow2-boot.json b/test/data/manifests/fedora_32-aarch64-qcow2-boot.json
index ed109cc60..85573b56b 100644
--- a/test/data/manifests/fedora_32-aarch64-qcow2-boot.json
+++ b/test/data/manifests/fedora_32-aarch64-qcow2-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "qemu"
-  },
   "compose-request": {
     "distro": "fedora-32",
     "arch": "aarch64",
diff --git a/test/data/manifests/fedora_32-x86_64-ami-boot.json b/test/data/manifests/fedora_32-x86_64-ami-boot.json
index 3ff71a614..8648c6053 100644
--- a/test/data/manifests/fedora_32-x86_64-ami-boot.json
+++ b/test/data/manifests/fedora_32-x86_64-ami-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "aws"
-  },
   "compose-request": {
     "distro": "fedora-32",
     "arch": "x86_64",
diff --git a/test/data/manifests/fedora_32-x86_64-qcow2-boot.json b/test/data/manifests/fedora_32-x86_64-qcow2-boot.json
index 965f81b57..9d3df0fe9 100644
--- a/test/data/manifests/fedora_32-x86_64-qcow2-boot.json
+++ b/test/data/manifests/fedora_32-x86_64-qcow2-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "qemu"
-  },
   "compose-request": {
     "distro": "fedora-32",
     "arch": "x86_64",
diff --git a/test/data/manifests/fedora_32-x86_64-vhd-boot.json b/test/data/manifests/fedora_32-x86_64-vhd-boot.json
index d830c62ba..d9a190000 100644
--- a/test/data/manifests/fedora_32-x86_64-vhd-boot.json
+++ b/test/data/manifests/fedora_32-x86_64-vhd-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "azure"
-  },
   "compose-request": {
     "distro": "fedora-32",
     "arch": "x86_64",
diff --git a/test/data/manifests/fedora_32-x86_64-vmdk-boot.json b/test/data/manifests/fedora_32-x86_64-vmdk-boot.json
index e211e4723..9695f303f 100644
--- a/test/data/manifests/fedora_32-x86_64-vmdk-boot.json
+++ b/test/data/manifests/fedora_32-x86_64-vmdk-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "vmware"
-  },
   "compose-request": {
     "distro": "fedora-32",
     "arch": "x86_64",
diff --git a/test/data/manifests/fedora_33-aarch64-ami-boot.json b/test/data/manifests/fedora_33-aarch64-ami-boot.json
index 4f48f4b44..7480f406a 100644
--- a/test/data/manifests/fedora_33-aarch64-ami-boot.json
+++ b/test/data/manifests/fedora_33-aarch64-ami-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "aws"
-  },
   "compose-request": {
     "distro": "fedora-33",
     "arch": "aarch64",
diff --git a/test/data/manifests/fedora_33-x86_64-ami-boot.json b/test/data/manifests/fedora_33-x86_64-ami-boot.json
index 0c5ed7109..14c82adc0 100644
--- a/test/data/manifests/fedora_33-x86_64-ami-boot.json
+++ b/test/data/manifests/fedora_33-x86_64-ami-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "aws"
-  },
   "compose-request": {
     "distro": "fedora-33",
     "arch": "x86_64",
diff --git a/test/data/manifests/fedora_33-x86_64-qcow2-boot.json b/test/data/manifests/fedora_33-x86_64-qcow2-boot.json
index 11daac2ec..8adcdc7e2 100644
--- a/test/data/manifests/fedora_33-x86_64-qcow2-boot.json
+++ b/test/data/manifests/fedora_33-x86_64-qcow2-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "qemu"
-  },
   "compose-request": {
     "distro": "fedora-33",
     "arch": "x86_64",
diff --git a/test/data/manifests/fedora_33-x86_64-vhd-boot.json b/test/data/manifests/fedora_33-x86_64-vhd-boot.json
index 015f5a927..a3b6b2889 100644
--- a/test/data/manifests/fedora_33-x86_64-vhd-boot.json
+++ b/test/data/manifests/fedora_33-x86_64-vhd-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "azure"
-  },
   "compose-request": {
     "distro": "fedora-33",
     "arch": "x86_64",
diff --git a/test/data/manifests/fedora_33-x86_64-vmdk-boot.json b/test/data/manifests/fedora_33-x86_64-vmdk-boot.json
index eefe3bc11..03d08f2bf 100644
--- a/test/data/manifests/fedora_33-x86_64-vmdk-boot.json
+++ b/test/data/manifests/fedora_33-x86_64-vmdk-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "vmware"
-  },
   "compose-request": {
     "distro": "fedora-33",
     "arch": "x86_64",
diff --git a/test/data/manifests/rhel_8-aarch64-ami-boot.json b/test/data/manifests/rhel_8-aarch64-ami-boot.json
index f2e2f5d4c..22c9e41bc 100644
--- a/test/data/manifests/rhel_8-aarch64-ami-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-ami-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "aws"
-  },
   "compose-request": {
     "distro": "rhel-8",
     "arch": "aarch64",
diff --git a/test/data/manifests/rhel_8-aarch64-qcow2-boot.json b/test/data/manifests/rhel_8-aarch64-qcow2-boot.json
index a36af44e7..82fc79327 100644
--- a/test/data/manifests/rhel_8-aarch64-qcow2-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-qcow2-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "qemu"
-  },
   "compose-request": {
     "distro": "rhel-8",
     "arch": "aarch64",
diff --git a/test/data/manifests/rhel_8-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_8-ppc64le-qcow2-boot.json
index c5a771799..583b11917 100644
--- a/test/data/manifests/rhel_8-ppc64le-qcow2-boot.json
+++ b/test/data/manifests/rhel_8-ppc64le-qcow2-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "qemu"
-  },
   "compose-request": {
     "distro": "rhel-8",
     "arch": "ppc64le",
diff --git a/test/data/manifests/rhel_8-s390x-qcow2-boot.json b/test/data/manifests/rhel_8-s390x-qcow2-boot.json
index a73ca72b6..266700253 100644
--- a/test/data/manifests/rhel_8-s390x-qcow2-boot.json
+++ b/test/data/manifests/rhel_8-s390x-qcow2-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "qemu"
-  },
   "compose-request": {
     "distro": "rhel-8",
     "arch": "s390x",
diff --git a/test/data/manifests/rhel_8-x86_64-ami-boot.json b/test/data/manifests/rhel_8-x86_64-ami-boot.json
index d6f1c6c41..762dec10e 100644
--- a/test/data/manifests/rhel_8-x86_64-ami-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-ami-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "aws"
-  },
   "compose-request": {
     "distro": "rhel-8",
     "arch": "x86_64",
diff --git a/test/data/manifests/rhel_8-x86_64-qcow2-boot.json b/test/data/manifests/rhel_8-x86_64-qcow2-boot.json
index 80b12e651..03ecb0fb1 100644
--- a/test/data/manifests/rhel_8-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-qcow2-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "qemu"
-  },
   "compose-request": {
     "distro": "rhel-8",
     "arch": "x86_64",
diff --git a/test/data/manifests/rhel_8-x86_64-vhd-boot.json b/test/data/manifests/rhel_8-x86_64-vhd-boot.json
index b3f434ecc..77fa7e42d 100644
--- a/test/data/manifests/rhel_8-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-vhd-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "azure"
-  },
   "compose-request": {
     "distro": "rhel-8",
     "arch": "x86_64",
diff --git a/test/data/manifests/rhel_8-x86_64-vmdk-boot.json b/test/data/manifests/rhel_8-x86_64-vmdk-boot.json
index 3e54561aa..40629fd9f 100644
--- a/test/data/manifests/rhel_8-x86_64-vmdk-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-vmdk-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "vmware"
-  },
   "compose-request": {
     "distro": "rhel-8",
     "arch": "x86_64",
diff --git a/test/data/manifests/rhel_84-aarch64-ami-boot.json b/test/data/manifests/rhel_84-aarch64-ami-boot.json
index e48b58f72..60554b586 100644
--- a/test/data/manifests/rhel_84-aarch64-ami-boot.json
+++ b/test/data/manifests/rhel_84-aarch64-ami-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "aws"
-  },
   "compose-request": {
     "distro": "rhel-84",
     "arch": "aarch64",
diff --git a/test/data/manifests/rhel_84-aarch64-qcow2-boot.json b/test/data/manifests/rhel_84-aarch64-qcow2-boot.json
index 6ccd076e7..dea6c8c05 100644
--- a/test/data/manifests/rhel_84-aarch64-qcow2-boot.json
+++ b/test/data/manifests/rhel_84-aarch64-qcow2-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "qemu"
-  },
   "compose-request": {
     "distro": "rhel-84",
     "arch": "aarch64",
diff --git a/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json
index 647ecd7a5..c52d12687 100644
--- a/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json
+++ b/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "qemu"
-  },
   "compose-request": {
     "distro": "rhel-84",
     "arch": "ppc64le",
diff --git a/test/data/manifests/rhel_84-s390x-qcow2-boot.json b/test/data/manifests/rhel_84-s390x-qcow2-boot.json
index b29905efb..1f2d58b37 100644
--- a/test/data/manifests/rhel_84-s390x-qcow2-boot.json
+++ b/test/data/manifests/rhel_84-s390x-qcow2-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "qemu"
-  },
   "compose-request": {
     "distro": "rhel-84",
     "arch": "s390x",
diff --git a/test/data/manifests/rhel_84-x86_64-ami-boot.json b/test/data/manifests/rhel_84-x86_64-ami-boot.json
index 75dc2858d..57e50ec54 100644
--- a/test/data/manifests/rhel_84-x86_64-ami-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-ami-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "aws"
-  },
   "compose-request": {
     "distro": "rhel-84",
     "arch": "x86_64",
diff --git a/test/data/manifests/rhel_84-x86_64-qcow2-boot.json b/test/data/manifests/rhel_84-x86_64-qcow2-boot.json
index 66a650b6b..6537575c2 100644
--- a/test/data/manifests/rhel_84-x86_64-qcow2-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-qcow2-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "qemu"
-  },
   "compose-request": {
     "distro": "rhel-84",
     "arch": "x86_64",
diff --git a/test/data/manifests/rhel_84-x86_64-vhd-boot.json b/test/data/manifests/rhel_84-x86_64-vhd-boot.json
index 9f70876e1..8cf13c786 100644
--- a/test/data/manifests/rhel_84-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-vhd-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "azure"
-  },
   "compose-request": {
     "distro": "rhel-84",
     "arch": "x86_64",
diff --git a/test/data/manifests/rhel_84-x86_64-vmdk-boot.json b/test/data/manifests/rhel_84-x86_64-vmdk-boot.json
index 4eb3eaa05..794489b49 100644
--- a/test/data/manifests/rhel_84-x86_64-vmdk-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-vmdk-boot.json
@@ -1,7 +1,4 @@
 {
-  "boot": {
-    "type": "vmware"
-  },
   "compose-request": {
     "distro": "rhel-84",
     "arch": "x86_64",
diff --git a/tools/test-case-generators/format-request-map.json b/tools/test-case-generators/format-request-map.json
index 316aa113b..cba76757c 100644
--- a/tools/test-case-generators/format-request-map.json
+++ b/tools/test-case-generators/format-request-map.json
@@ -1,8 +1,5 @@
 {
   "ami": {
-    "boot": {
-      "type": "aws"
-    },
     "compose-request": {
       "distro": "",
       "arch": "",
@@ -172,9 +169,6 @@
     }
   },
   "qcow2": {
-    "boot": {
-      "type": "qemu"
-    },
     "compose-request": {
       "distro": "",
       "arch": "",
@@ -218,9 +212,6 @@
     }
   },
   "vhd": {
-    "boot": {
-      "type": "azure"
-    },
     "compose-request": {
       "distro": "",
       "arch": "",
@@ -264,9 +255,6 @@
     }
   },
   "vmdk": {
-    "boot": {
-      "type": "qemu"
-    },
     "compose-request": {
       "distro": "",
       "arch": "",