Skip to content

Commit

Permalink
ci/prow: temporarily stop composing with new rpm-ostree
Browse files Browse the repository at this point in the history
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 #4763 (comment)
  • Loading branch information
jlebon authored and cgwalters committed Jan 10, 2024
1 parent 001560d commit 1451675
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion ci/prow/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1451675

Please sign in to comment.