diff options
| author | Brent Baude <bbaude@redhat.com> | 2020-02-03 13:39:18 -0600 |
|---|---|---|
| committer | Brent Baude <bbaude@redhat.com> | 2020-02-10 18:44:20 -0600 |
| commit | 2800323e60aaacf344d3f4204f79aa01ac558888 (patch) | |
| tree | cf95bd03abfa5673298ba1866eb20beae17cf79b | |
| parent | e57253d06841d7a128ef760f8c47acf4b59157df (diff) | |
| download | podman-2800323e60aaacf344d3f4204f79aa01ac558888.tar.gz podman-2800323e60aaacf344d3f4204f79aa01ac558888.tar.bz2 podman-2800323e60aaacf344d3f4204f79aa01ac558888.zip | |
replace prow images test
this is a container-based approach to verifying we can build an rpm based on the contrib spec.
Signed-off-by: Brent Baude <bbaude@redhat.com>
| -rw-r--r-- | .cirrus.yml | 22 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 655fa3830..a591c2d38 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -143,6 +143,27 @@ gating_task: on_failure: failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh' +# This task checks to make sure that we can still build an rpm from the +# source code using contrib/rpm/podman.spec.in +rpmbuild_task: + + only_if: $CIRRUS_BRANCH != $DEST_BRANCH + depends_on: + - "gating" + env: + CIRRUS_WORKING_DIR: "/usr/src/libpod" + + container: + image: quay.io/libpod/rpmbuild:$DEST_BRANCH + cpu: 2 + memory: 4 + + rpmbuild_script: + - 'make -C ${CIRRUS_WORKING_DIR} -f ${CIRRUS_WORKING_DIR}/.copr/Makefile' + - 'rpmbuild --rebuild ${CIRRUS_WORKING_DIR}/podman-*.src.rpm' + + on_failure: + failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh |& ${TIMESTAMP}' # This task runs `make vendor` followed by ./hack/tree_status.sh to check # whether the git tree is clean. The reasoning for that is to make sure @@ -710,6 +731,7 @@ success_task: - "meta" - "image_prune" - "testing" + - "rpmbuild" - "special_testing_rootless" - "special_testing_in_podman" - "special_testing_cgroupv2" diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 4e4dc5d21..4518ecc09 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -385,6 +385,7 @@ mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../../ src/%{import_path} popd ln -s vendor src +export GO111MODULE=off export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} export BUILDTAGS="varlink selinux seccomp $(%{hackdir}/hack/btrfs_installed_tag.sh) $(%{hackdir}/hack/btrfs_tag.sh) $(%{hackdir}/hack/libdm_tag.sh) exclude_graphdriver_devicemapper" |