keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests/compose: Stop freezing on specific FCOS commit

Browse Source 
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.)
This commit is contained in:
Jonathan Lebon 2020-02-26 16:39:58 -05:00 committed by OpenShift Merge Robot
parent 1675058768
commit 020752bfe8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/compose.sh
View File

@ -3,7 +3,8 @@ set -euo pipefail
# freeze on a specific commit for tests for reproducibility and since it should # freeze on a specific commit for tests for reproducibility and since it should
# always work to target older treefiles # 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) dn=$(cd "$(dirname "$0")" && pwd)
topsrcdir=$(cd "$dn/.." && pwd) topsrcdir=$(cd "$dn/.." && pwd)
@ -38,7 +39,8 @@ if [ ! -d compose-cache ]; then
git clone https://github.com/coreos/fedora-coreos-config config git clone https://github.com/coreos/fedora-coreos-config config
pushd 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 # we flatten the treefile to make it easier to manipulate in tests (we have
# lots of tests that check for include logic already) # lots of tests that check for include logic already)
rpm-ostree compose tree --print-only manifest.yaml > manifest.json rpm-ostree compose tree --print-only manifest.yaml > manifest.json