From 6cf252caa3b36701a6c4b7c778b54f011cb8a68e Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 11 Nov 2024 16:54:19 -0500 Subject: [PATCH] hack: workaround for bootc Do not merge. This is a temporary pipeline to for rpm-ostree images. --- tasks/create-pyxis-image/create-pyxis-image.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tasks/create-pyxis-image/create-pyxis-image.yaml b/tasks/create-pyxis-image/create-pyxis-image.yaml index b96b70b4c..63c39d1a9 100644 --- a/tasks/create-pyxis-image/create-pyxis-image.yaml +++ b/tasks/create-pyxis-image/create-pyxis-image.yaml @@ -164,6 +164,12 @@ spec: "${PULLSPEC}" \ | tee "${MANIFEST_FILE}" + # Temporary - do not merge + # As a side-effect of the way they build without squashing, their final layer is always bit-wise identical. This causes upload to pyxis to fail which cannot tolerate duplicate "top_layer_id" values. Here - just delete the layers so that no layer information is uploaded. Requires https://github.com/konflux-ci/release-service-utils/pull/311 + echo "Delete the layers, just for rhel-bootc" + jq '.layers = []' "${MANIFEST_FILE}" > "${MANIFEST_FILE}.tmp" + mv "${MANIFEST_FILE}.tmp" "${MANIFEST_FILE}" + # Augment that manifest with further information about the layers, decompressed # This requires pulling the layers to decompress and then measure them while IFS= read -r BLOB_DETAIL;