From 3c916ec4e2d519a3889a8c46217c1187dea27efe Mon Sep 17 00:00:00 2001
From: Steve Milner <smilner@redhat.com>
Date: Tue, 19 Sep 2017 09:56:52 -0400
Subject: papr: Use Fedora 26

Signed-off-by: Steve Milner <smilner@redhat.com>
---
 .papr.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to '.papr.yml')

diff --git a/.papr.yml b/.papr.yml
index 6658720e4..f7d4b223f 100644
--- a/.papr.yml
+++ b/.papr.yml
@@ -14,13 +14,13 @@
 cluster:
   hosts:
     - name: ocp-master
-      distro: fedora/25/atomic
+      distro: fedora/26/atomic
     - name: ocp-node1
-      distro: fedora/25/atomic
+      distro: fedora/26/atomic
     - name: ocp-node2
-      distro: fedora/25/atomic
+      distro: fedora/26/atomic
   container:
-    image: fedora:25
+    image: registry.fedoraproject.org/fedora:26
 
 packages:
   - gcc
@@ -30,7 +30,7 @@ packages:
   - openssl-devel
   - redhat-rpm-config
 
-context: 'fedora/25/atomic'
+context: 'fedora/26/atomic'
 
 env:
   OPENSHIFT_IMAGE_TAG: v3.6.0
-- 
cgit v1.2.3


From 67a35983887e20764210e745d1e672991d4ea556 Mon Sep 17 00:00:00 2001
From: Steve Milner <smilner@redhat.com>
Date: Tue, 19 Sep 2017 10:04:16 -0400
Subject: papr: Workaround for RHBZ#1483553

Work originally done by @jlebon plus a bump up in RAM.
---
 .papr.yml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to '.papr.yml')

diff --git a/.papr.yml b/.papr.yml
index f7d4b223f..119dd5fcf 100644
--- a/.papr.yml
+++ b/.papr.yml
@@ -15,6 +15,8 @@ cluster:
   hosts:
     - name: ocp-master
       distro: fedora/26/atomic
+      specs:
+        ram: 4096
     - name: ocp-node1
       distro: fedora/26/atomic
     - name: ocp-node2
@@ -22,13 +24,14 @@ cluster:
   container:
     image: registry.fedoraproject.org/fedora:26
 
-packages:
-  - gcc
-  - python-pip
-  - python-devel
-  - libffi-devel
-  - openssl-devel
-  - redhat-rpm-config
+# 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
 
 context: 'fedora/26/atomic'
 
@@ -36,6 +39,10 @@ env:
   OPENSHIFT_IMAGE_TAG: v3.6.0
 
 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.3