From 2972949d13318acb65766a0996804bbd8c932188 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 28 Aug 2023 14:52:25 -0400 Subject: [PATCH] tests/ostree-container: Drop hardcoded max layers This should just defer to rpm-ostree. xref https://github.com/coreos/rpm-ostree/issues/4530 (If someone cares about reproducibility here, they can specify it; alternatively and more reliably, they can create builder container images and pin to those) --- test/data/manifests/fedora-ostree-native-container.json | 3 +-- test/data/manifests/fedora-ostree-native-container.mpp.yaml | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/test/data/manifests/fedora-ostree-native-container.json b/test/data/manifests/fedora-ostree-native-container.json index 6a3eeae5..9b2f182e 100644 --- a/test/data/manifests/fedora-ostree-native-container.json +++ b/test/data/manifests/fedora-ostree-native-container.json @@ -1039,8 +1039,7 @@ { "type": "org.osbuild.ostree.encapsulate", "options": { - "filename": "ostree-container.tar", - "max_layers": 4 + "filename": "ostree-container.tar" }, "inputs": { "commit": { diff --git a/test/data/manifests/fedora-ostree-native-container.mpp.yaml b/test/data/manifests/fedora-ostree-native-container.mpp.yaml index 27b24892..63525efc 100644 --- a/test/data/manifests/fedora-ostree-native-container.mpp.yaml +++ b/test/data/manifests/fedora-ostree-native-container.mpp.yaml @@ -18,9 +18,6 @@ pipelines: - type: org.osbuild.ostree.encapsulate options: filename: ostree-container.tar - # max_layers < 4 is currently broken (or unsupported) - # see https://github.com/coreos/rpm-ostree/issues/4530 - max_layers: 4 inputs: commit: type: org.osbuild.ostree