From 143677f5d9e0a554e285241788d673d7677fc237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Fri, 12 Jul 2024 15:52:34 +0200 Subject: [PATCH] Tests: force checkout manifest-db MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Manifest tests on Fedora 39 sometimes fail, because checking out the specific manifest-db commit fails with: "error: The following untracked working tree files would be overwritten by checkout" Use --force when checking out the ref, which will hopefully solve any error like this. [1] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild/-/jobs/7317097983 Signed-off-by: Tomáš Hozza --- schutzbot/manifest_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schutzbot/manifest_tests.sh b/schutzbot/manifest_tests.sh index 4700875c..cfdc8c45 100755 --- a/schutzbot/manifest_tests.sh +++ b/schutzbot/manifest_tests.sh @@ -9,7 +9,7 @@ MANIFEST_DB_COMMIT=$(cat Schutzfile | jq -r '.global.dependencies."manifest-db". MANIFEST_DB_REPO="https://github.com/osbuild/manifest-db" git clone "$MANIFEST_DB_REPO" manifest-db cd manifest-db -git checkout "$MANIFEST_DB_COMMIT" +git checkout --force "$MANIFEST_DB_COMMIT" # update selinux labels for the image-info tool OSBUILD_LABEL=$(matchpathcon -n /usr/bin/osbuild)