ci/papr: Update to F26

In particular F25AH will stop getting updates.

Closes: #1012
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-07-18 05:59:04 -04:00 committed by Atomic Bot
parent 47a54bf876
commit 96e49a67f9
1 changed files with 13 additions and 12 deletions

View File

@ -4,10 +4,10 @@ branches:
- try - try
required: true required: true
context: f25-primary context: f26-primary
container: container:
image: registry.fedoraproject.org/fedora:25 image: registry.fedoraproject.org/fedora:26
packages: packages:
- git - git
@ -50,10 +50,10 @@ tests:
--- ---
context: f25-rust context: f26-rust
inherit: true inherit: true
container: container:
image: registry.fedoraproject.org/fedora:25 image: registry.fedoraproject.org/fedora:26
packages: packages:
- cargo - cargo
env: env:
@ -67,7 +67,7 @@ tests:
inherit: true inherit: true
context: f25-experimental-api context: f26-experimental-api
env: env:
CONFIGOPTS: '--enable-experimental-api' CONFIGOPTS: '--enable-experimental-api'
@ -79,7 +79,7 @@ tests:
inherit: true inherit: true
required: true required: true
context: f25-curl-openssl context: f26-curl-openssl
packages: packages:
- pkgconfig(libcurl) - pkgconfig(libcurl)
@ -99,21 +99,22 @@ branches:
- auto - auto
- try - try
context: f25ah-insttest context: f26ah-insttest
required: false required: false
cluster: cluster:
hosts: hosts:
- name: vmcheck - name: vmcheck
distro: fedora/25/atomic distro: fedora/26/atomic
container: container:
image: registry.fedoraproject.org/fedora:25 image: registry.fedoraproject.org/fedora:26
# Copy the build from the container to the host; ideally down the line # Copy the build from the container to the host; ideally down the line
# this is installing an RPM via https://github.com/jlebon/redhat-ci/issues/10 # this is installing an RPM via https://github.com/jlebon/redhat-ci/issues/10
tests: tests:
- ci/build.sh - ci/build.sh
- make install DESTDIR=$(pwd)/insttree - make install DESTDIR=$(pwd)/insttree
- yum -y install rsync
- rsync -rl -e 'ssh -o User=root' . vmcheck:ostree/ - rsync -rl -e 'ssh -o User=root' . vmcheck:ostree/
- ssh root@vmcheck './ostree/tests/installed/fah-prep.sh && ostree admin unlock && rsync -rlv ./ostree/insttree/usr/ /usr/ && ./ostree/tests/installed/run.sh' - ssh root@vmcheck './ostree/tests/installed/fah-prep.sh && ostree admin unlock && rsync -rlv ./ostree/insttree/usr/ /usr/ && ./ostree/tests/installed/run.sh'
@ -125,19 +126,19 @@ branches:
- auto - auto
- try - try
context: f25-flatpak context: f26-flatpak
required: false required: false
# 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/25/atomic distro: fedora/26/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:25 /bin/sh -c "cd /srv/code && ./ci/flatpak.sh" - docker run --rm --privileged -v $(pwd):/srv/code registry.fedoraproject.org/fedora:26 /bin/sh -c "cd /srv/code && ./ci/flatpak.sh"
artifacts: artifacts:
- test-suite.log - test-suite.log