From f9fbf5bd5e1f9a9707d5dc9827747c52d545d69c Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Wed, 6 Oct 2021 10:02:52 +0200 Subject: [PATCH] Regenerate affected image test cases Regenerate affected image test cases with the image-info fix (affecting mainly `tar` image type) and with the latest upstream `osbuild` build (affecting rhel-85 qcow2 images). Signed-off-by: Tomas Hozza --- .../manifests/centos_8-x86_64-tar-boot.json | 15 --------------- .../data/manifests/rhel_8-aarch64-tar-boot.json | 17 ----------------- .../data/manifests/rhel_8-ppc64le-tar-boot.json | 17 ----------------- test/data/manifests/rhel_8-s390x-tar-boot.json | 17 ----------------- test/data/manifests/rhel_8-x86_64-tar-boot.json | 17 ----------------- .../manifests/rhel_84-aarch64-tar-boot.json | 15 --------------- .../manifests/rhel_84-ppc64le-tar-boot.json | 15 --------------- .../data/manifests/rhel_84-x86_64-tar-boot.json | 15 --------------- .../manifests/rhel_85-aarch64-qcow2-boot.json | 2 +- .../rhel_85-aarch64-qcow2_customize-boot.json | 2 +- .../manifests/rhel_85-aarch64-tar-boot.json | 17 ----------------- .../manifests/rhel_85-ppc64le-qcow2-boot.json | 2 +- .../rhel_85-ppc64le-qcow2_customize-boot.json | 2 +- .../manifests/rhel_85-ppc64le-tar-boot.json | 17 ----------------- .../manifests/rhel_85-s390x-qcow2-boot.json | 2 +- .../rhel_85-s390x-qcow2_customize-boot.json | 2 +- test/data/manifests/rhel_85-s390x-tar-boot.json | 17 ----------------- .../manifests/rhel_85-x86_64-qcow2-boot.json | 2 +- .../rhel_85-x86_64-qcow2_customize-boot.json | 2 +- .../data/manifests/rhel_85-x86_64-tar-boot.json | 17 ----------------- 20 files changed, 8 insertions(+), 204 deletions(-) diff --git a/test/data/manifests/centos_8-x86_64-tar-boot.json b/test/data/manifests/centos_8-x86_64-tar-boot.json index f5e0c3aa6..9370f8a8f 100644 --- a/test/data/manifests/centos_8-x86_64-tar-boot.json +++ b/test/data/manifests/centos_8-x86_64-tar-boot.json @@ -6538,21 +6538,6 @@ "actual": "unconfined_u:object_r:etc_t:s0", "expected": "system_u:object_r:etc_t:s0", "filename": "/etc/sysconfig/network" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.001" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.002" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.003" } ], "policy": { diff --git a/test/data/manifests/rhel_8-aarch64-tar-boot.json b/test/data/manifests/rhel_8-aarch64-tar-boot.json index c481939fb..3ef797e95 100644 --- a/test/data/manifests/rhel_8-aarch64-tar-boot.json +++ b/test/data/manifests/rhel_8-aarch64-tar-boot.json @@ -5725,23 +5725,6 @@ "missing": [] }, "selinux": { - "context-mismatch": [ - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.001" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.002" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.003" - } - ], "policy": { "SELINUX": "enforcing", "SELINUXTYPE": "targeted" diff --git a/test/data/manifests/rhel_8-ppc64le-tar-boot.json b/test/data/manifests/rhel_8-ppc64le-tar-boot.json index 762934a00..825b85076 100644 --- a/test/data/manifests/rhel_8-ppc64le-tar-boot.json +++ b/test/data/manifests/rhel_8-ppc64le-tar-boot.json @@ -5828,23 +5828,6 @@ "missing": [] }, "selinux": { - "context-mismatch": [ - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.001" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.002" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.003" - } - ], "policy": { "SELINUX": "enforcing", "SELINUXTYPE": "targeted" diff --git a/test/data/manifests/rhel_8-s390x-tar-boot.json b/test/data/manifests/rhel_8-s390x-tar-boot.json index fda2c5b76..0c1e2af16 100644 --- a/test/data/manifests/rhel_8-s390x-tar-boot.json +++ b/test/data/manifests/rhel_8-s390x-tar-boot.json @@ -6635,23 +6635,6 @@ "missing": [] }, "selinux": { - "context-mismatch": [ - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.001" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.002" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.003" - } - ], "policy": { "SELINUX": "enforcing", "SELINUXTYPE": "targeted" diff --git a/test/data/manifests/rhel_8-x86_64-tar-boot.json b/test/data/manifests/rhel_8-x86_64-tar-boot.json index 7e4b00a9d..221bd2292 100644 --- a/test/data/manifests/rhel_8-x86_64-tar-boot.json +++ b/test/data/manifests/rhel_8-x86_64-tar-boot.json @@ -5807,23 +5807,6 @@ "missing": [] }, "selinux": { - "context-mismatch": [ - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.001" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.002" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.003" - } - ], "policy": { "SELINUX": "enforcing", "SELINUXTYPE": "targeted" diff --git a/test/data/manifests/rhel_84-aarch64-tar-boot.json b/test/data/manifests/rhel_84-aarch64-tar-boot.json index 7e29f0139..061520ddb 100644 --- a/test/data/manifests/rhel_84-aarch64-tar-boot.json +++ b/test/data/manifests/rhel_84-aarch64-tar-boot.json @@ -5952,21 +5952,6 @@ "actual": "unconfined_u:object_r:etc_t:s0", "expected": "system_u:object_r:etc_t:s0", "filename": "/etc/sysconfig/network" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.001" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.002" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.003" } ], "policy": { diff --git a/test/data/manifests/rhel_84-ppc64le-tar-boot.json b/test/data/manifests/rhel_84-ppc64le-tar-boot.json index d98931482..3014a8d71 100644 --- a/test/data/manifests/rhel_84-ppc64le-tar-boot.json +++ b/test/data/manifests/rhel_84-ppc64le-tar-boot.json @@ -6055,21 +6055,6 @@ "actual": "unconfined_u:object_r:etc_t:s0", "expected": "system_u:object_r:etc_t:s0", "filename": "/etc/sysconfig/network" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.001" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.002" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.003" } ], "policy": { diff --git a/test/data/manifests/rhel_84-x86_64-tar-boot.json b/test/data/manifests/rhel_84-x86_64-tar-boot.json index cfc9c075a..eabe068fe 100644 --- a/test/data/manifests/rhel_84-x86_64-tar-boot.json +++ b/test/data/manifests/rhel_84-x86_64-tar-boot.json @@ -6034,21 +6034,6 @@ "actual": "unconfined_u:object_r:etc_t:s0", "expected": "system_u:object_r:etc_t:s0", "filename": "/etc/sysconfig/network" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.001" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.002" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.003" } ], "policy": { diff --git a/test/data/manifests/rhel_85-aarch64-qcow2-boot.json b/test/data/manifests/rhel_85-aarch64-qcow2-boot.json index 5582445ad..3e631f8f8 100644 --- a/test/data/manifests/rhel_85-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_85-aarch64-qcow2-boot.json @@ -10468,7 +10468,7 @@ "::1 localhost localhost.localdomain localhost6 localhost6.localdomain6" ], "image-format": { - "compat": "1.1", + "compat": "0.10", "type": "qcow2" }, "locale": { diff --git a/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json index 65237286c..5131e2799 100644 --- a/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json @@ -12898,7 +12898,7 @@ "::1 localhost localhost.localdomain localhost6 localhost6.localdomain6" ], "image-format": { - "compat": "1.1", + "compat": "0.10", "type": "qcow2" }, "keyboard": { diff --git a/test/data/manifests/rhel_85-aarch64-tar-boot.json b/test/data/manifests/rhel_85-aarch64-tar-boot.json index 278b73d42..1d34e74c6 100644 --- a/test/data/manifests/rhel_85-aarch64-tar-boot.json +++ b/test/data/manifests/rhel_85-aarch64-tar-boot.json @@ -6935,23 +6935,6 @@ "missing": [] }, "selinux": { - "context-mismatch": [ - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.001" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.002" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.003" - } - ], "policy": { "SELINUX": "enforcing", "SELINUXTYPE": "targeted" diff --git a/test/data/manifests/rhel_85-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_85-ppc64le-qcow2-boot.json index fdc08ae56..3861b29fa 100644 --- a/test/data/manifests/rhel_85-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_85-ppc64le-qcow2-boot.json @@ -11201,7 +11201,7 @@ "::1 localhost localhost.localdomain localhost6 localhost6.localdomain6" ], "image-format": { - "compat": "1.1", + "compat": "0.10", "type": "qcow2" }, "locale": { diff --git a/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json index fa7c7c9f0..46bc70b2b 100644 --- a/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json @@ -14064,7 +14064,7 @@ "::1 localhost localhost.localdomain localhost6 localhost6.localdomain6" ], "image-format": { - "compat": "1.1", + "compat": "0.10", "type": "qcow2" }, "keyboard": { diff --git a/test/data/manifests/rhel_85-ppc64le-tar-boot.json b/test/data/manifests/rhel_85-ppc64le-tar-boot.json index 1f421d14e..f7c480c5b 100644 --- a/test/data/manifests/rhel_85-ppc64le-tar-boot.json +++ b/test/data/manifests/rhel_85-ppc64le-tar-boot.json @@ -7311,23 +7311,6 @@ "missing": [] }, "selinux": { - "context-mismatch": [ - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.001" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.002" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.003" - } - ], "policy": { "SELINUX": "enforcing", "SELINUXTYPE": "targeted" diff --git a/test/data/manifests/rhel_85-s390x-qcow2-boot.json b/test/data/manifests/rhel_85-s390x-qcow2-boot.json index 122e516fb..825ffa791 100644 --- a/test/data/manifests/rhel_85-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_85-s390x-qcow2-boot.json @@ -11906,7 +11906,7 @@ "::1 localhost localhost.localdomain localhost6 localhost6.localdomain6" ], "image-format": { - "compat": "1.1", + "compat": "0.10", "type": "qcow2" }, "locale": { diff --git a/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json index bef763a2c..06f35bcb7 100644 --- a/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json @@ -14227,7 +14227,7 @@ "::1 localhost localhost.localdomain localhost6 localhost6.localdomain6" ], "image-format": { - "compat": "1.1", + "compat": "0.10", "type": "qcow2" }, "keyboard": { diff --git a/test/data/manifests/rhel_85-s390x-tar-boot.json b/test/data/manifests/rhel_85-s390x-tar-boot.json index 6fe0f1d5e..53cacf38d 100644 --- a/test/data/manifests/rhel_85-s390x-tar-boot.json +++ b/test/data/manifests/rhel_85-s390x-tar-boot.json @@ -8841,23 +8841,6 @@ "missing": [] }, "selinux": { - "context-mismatch": [ - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.001" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.002" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.003" - } - ], "policy": { "SELINUX": "enforcing", "SELINUXTYPE": "targeted" diff --git a/test/data/manifests/rhel_85-x86_64-qcow2-boot.json b/test/data/manifests/rhel_85-x86_64-qcow2-boot.json index cefa1268d..7ff4f6c7e 100644 --- a/test/data/manifests/rhel_85-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_85-x86_64-qcow2-boot.json @@ -10653,7 +10653,7 @@ "::1 localhost localhost.localdomain localhost6 localhost6.localdomain6" ], "image-format": { - "compat": "1.1", + "compat": "0.10", "type": "qcow2" }, "locale": { diff --git a/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json index f4e263476..1f1f8098e 100644 --- a/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json @@ -13126,7 +13126,7 @@ "::1 localhost localhost.localdomain localhost6 localhost6.localdomain6" ], "image-format": { - "compat": "1.1", + "compat": "0.10", "type": "qcow2" }, "keyboard": { diff --git a/test/data/manifests/rhel_85-x86_64-tar-boot.json b/test/data/manifests/rhel_85-x86_64-tar-boot.json index 37635a219..cd18317ec 100644 --- a/test/data/manifests/rhel_85-x86_64-tar-boot.json +++ b/test/data/manifests/rhel_85-x86_64-tar-boot.json @@ -7053,23 +7053,6 @@ "missing": [] }, "selinux": { - "context-mismatch": [ - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.001" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.002" - }, - { - "actual": "unconfined_u:object_r:rpm_var_lib_t:s0", - "expected": "system_u:object_r:rpm_var_lib_t:s0", - "filename": "/var/lib/rpm/__db.003" - } - ], "policy": { "SELINUX": "enforcing", "SELINUXTYPE": "targeted"