From 020752bfe82a384b9a235be227b816885e58854d Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 26 Feb 2020 16:39:58 -0500 Subject: [PATCH] tests/compose: Stop freezing on specific FCOS commit We're hitting issues with packages getting tagged out of the pool: https://pagure.io/releng/issue/9281 This in turn means we can't reliably recompose older builds right now, which breaks our CI. For now at least, let's compose from the latest. (Note we were already also composing the latest FCOS in the vmcheck branch.) --- tests/compose.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/compose.sh b/tests/compose.sh index 9ad6bffc..ce522f87 100755 --- a/tests/compose.sh +++ b/tests/compose.sh @@ -3,7 +3,8 @@ set -euo pipefail # freeze on a specific commit for tests for reproducibility and since it should # always work to target older treefiles -FEDORA_COREOS_CONFIG_COMMIT=088fc2dec535aca392958e9c30c17cf19ef4b568 +# XXX: disable this for now: https://pagure.io/releng/issue/9281 +# FEDORA_COREOS_CONFIG_COMMIT=088fc2dec535aca392958e9c30c17cf19ef4b568 dn=$(cd "$(dirname "$0")" && pwd) topsrcdir=$(cd "$dn/.." && pwd) @@ -38,7 +39,8 @@ if [ ! -d compose-cache ]; then git clone https://github.com/coreos/fedora-coreos-config config pushd config - git checkout "${FEDORA_COREOS_CONFIG_COMMIT}" + # XXX: disable this for now -- see above + # git checkout "${FEDORA_COREOS_CONFIG_COMMIT}" # we flatten the treefile to make it easier to manipulate in tests (we have # lots of tests that check for include logic already) rpm-ostree compose tree --print-only manifest.yaml > manifest.json