summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorJonathan Lebon <jlebon@redhat.com>2017-07-27 09:43:49 -0700
committerAtomic Bot <atomic-devel@projectatomic.io>2017-08-02 15:47:35 +0000
commit9c0753aa5a3d55b023bb04590c93ce72a6ebf256 (patch)
tree7bdfd8e2183be856171d45da273368f3d24e02bc /ci
parent8f3f0abe76b67e2188bcd67aab48c2323d6b5105 (diff)
downloadbubblewrap-9c0753aa5a3d55b023bb04590c93ce72a6ebf256.tar.gz
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
Diffstat (limited to 'ci')
-rwxr-xr-xci/papr.sh (renamed from ci/redhat-ci.sh)6
1 files changed, 2 insertions, 4 deletions
diff --git a/ci/redhat-ci.sh b/ci/papr.sh
index 2f6fe16..94cc81f 100755
--- a/ci/redhat-ci.sh
+++ b/ci/papr.sh
@@ -5,14 +5,14 @@ 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
+ 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
+ lib{a,ub,t}san /usr/bin/eu-readelf rsync
echo testing: $(git describe --tags --always --abbrev=42)
@@ -37,8 +37,6 @@ buildinstall_to_host() {
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