From 97ecd21b59fd6cd3b45cf1742f60eff6d32eef3d Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Wed, 15 Apr 2020 12:01:23 -0400
Subject: Cirrus: Unify package installation

Also, test-build critical container images depended upon for
CI-purposes.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 .cirrus.yml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to '.cirrus.yml')

diff --git a/.cirrus.yml b/.cirrus.yml
index 8ae1bb2f2..66d9c71d1 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -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"
 
     allow_failures: $CI == 'true'
 
@@ -681,6 +708,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"
@@ -782,6 +810,7 @@ success_task:
         - "varlink_api"
         - "build_each_commit"
         - "build_without_cgo"
+        - "container_image_build"
         - "meta"
         - "image_prune"
         - "testing"
-- 
cgit v1.2.3-54-g00ecf


From 62accbc565cc3bd71b910c8854c4d53dfca7379e Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Wed, 22 Apr 2020 14:01:06 -0400
Subject: Cirrus: Utilize new VM images

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.cirrus.yml')

diff --git a/.cirrus.yml b/.cirrus.yml
index 66d9c71d1..7a5550eda 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}"
-- 
cgit v1.2.3-54-g00ecf