From c574da6d973a235b97e2c2fe9bc6e065da226a8c Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jlebon@redhat.com>
Date: Wed, 15 Nov 2017 20:01:26 +0000
Subject: papr: auto-detect image tag to use and bump to f27

Current PAPR tests are failing because we're using an outdated image
tag. Switch to auto-magically determining which image tag to use based
on the branch the PR we're running in is targeting, which lets us not
have to worry about the tag version becoming stale again. This is
similar to what the containerized tests from `aos-cd-jobs` are doing
(i.e. use `git describe --abbrev=0` in the target branch to determine
the image tag to use).

Also bump to the brand new f27 release, which allows us to drop the
temporary workaround for the glibc/libsolv bug.
---
 .papr.yml | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

(limited to '.papr.yml')

diff --git a/.papr.yml b/.papr.yml
index 119dd5fcf..2b30f84fc 100644
--- a/.papr.yml
+++ b/.papr.yml
@@ -14,35 +14,28 @@
 cluster:
   hosts:
     - name: ocp-master
-      distro: fedora/26/atomic
+      distro: fedora/27/atomic
       specs:
         ram: 4096
     - name: ocp-node1
-      distro: fedora/26/atomic
+      distro: fedora/27/atomic
     - name: ocp-node2
-      distro: fedora/26/atomic
+      distro: fedora/27/atomic
   container:
-    image: registry.fedoraproject.org/fedora:26
+    image: registry.fedoraproject.org/fedora:27
 
-# temp workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1483553
-#packages:
-#  - gcc
-#  - python-pip
-#  - python-devel
-#  - libffi-devel
-#  - openssl-devel
-#  - redhat-rpm-config
+packages:
+  - gcc
+  - git
+  - python-pip
+  - python-devel
+  - libffi-devel
+  - openssl-devel
+  - redhat-rpm-config
 
-context: 'fedora/26/atomic'
-
-env:
-  OPENSHIFT_IMAGE_TAG: v3.6.0
+context: 'fedora/27/atomic'
 
 tests:
-  # temp workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1483553
-  - if (dnf distro-sync -y || :) |& grep -q -e BDB1539; then
-    rpm --rebuilddb; dnf distro-sync;
-    fi; dnf install -y gcc python-pip python-devel libffi-devel openssl-devel redhat-rpm-config
   - ./.papr.sh
 
 artifacts:
-- 
cgit v1.2.1