summaryrefslogtreecommitdiff
path: root/.cirrus.yml
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-29 16:38:24 +0200
committerGitHub <noreply@github.com>2020-04-29 16:38:24 +0200
commit620baafa0790b857b089f48c6539f78affdb546d (patch)
treeca2014a682eab184de2a3ee82756dbe8aaf77c52 /.cirrus.yml
parentc5a035b0327df47c13ab3411f3518d6a6bdc71ef (diff)
parent62accbc565cc3bd71b910c8854c4d53dfca7379e (diff)
downloadpodman-620baafa0790b857b089f48c6539f78affdb546d.tar.gz
podman-620baafa0790b857b089f48c6539f78affdb546d.tar.bz2
podman-620baafa0790b857b089f48c6539f78affdb546d.zip
Merge pull request #5853 from cevich/unify_in_podman_build
Unify in_podman container packaging & VM packaging
Diffstat (limited to '.cirrus.yml')
-rw-r--r--.cirrus.yml31
1 files changed, 30 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 0122b6b55..5898fa160 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -39,7 +39,7 @@ env:
UBUNTU_NAME: "ubuntu-19"
PRIOR_UBUNTU_NAME: "ubuntu-18"
- _BUILT_IMAGE_SUFFIX: "libpod-6301182083727360"
+ _BUILT_IMAGE_SUFFIX: "libpod-6220812239765504"
FEDORA_CACHE_IMAGE_NAME: "${FEDORA_NAME}-${_BUILT_IMAGE_SUFFIX}"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "${PRIOR_FEDORA_NAME}-${_BUILT_IMAGE_SUFFIX}"
UBUNTU_CACHE_IMAGE_NAME: "${UBUNTU_NAME}-${_BUILT_IMAGE_SUFFIX}"
@@ -156,6 +156,32 @@ gating_task:
failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh'
+# Ensure these container images can build
+container_image_build_task:
+ alias: 'container_image_build'
+ depends_on:
+ - "gating"
+
+ # Only run for PRs, quay.io will automatically build after bramch-push
+ only_if: $CIRRUS_BRANCH != $DEST_BRANCH
+
+ matrix:
+ - name: "build in_podman image ${FEDORA_NAME} "
+ container:
+ dockerfile: Dockerfile
+ - name: "build in_podman image ${UBUNTU_NAME}"
+ container:
+ dockerfile: Dockerfile.ubuntu
+ - name: "build gate image $DEST_BRANCH branch"
+ container:
+ dockerfile: contrib/gate/Dockerfile
+
+ container:
+ dockerfile: Dockerfile
+
+ script: make install.remote
+
+
# 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:
@@ -389,6 +415,7 @@ testing_task:
- "varlink_api"
- "build_each_commit"
- "build_without_cgo"
+ - "container_image_build"
# Only test build cache-images, if that's what's requested
only_if: >-
@@ -679,6 +706,7 @@ test_build_cache_images_task:
depends_on:
- "gating"
+ - 'container_image_build'
# VMs created by packer are not cleaned up by cirrus, must allow task to complete
auto_cancellation: $CI != "true"
@@ -780,6 +808,7 @@ success_task:
- "varlink_api"
- "build_each_commit"
- "build_without_cgo"
+ - "container_image_build"
- "meta"
- "image_prune"
- "testing"