ci: More fixes for cosa build

Use --entrypoint and also rename it while we're here.

Closes: #1889
Approved by: rfairley
This commit is contained in:
Colin Walters 2019-08-22 22:23:18 +00:00 committed by Atomic Bot
parent 0b7a1f31a7
commit 0d841b2e2f
2 changed files with 4 additions and 3 deletions

View File

@ -27,7 +27,7 @@ host:
distro: fedora/29/atomic distro: fedora/29/atomic
tests: tests:
- ./ci/f29-cosa-build.sh - ./ci/cosa-build.sh
timeout: 120m timeout: 120m

View File

@ -7,10 +7,11 @@ cosaimg=quay.io/coreos-assembler/coreos-assembler:latest
podman pull "${cosaimg}" podman pull "${cosaimg}"
# Build rpm-ostree using cosa as a buildroot, and extract the result # Build rpm-ostree using cosa as a buildroot, and extract the result
podman run --privileged --rm \ podman run --security-opt label=disable --rm \
-v $(pwd):/srv/code -w /srv/code \ -v $(pwd):/srv/code -w /srv/code \
--entrypoint bash --user root \
"${cosaimg}" \ "${cosaimg}" \
/bin/sh -c './ci/build.sh && make install DESTDIR=$(pwd)/installroot' -c 'yum -y swap fedora-release-container fedora-release && ./ci/build.sh && make install DESTDIR=$(pwd)/installroot'
codedir=$(pwd) codedir=$(pwd)
mkdir fcos mkdir fcos