Skip to content

Commit

Permalink
ci: More fixes for cosa build
Browse files Browse the repository at this point in the history
Use --entrypoint and also rename it while we're here.

Closes: coreos#1889
Approved by: rfairley
  • Loading branch information
cgwalters authored and rh-atomic-bot committed Aug 24, 2019
1 parent 0b7a1f3 commit 0d841b2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .papr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ host:
distro: fedora/29/atomic

tests:
- ./ci/f29-cosa-build.sh
- ./ci/cosa-build.sh

timeout: 120m

Expand Down
5 changes: 3 additions & 2 deletions ci/f29-cosa-build.sh → ci/cosa-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ cosaimg=quay.io/coreos-assembler/coreos-assembler:latest
podman pull "${cosaimg}"

# 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 \
--entrypoint bash --user root \
"${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)
mkdir fcos
Expand Down

0 comments on commit 0d841b2

Please sign in to comment.