From 235f2945bf26aa586c5fa404a78528ab249d3d95 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jlebon@redhat.com>
Date: Thu, 5 Oct 2017 21:14:11 +0000
Subject: [PATCH] ci: don't use CentOS Alpha anymore

It's no longer being built and is now older than the latest CentOS AH
release. This should help us no longer see messages like:

(rpm-ostree pkg-add:5662): GLib-CRITICAL **: g_variant_dict_lookup:
assertion 'is_valid_dict (dict)' failed

which happen because in #1034, we started using `G_VARIANT_DICT_INIT`,
whose special magic values only make sense in glib2 >= 2.50. (The alpha
image stopped at 2.46).

Saw this while debugging #1035.

Closes: #1040
Approved by: cgwalters
---
 .papr.yml   | 6 +++---
 ci/build.sh | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.papr.yml b/.papr.yml
index 16453a014b..20518d98f8 100644
--- a/.papr.yml
+++ b/.papr.yml
@@ -49,11 +49,11 @@ required: true
 cluster:
   hosts:
     - name: vmcheck1
-      distro: centos/7/atomic/alpha
+      distro: centos/7/atomic
     - name: vmcheck2
-      distro: centos/7/atomic/alpha
+      distro: centos/7/atomic
     - name: vmcheck3
-      distro: centos/7/atomic/alpha
+      distro: centos/7/atomic
   container:
     # FIXME remove this version binding when rpm-md repos are updated
     image: registry.centos.org/centos/centos:7.3.1611
diff --git a/ci/build.sh b/ci/build.sh
index 62a7eceef7..c523540cd3 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -34,4 +34,8 @@ fi
 adduser testuser
 
 export LSAN_OPTIONS=verbosity=1:log_threads=1
-build --enable-installed-tests --enable-gtk-doc
+BWRAP=/usr/bin/bwrap
+if [ "$id" == centos ]; then
+  BWRAP=/usr/lib64/rpm-ostree/bwrap
+fi
+build --enable-installed-tests --enable-gtk-doc --with-bubblewrap=$BWRAP