ci: Use Fedora 29 artifacts

Use Fedora 29 artifacts instead of Fedora 28, since 28 is now
end-of-life.

Also rename `ci/fah28-insttests.sh` -> `ci/fah29-insttests.sh`
and use the https://getfedora.org/atomic_qcow2_latest redirect
URL for the latest Fedora Atomic Host 29 image.

Closes: #1871
Approved by: jlebon
This commit is contained in:
Robert Fairley 2019-06-11 16:38:16 -04:00 committed by Atomic Bot
parent abb173352d
commit 46da9356a7
4 changed files with 35 additions and 36 deletions

View File

@ -4,15 +4,15 @@ branches:
- auto - auto
- try - try
context: FAH28-insttests context: FAH29-insttests
required: false required: false
container: container:
image: registry.fedoraproject.org/fedora:28 image: registry.fedoraproject.org/fedora:29
kvm: true kvm: true
tests: tests:
- ci/fah28-insttests.sh - ci/fah29-insttests.sh
artifacts: artifacts:
- tests/installed/artifacts/ - tests/installed/artifacts/
@ -27,8 +27,8 @@ branches:
- try - try
required: true required: true
container: container:
image: registry.fedoraproject.org/fedora:28 image: registry.fedoraproject.org/fedora:29
context: f28-primary context: f29-primary
env: env:
# We only use -Werror=maybe-uninitialized here with a "fixed" toolchain # We only use -Werror=maybe-uninitialized here with a "fixed" toolchain
CFLAGS: '-fsanitize=undefined -fsanitize-undefined-trap-on-error -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2' CFLAGS: '-fsanitize=undefined -fsanitize-undefined-trap-on-error -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2'
@ -51,10 +51,10 @@ artifacts:
--- ---
# And now the contexts below here are variant container builds # And now the contexts below here are variant container builds
context: f28-rust context: f29-rust
inherit: true inherit: true
container: container:
image: registry.fedoraproject.org/fedora:28 image: registry.fedoraproject.org/fedora:29
env: env:
CONFIGOPTS: '--enable-rust' CONFIGOPTS: '--enable-rust'
CI_PKGS: cargo CI_PKGS: cargo
@ -65,10 +65,10 @@ tests:
--- ---
context: f28-gnutls context: f29-gnutls
inherit: true inherit: true
container: container:
image: registry.fedoraproject.org/fedora:28 image: registry.fedoraproject.org/fedora:29
env: env:
CONFIGOPTS: '--with-crypto=gnutls' CONFIGOPTS: '--with-crypto=gnutls'
CI_PKGS: pkgconfig(gnutls) CI_PKGS: pkgconfig(gnutls)
@ -81,7 +81,7 @@ tests:
inherit: true inherit: true
context: f28-minimal context: f29-minimal
env: env:
CONFIGOPTS: '--without-curl --without-soup --disable-gtk-doc --disable-man CONFIGOPTS: '--without-curl --without-soup --disable-gtk-doc --disable-man
--disable-rust --without-libarchive --without-selinux --without-smack --disable-rust --without-libarchive --without-selinux --without-smack
@ -96,7 +96,7 @@ tests:
inherit: true inherit: true
required: true required: true
context: f28-libsoup context: f29-libsoup
env: env:
CONFIGOPTS: "--without-curl --without-openssl --with-soup" CONFIGOPTS: "--without-curl --without-openssl --with-soup"
@ -109,7 +109,7 @@ tests:
inherit: true inherit: true
required: true required: true
context: f28-introspection-tests context: f29-introspection-tests
env: env:
# ASAN conflicts with introspection testing; # ASAN conflicts with introspection testing;

View File

