From 9c0753aa5a3d55b023bb04590c93ce72a6ebf256 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jlebon@redhat.com>
Date: Thu, 27 Jul 2017 09:43:49 -0700
Subject: ci: rename files to new name and bump to f26

Rename the YAML file and its auxiliary files to the newly supported
name and bump tests to use F26.

Closes: #202
Approved by: cgwalters
---
 ci/papr.sh      | 45 +++++++++++++++++++++++++++++++++++++++++++++
 ci/redhat-ci.sh | 47 -----------------------------------------------
 2 files changed, 45 insertions(+), 47 deletions(-)
 create mode 100755 ci/papr.sh
 delete mode 100755 ci/redhat-ci.sh

(limited to 'ci')

diff --git a/ci/papr.sh b/ci/papr.sh
new file mode 100755
index 0000000..94cc81f
--- /dev/null
+++ b/ci/papr.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+
+set -xeuo pipefail
+
+distro=$1
+
+runcontainer() {
+    docker run --rm --env=container=true --env=BWRAP_SUID=${BWRAP_SUID:-} --env CFLAGS="${CFLAGS:-}" --net=host --privileged -v /usr:/host/usr -v $(pwd):/srv/code -w /srv/code $distro ./ci/papr.sh $distro
+}
+
+buildinstall_to_host() {
+
+    yum -y install git autoconf automake libtool make gcc redhat-rpm-config \
+        libcap-devel  'pkgconfig(libselinux)' 'libxslt' 'docbook-style-xsl' \
+        lib{a,ub,t}san /usr/bin/eu-readelf rsync
+
+    echo testing: $(git describe --tags --always --abbrev=42)
+
+    env NOCONFIGURE=1 ./autogen.sh
+    ./configure --prefix=/usr --libdir=/usr/lib64
+    make -j 8
+    tmpd=$(mktemp -d)
+    make install DESTDIR=${tmpd}
+    for san in a t ub; do
+        if eu-readelf -d ${tmpd}/usr/bin/bwrap | grep -q "NEEDED.*lib${san}san"; then
+            for x in /usr/lib64/lib${san}san*.so.*; do
+                install -D $x ${tmpd}${x}
+            done
+        fi
+    done
+    rsync -rlv ${tmpd}/usr/ /host/usr/
+    if ${BWRAP_SUID}; then
+        chmod u+s /host/usr/bin/bwrap
+    fi
+    rm ${tmpd} -rf
+}
+
+if test -z "${container:-}"; then
+    ostree admin unlock
+    useradd bwrap-tester
+    runcontainer
+    runuser -u bwrap-tester env ASAN_OPTIONS=detect_leaks=false ./tests/test-run.sh
+else
+    buildinstall_to_host
+fi
diff --git a/ci/redhat-ci.sh b/ci/redhat-ci.sh
deleted file mode 100755
index 2f6fe16..0000000
--- a/ci/redhat-ci.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-
-set -xeuo pipefail
-
-distro=$1
-
-runcontainer() {
-    docker run --rm --env=container=true --env=BWRAP_SUID=${BWRAP_SUID:-} --env CFLAGS="${CFLAGS:-}" --net=host --privileged -v /usr:/host/usr -v $(pwd):/srv/code -w /srv/code $distro ./ci/redhat-ci.sh $distro
-}
-
-buildinstall_to_host() {
-
-    yum -y install git autoconf automake libtool make gcc redhat-rpm-config \
-        libcap-devel  'pkgconfig(libselinux)' 'libxslt' 'docbook-style-xsl' \
-        lib{a,ub,t}san /usr/bin/eu-readelf
-
-    echo testing: $(git describe --tags --always --abbrev=42)
-
-    env NOCONFIGURE=1 ./autogen.sh
-    ./configure --prefix=/usr --libdir=/usr/lib64
-    make -j 8
-    tmpd=$(mktemp -d)
-    make install DESTDIR=${tmpd}
-    for san in a t ub; do
-        if eu-readelf -d ${tmpd}/usr/bin/bwrap | grep -q "NEEDED.*lib${san}san"; then
-            for x in /usr/lib64/lib${san}san*.so.*; do
-                install -D $x ${tmpd}${x}
-            done
-        fi
-    done
-    rsync -rlv ${tmpd}/usr/ /host/usr/
-    if ${BWRAP_SUID}; then
-        chmod u+s /host/usr/bin/bwrap
-    fi
-    rm ${tmpd} -rf
-}
-
-if test -z "${container:-}"; then
-    ostree admin unlock
-    # Hack until the host tree is updated in rhci
-    rpm -Uvh https://kojipkgs.fedoraproject.org//packages/glibc/2.24/4.fc25/x86_64/{libcrypt-nss,glibc,glibc-common,glibc-all-langpacks}-2.24-4.fc25.x86_64.rpm
-    useradd bwrap-tester
-    runcontainer
-    runuser -u bwrap-tester env ASAN_OPTIONS=detect_leaks=false ./tests/test-run.sh
-else
-    buildinstall_to_host
-fi
-- 
cgit v1.2.1