From 6ccf858306547ac18ef611e64bda5b53785298e5 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 9 Jan 2024 14:53:41 -0500 Subject: [PATCH] ci/prow: temporarily stop composing with new rpm-ostree Until a new rpm-ostree is out with the new `rpm-ostree-0-integration-opt-usrlocal.conf` file and part of cosa. This duplicates the CoreOS CI test anyway. Note we do still put rpm-ostree in the target system we compose and run kola tests on. See https://github.com/coreos/rpm-ostree/pull/4763#issuecomment-1883686187 --- ci/prow/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/prow/Dockerfile b/ci/prow/Dockerfile index d16b3ee1cd..eadd78d39c 100644 --- a/ci/prow/Dockerfile +++ b/ci/prow/Dockerfile @@ -12,7 +12,9 @@ USER root # Copy binaries from the build COPY --from=builder /cosa /cosa # Merge them to the real root since we're used at compose time -RUN rsync -rlv /cosa/component-install/ / +# XXX: disabled for now +# https://github.com/coreos/rpm-ostree/pull/4763#issuecomment-1883686187 +# RUN rsync -rlv /cosa/component-install/ / # Merge installed tests RUN rsync -rlv /cosa/component-tests/ / # Grab all of our ci scripts