@ -6,8 +6,8 @@ branches:
- try - try
required: true required: true
container: container:
image: registry.fedoraproject.org/fedora:28 image: registry.fedoraproject.org/fedora:29
context: f28-primary context: f29-primary
env: env:
# We only use -Werror=maybe-uninitialized here with a "fixed" toolchain # We only use -Werror=maybe-uninitialized here with a "fixed" toolchain
CFLAGS: '-fsanitize=undefined -fsanitize-undefined-trap-on-error -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2' CFLAGS: '-fsanitize=undefined -fsanitize-undefined-trap-on-error -fsanitize=address -O2 -Wp,-D_FORTIFY_SOURCE=2'
@ -31,10 +31,10 @@ artifacts:
--- ---
# And now the contexts below here are variant container builds # And now the contexts below here are variant container builds
context: f28-rust context: f29-rust
inherit: true inherit: true
container: container:
image: registry.fedoraproject.org/fedora:28 image: registry.fedoraproject.org/fedora:29
env: env:
CONFIGOPTS: '--enable-rust' CONFIGOPTS: '--enable-rust'
CI_PKGS: cargo CI_PKGS: cargo
@ -45,10 +45,10 @@ tests:
--- ---
context: f28-gnutls context: f29-gnutls
inherit: true inherit: true
container: container:
image: registry.fedoraproject.org/fedora:28 image: registry.fedoraproject.org/fedora:29
env: env:
CONFIGOPTS: '--with-crypto=gnutls' CONFIGOPTS: '--with-crypto=gnutls'
CI_PKGS: pkgconfig(gnutls) CI_PKGS: pkgconfig(gnutls)
@ -61,7 +61,7 @@ tests:
inherit: true inherit: true
context: f28-minimal context: f29-minimal
env: env:
CONFIGOPTS: '--without-curl --without-soup --disable-gtk-doc --disable-man CONFIGOPTS: '--without-curl --without-soup --disable-gtk-doc --disable-man
--disable-rust --without-libarchive --without-selinux --without-smack --disable-rust --without-libarchive --without-selinux --without-smack
@ -76,7 +76,7 @@ tests:
inherit: true inherit: true
required: true required: true
context: f28-libsoup context: f29-libsoup
env: env:
CONFIGOPTS: "--without-curl --without-openssl --with-soup" CONFIGOPTS: "--without-curl --without-openssl --with-soup"
@ -89,7 +89,7 @@ tests:
inherit: true inherit: true
required: true required: true
context: f28-introspection-tests context: f29-introspection-tests
env: env:
# ASAN conflicts with introspection testing; # ASAN conflicts with introspection testing;
@ -108,19 +108,19 @@ branches:
- auto - auto
- try - try
context: f28-flatpak context: f29-flatpak
required: true required: true
# This test case wants an "unprivileged container with bubblewrap", # This test case wants an "unprivileged container with bubblewrap",
# which we don't have right now; so just provision a VM and do a # which we don't have right now; so just provision a VM and do a
# docker --privileged run. # docker --privileged run.
host: host:
distro: fedora/28/atomic distro: fedora/29/atomic
specs: specs:
ram: 4096 # build-bundle is a static delta, which needs RAM right now ram: 4096 # build-bundle is a static delta, which needs RAM right now
tests: tests:
- docker run --rm --privileged -v $(pwd):/srv/code registry.fedoraproject.org/fedora:28 /bin/sh -c "cd /srv/code && ./ci/flatpak.sh" - docker run --rm --privileged -v $(pwd):/srv/code registry.fedoraproject.org/fedora:29 /bin/sh -c "cd /srv/code && ./ci/flatpak.sh"
artifacts: artifacts:
- test-suite.log - test-suite.log
@ -136,16 +136,16 @@ branches:
- auto - auto
- try - try
context: f28-rpmostree context: f29-rpmostree
# XXX: some issues currently failing that need investigating. # XXX: some issues currently failing that need investigating.
required: false required: false
cluster: cluster:
hosts: hosts:
- name: vmcheck - name: vmcheck
distro: fedora/28/atomic distro: fedora/29/atomic
container: container:
image: registry.fedoraproject.org/fedora:28 image: registry.fedoraproject.org/fedora:29
env: env:
HOSTS: vmcheck HOSTS: vmcheck

View File

@ -1,9 +0,0 @@
#!/usr/bin/bash
set -xeuo pipefail
./tests/installed/provision.sh
# TODO: enhance papr to have caching, a bit like https://docs.travis-ci.com/user/caching/
cd tests/installed
# This should be https://getfedora.org/atomic_qcow2_latest but that's broken
curl -Lo fedora-atomic-host.qcow2 https://kojipkgs.fedoraproject.org/compose/twoweek/Fedora-Atomic-28-20180626.0/compose/AtomicHost/x86_64/images/Fedora-AtomicHost-28-20180626.0.x86_64.qcow2
exec env "TEST_SUBJECTS=$(pwd)/fedora-atomic-host.qcow2" ./run.sh

8
ci/fah29-insttests.sh Executable file
View File

@ -0,0 +1,8 @@
#!/usr/bin/bash
set -xeuo pipefail
./tests/installed/provision.sh
# TODO: enhance papr to have caching, a bit like https://docs.travis-ci.com/user/caching/
cd tests/installed
curl -Lo fedora-atomic-host.qcow2 https://getfedora.org/atomic_qcow2_latest
exec env "TEST_SUBJECTS=$(pwd)/fedora-atomic-host.qcow2" ./run.sh