diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-11 17:33:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 17:33:35 +0100 |
| commit | 86b5a89d1afb641196214ed9c57e83e617776c5f (patch) | |
| tree | 3c9201156355cdd09443fcd98e2bc0e93269c18a | |
| parent | c705d2cefc1929739af2b3c94a5e7e4865285c5e (diff) | |
| parent | 2800323e60aaacf344d3f4204f79aa01ac558888 (diff) | |
| download | podman-86b5a89d1afb641196214ed9c57e83e617776c5f.tar.gz podman-86b5a89d1afb641196214ed9c57e83e617776c5f.tar.bz2 podman-86b5a89d1afb641196214ed9c57e83e617776c5f.zip | |
Merge pull request #5068 from baude/newimagestest
replace prow images test
| -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 4e751514d..5c4cf470c 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 @@ -712,6 +733,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 5f21571ca..276dd327e 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" |