Skip to content

More prow CI work #1893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Oct 2, 2019
Merged

More prow CI work #1893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cffac14
ci/prow: Use build-check.sh
cgwalters Aug 29, 2019
ab337ac
ci/prow: Use cosa buildroot
cgwalters Aug 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ci/build-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ fi
${dn}/build.sh
# NB: avoid make function because our RPM building doesn't
# support parallel runs right now
/usr/bin/make check
# See https://github.com/containers/fuse-overlayfs/pull/105 for the fuse-overlayfs workaround
if ! [ "$(findmnt -n -o SOURCE /)" != fuse-overlayfs ]; then
/usr/bin/make check
fi
make rust-test
make install

# And now a clang build with -Werror turned on. We can't do this with gcc (in
Expand Down
4 changes: 4 additions & 0 deletions ci/installdeps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ set -xeuo pipefail
dn=$(dirname $0)
. ${dn}/libbuild.sh

if [ -n "${SKIP_INSTALLDEPS:-}" ]; then
exit 0
fi

# Use the latest ostree by default (XXX: currently pulling in f29 ostree, need
# to bump rdgo to f30 or wait for packit)
id=$(. /etc/os-release && echo $ID)
Expand Down
5 changes: 3 additions & 2 deletions ci/prow/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM registry.fedoraproject.org/fedora:30
FROM registry.svc.ci.openshift.org/coreos/cosa-buildroot:latest
WORKDIR /src
COPY . .
RUN ./ci/build.sh
USER root
RUN env SKIP_INSTALLDEPS=1 ./ci/build-check.sh
Copy link
Copy Markdown

@vrutkovs vrutkovs Aug 30, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather not run any kind of tests during image build here. These might fail and the resulting image cannot be used for other tests (unless make check and make rust-test are very-very basic)

Copy link
Copy Markdown
Member Author

@cgwalters cgwalters Aug 30, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They're pretty basic tests.

That said, there is already today that split, we can just run ci/build.sh.