diff options
| author | Jonathan Lebon <jlebon@redhat.com> | 2016-11-08 21:37:43 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2016-11-09 17:35:40 +0000 |
| commit | 39e7293e3f9a143c42426cffceaf15f576303d5f (patch) | |
| tree | f8e592132073452823435f961506b912bbb21f19 | |
| parent | 24ac4ff190a96de47fab73d81c257f089c0e2020 (diff) | |
| download | ostree-39e7293e3f9a143c42426cffceaf15f576303d5f.tar.gz | |
.redhat-ci.yml: use new build key
This allows us to more concisely separate building from testing, which
in turn gives us a nicer inheritance pattern in our case.
See also: https://github.com/jlebon/redhat-ci/issues/11
Closes: #569
Approved by: cgwalters
| -rw-r--r-- | .redhat-ci.Dockerfile | 2 | ||||
| -rw-r--r-- | .redhat-ci.yml | 34 |
2 files changed, 20 insertions, 16 deletions
diff --git a/.redhat-ci.Dockerfile b/.redhat-ci.Dockerfile index 304563ef..f1a41299 100644 --- a/.redhat-ci.Dockerfile +++ b/.redhat-ci.Dockerfile @@ -9,6 +9,8 @@ RUN dnf install -y \ fuse \ gjs \ parallel \ + clang \ + libubsan \ gnome-desktop-testing \ redhat-rpm-config \ elfutils \ diff --git a/.redhat-ci.yml b/.redhat-ci.yml index f2a0cfe9..9994aa10 100644 --- a/.redhat-ci.yml +++ b/.redhat-ci.yml @@ -6,20 +6,24 @@ branches: container: image: projectatomic/ostree-tester +# XXX: we can wipe this off once a newer image is built with +# it already included packages: - libubsan +env: + CFLAGS: '-fsanitize=undefined' + +build: + config-opts: > + --prefix=/usr + --libdir=/usr/lib64 + --enable-installed-tests + --enable-gtk-doc + tests: - - sh autogen.sh - --prefix=/usr - --libdir=/usr/lib64 - --enable-installed-tests - --enable-gtk-doc - CFLAGS='-fsanitize=undefined' - - make -j2 - make syntax-check - make check - - make install - gnome-desktop-testing-runner ostree - sudo --user=testuser gnome-desktop-testing-runner ostree @@ -32,17 +36,15 @@ artifacts: inherit: true +# XXX: ditto packages: - clang -tests: - - sh autogen.sh - --prefix=/usr - --libdir=/usr/lib64 - --enable-installed-tests - --enable-gtk-doc - - make -j2 CC=clang CFLAGS='-Werror=unused-variable' - context: Clang +env: + CC: 'clang' + CFLAGS: '-Werror=unused-variable' + +tests: artifacts: |