mirror of
https://github.com/ostreedev/ostree.git
synced 2024-12-22 17:35:55 +03:00
ci: Sync prow config with rpm-ostree, enable composefs there
I want to gain testing over the composefs path; but without yet changing the main Jenkins build. Because we have duplicate/overlapping CI systems, we can take advantage of this by testing the composefs flow via Prow. Sync the Prow build scripts with what's in coreos/rpm-ostree right now. Then let's test the composefs flow a bit more e2e there.
This commit is contained in:
parent
3c7e256cee
commit
6df69880de
@ -1,4 +1,21 @@
|
||||
FROM registry.fedoraproject.org/fedora:30
|
||||
FROM registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel as builder
|
||||
WORKDIR /src
|
||||
COPY . .
|
||||
RUN ./ci/build.sh
|
||||
RUN env CONFIGOPTS=--with-composefs ./ci/build.sh && make install DESTDIR=/cosa/component-install
|
||||
RUN make -C tests/kolainst install DESTDIR=/cosa/component-tests
|
||||
# Uncomment this to fake a build to test the code below
|
||||
#RUN mkdir -p /cosa/component-install/usr/bin && echo foo > /cosa/component-install/usr/bin/foo
|
||||
|
||||
FROM registry.ci.openshift.org/coreos/coreos-assembler:latest
|
||||
WORKDIR /srv
|
||||
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/ /
|
||||
# Merge installed tests
|
||||
RUN rsync -rlv /cosa/component-tests/ /
|
||||
# Grab all of our ci scripts
|
||||
COPY --from=builder /src/ci/ /ci/
|
||||
RUN ln -sr /ci/prow/fcos-e2e.sh /usr/bin/fcos-e2e
|
||||
USER builder
|
||||
|
15
ci/prow/fcos-e2e.sh
Normal file
15
ci/prow/fcos-e2e.sh
Normal file
@ -0,0 +1,15 @@
|
||||
#!/bin/bash
|
||||
set -xeuo pipefail
|
||||
|
||||
# Prow jobs don't support adding emptydir today
|
||||
export COSA_SKIP_OVERLAY=1
|
||||
# And suppress depcheck since we didn't install via RPM
|
||||
export COSA_SUPPRESS_DEPCHECK=1
|
||||
ostree --version
|
||||
cd $(mktemp -d)
|
||||
cosa init https://github.com/coreos/fedora-coreos-config/
|
||||
rsync -rlv /cosa/component-install/ overrides/rootfs/
|
||||
cosa fetch
|
||||
cosa build
|
||||
# For now, Prow just runs the composefs tests, since Jenkins covers the others
|
||||
cosa kola run 'ext.ostree.destructive-rs.composefs*'
|
Loading…
Reference in New Issue
Block a user