From a1a5f3ba515e54bad3364ab175d86906d0756044 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Mon, 10 Dec 2018 11:24:57 -0500
Subject: Cirrus: Migrate PAPR testing of F28 to Cirrus

Since the most recent TWO versions of Fedora are officially supported
upstream, both need to be tested.  Implement the concept of a 'prior'
Fedora release in both base-image and cache-image production.  Utilize
the produced cache-image to test libpod.  Remove F28 testing from PAPR.

Much thanks to @baude @giuseppe for help with this.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 .papr.yml | 80 +++++++++++++++++----------------------------------------------
 1 file changed, 21 insertions(+), 59 deletions(-)

(limited to '.papr.yml')

diff --git a/.papr.yml b/.papr.yml
index 9c0096152..ed20c6039 100644
--- a/.papr.yml
+++ b/.papr.yml
@@ -22,33 +22,33 @@ context: "FAH28 - Containerized (Podman in Podman)"
 
 ---
 
- host:
-   distro: centos/7/atomic/smoketested
-   specs:
-      ram: 8192
-      cpus: 4
- extra-repos:
-     - name: epel
-       metalink: https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch
-       gpgcheck: 0
-     - name: cri-o
-       baseurl: https://cbs.centos.org/repos/virt7-container-common-candidate/$basearch/os
-       gpgcheck: 0
-
- required: true
+host:
+  distro: centos/7/atomic/smoketested
+  specs:
+     ram: 8192
+     cpus: 4
+extra-repos:
+    - name: epel
+      metalink: https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch
+      gpgcheck: 0
+    - name: cri-o
+      baseurl: https://cbs.centos.org/repos/virt7-container-common-candidate/$basearch/os
+      gpgcheck: 0
 
- timeout: 90m
+required: true
 
- tests:
-   - CONTAINER_RUNTIME="docker" sh .papr_prepare.sh
+timeout: 90m
 
- artifacts:
-   - build.log
+tests:
+  - CONTAINER_RUNTIME="docker" sh .papr_prepare.sh
 
- context: "CAH 7-smoketested - Containerized (Podman in Docker)"
+artifacts:
+  - build.log
 
----
+context: "CAH 7-smoketested - Containerized (Podman in Docker)"
 
+#---
+#
 #host:
 #  distro: centos/7/cloud
 #  specs:
@@ -95,41 +95,3 @@ context: "FAH28 - Containerized (Podman in Podman)"
 #context: "CentOS 7 Cloud"
 #
 #---
-
-host:
-    distro: fedora/28/cloud
-    specs:
-        ram: 8192
-        cpus: 4
-packages:
-    - btrfs-progs-devel
-    - glib2-devel
-    - glibc-devel
-    - glibc-static
-    - git
-    - go-md2man
-    - gpgme-devel
-    - libassuan-devel
-    - libgpg-error-devel
-    - libseccomp-devel
-    - libselinux-devel
-    - ostree-devel
-    - pkgconfig
-    - make
-    - nc
-    - go-compilers-golang-compiler
-    - podman
-    - python3-varlink
-    - python3-dateutil
-    - python3-psutil
-    - https://kojipkgs.fedoraproject.org//packages/runc/1.0.0/54.dev.git00dc700.fc28/x86_64/runc-1.0.0-54.dev.git00dc700.fc28.x86_64.rpm
-
-tests:
-    - sed 's/^expand-check.*/expand-check=0/g' -i /etc/selinux/semanage.conf
-    - yum -y reinstall container-selinux
-    - sh .papr.sh -b -i -t -p
-
-required: false
-
-timeout: 90m
-context: "Fedora 28 Cloud"
-- 
cgit v1.2.3-54-g00ecf