From 40f01d56aba23045d2c5077b2ea4e9f7fdfa3249 Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Tue, 12 Dec 2017 14:39:44 -0600
Subject: .papr.yml

Add CNI networking packages to our test hosts. Also
upgrade to f27 where possible

Signed-off-by: baude <bbaude@redhat.com>

Closes: #127
Approved by: baude
---
 .papr.sh  | 12 ++++++++----
 .papr.yml |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.papr.sh b/.papr.sh
index a1e1fe1db..2e2b43f7a 100755
--- a/.papr.sh
+++ b/.papr.sh
@@ -2,7 +2,7 @@
 set -xeuo pipefail
 
 DIST=$(cat /etc/redhat-release  | awk '{print $1}')
-IMAGE=registry.fedoraproject.org/fedora:26
+IMAGE=registry.fedoraproject.org/fedora:27
 PACKAGER=dnf
 if [[ ${DIST} != "Fedora" ]]; then
     PACKAGER=yum
@@ -10,11 +10,16 @@ if [[ ${DIST} != "Fedora" ]]; then
 fi
 
 if test -z "${INSIDE_CONTAINER:-}"; then
+    source /etc/os-release
+
     if [ -f /run/ostree-booted ]; then
 
         # by default, the root LV on AH is only 3G, but we need a
-        # bit more for our tests
-        lvresize -r -L +4G atomicos/root
+        # bit more for our tests. Only do resize on centos and fedora
+        # versions less than 27
+        if [[ "$VERSION_ID" != "27" ]]; then
+            lvresize -r -L +4G atomicos/root
+        fi
 
         if [ ! -e /var/tmp/ostree-unlock-ovl.* ]; then
             ostree admin unlock
@@ -24,7 +29,6 @@ if test -z "${INSIDE_CONTAINER:-}"; then
     systemctl restart docker
 
     # somewhat mimic the spec conditional
-    source /etc/os-release
     if [ "$ID" == fedora ]; then
       PYTHON=python3
     else
diff --git a/.papr.yml b/.papr.yml
index 1b079c016..ad94cce0b 100644
--- a/.papr.yml
+++ b/.papr.yml
@@ -4,12 +4,11 @@ branches:
   - try
 
 host:
-  distro: fedora/26/atomic
+  distro: fedora/27/atomic
   specs:
      ram: 8192
 
 required: true
-
 timeout: 45m
 
 tests:
@@ -17,6 +16,7 @@ tests:
 
 packages:
     - bats
+    - containernetworking-cni
 ---
 
 inherit: true
-- 
cgit v1.2.3-54-g00ecf