diff options
| author | Jonathan Lebon <jlebon@redhat.com> | 2017-07-27 09:43:49 -0700 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-08-02 15:47:35 +0000 |
| commit | 9c0753aa5a3d55b023bb04590c93ce72a6ebf256 (patch) | |
| tree | 7bdfd8e2183be856171d45da273368f3d24e02bc | |
| parent | 8f3f0abe76b67e2188bcd67aab48c2323d6b5105 (diff) | |
| download | bubblewrap-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
| -rw-r--r-- | .papr.yml (renamed from .redhat-ci.yml) | 9 | ||||
| -rwxr-xr-x | ci/papr.sh (renamed from ci/redhat-ci.sh) | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/.redhat-ci.yml b/.papr.yml index 81fda47..822b8a7 100644 --- a/.redhat-ci.yml +++ b/.papr.yml @@ -10,7 +10,7 @@ host: distro: centos/7/atomic tests: - - env BWRAP_SUID=true ./ci/redhat-ci.sh centos:7 + - env BWRAP_SUID=true ./ci/papr.sh centos:7 timeout: 30m @@ -18,8 +18,11 @@ timeout: 30m inherit: true -context: f25-sanitizer +host: + distro: fedora/26/atomic + +context: f26-sanitizer required: true tests: - - env CFLAGS='-g -Og -fsanitize=undefined -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2' ./ci/redhat-ci.sh fedora:25 + - env CFLAGS='-g -Og -fsanitize=undefined -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2' ./ci/papr.sh registry.fedoraproject.org/fedora:26 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 |