ci: Bump to f29
Better late than never! Closes: #1787 Approved by: cgwalters
This commit is contained in:
Jonathan Lebon
Atomic Bot
parent
e90d0ed98e
commit
4ae3b174f5
34
.papr.yml
34
.papr.yml
@ -3,11 +3,11 @@ branches:
|
||||
- auto
|
||||
- try
|
||||
|
||||
context: f28-codestyle
|
||||
context: f29-codestyle
|
||||
|
||||
required: true
|
||||
container:
|
||||
image: registry.fedoraproject.org/fedora:28
|
||||
image: registry.fedoraproject.org/fedora:29
|
||||
|
||||
tests:
|
||||
- ci/ci-commitmessage-submodules.sh
|
||||
@ -33,19 +33,19 @@ timeout: 60m
|
||||
|
||||
---
|
||||
|
||||
context: f28-primary
|
||||
context: f29-primary
|
||||
inherit: true
|
||||
|
||||
cluster:
|
||||
hosts:
|
||||
- name: vmcheck1
|
||||
distro: fedora/28/atomic
|
||||
distro: fedora/29/atomic
|
||||
- name: vmcheck2
|
||||
distro: fedora/28/atomic
|
||||
distro: fedora/29/atomic
|
||||
- name: vmcheck3
|
||||
distro: fedora/28/atomic
|
||||
distro: fedora/29/atomic
|
||||
container:
|
||||
image: registry.fedoraproject.org/fedora:28
|
||||
image: registry.fedoraproject.org/fedora:29
|
||||
|
||||
env:
|
||||
HOSTS: vmcheck1 vmcheck2 vmcheck3
|
||||
@ -74,9 +74,9 @@ branches:
|
||||
- auto
|
||||
- try
|
||||
|
||||
# NB: when bumping 28 here, also bump fedora.repo, and compose script
|
||||
# NB: when bumping 29 here, also bump compose script
|
||||
|
||||
context: f28-compose1
|
||||
context: f29-compose1
|
||||
|
||||
build: false
|
||||
|
||||
@ -88,7 +88,7 @@ required: true
|
||||
# which we don't have right now; so just provision a VM and do a
|
||||
# docker --privileged run.
|
||||
host:
|
||||
distro: fedora/28/atomic
|
||||
distro: fedora/29/atomic
|
||||
# Compose tests are slow and should be parallelized
|
||||
specs:
|
||||
cpus: 4
|
||||
@ -105,7 +105,7 @@ tests:
|
||||
-e RPMOSTREE_COMPOSE_TEST_USE_REPOS=/etc/yum.repos.d.host
|
||||
-v /etc/yum.repos.d:/etc/yum.repos.d.host:ro
|
||||
-v $(pwd):/srv/code -w /srv/code
|
||||
registry.fedoraproject.org/fedora:28 /bin/sh -c
|
||||
registry.fedoraproject.org/fedora:29 /bin/sh -c
|
||||
"cp /etc/yum.repos.d.host/* /etc/yum.repos.d/ && ./ci/build.sh && make install && ./tests/compose"
|
||||
|
||||
artifacts:
|
||||
@ -114,7 +114,7 @@ artifacts:
|
||||
---
|
||||
|
||||
inherit: true
|
||||
context: f28-compose2
|
||||
context: f29-compose2
|
||||
env:
|
||||
RPMOSTREE_COMPOSE_TEST_FILTER: even
|
||||
|
||||
@ -125,21 +125,21 @@ branches:
|
||||
- auto
|
||||
- try
|
||||
|
||||
context: f28-ex-container
|
||||
context: f29-ex-container
|
||||
build: false
|
||||
timeout: 30m
|
||||
required: false
|
||||
|
||||
# See the f28-compose context for why we do things this way.
|
||||
# See the f29-compose context for why we do things this way.
|
||||
host:
|
||||
distro: fedora/28/atomic
|
||||
distro: fedora/29/atomic
|
||||
|
||||
tests:
|
||||
- docker run --privileged --rm
|
||||
-e RPMOSTREE_COMPOSE_TEST_USE_REPOS=/etc/yum.repos.d.host
|
||||
-v /etc/yum.repos.d:/etc/yum.repos.d.host:ro
|
||||
-v $(pwd):/srv/code -w /srv/code
|
||||
registry.fedoraproject.org/fedora:28 /bin/sh -c
|
||||
registry.fedoraproject.org/fedora:29 /bin/sh -c
|
||||
"cp /etc/yum.repos.d.host/* /etc/yum.repos.d/ && ./ci/build.sh && make install && adduser unpriv && setfacl -m u:unpriv:rwX . && runuser -u unpriv ./tests/ex-container"
|
||||
|
||||
artifacts:
|
||||
@ -157,7 +157,7 @@ timeout: 30m
|
||||
|
||||
required: true
|
||||
container:
|
||||
image: registry.fedoraproject.org/fedora:28
|
||||
image: registry.fedoraproject.org/fedora:29
|
||||
|
||||
env:
|
||||
# this corresponds to the DTS rustc version we want to support
|
||||
|
||||
@ -9,7 +9,7 @@ dn=$(dirname $0)
|
||||
# Use the latest ostree by default
|
||||
id=$(. /etc/os-release && echo $ID)
|
||||
version_id=$(. /etc/os-release && echo $VERSION_ID)
|
||||
if [ "$id" == fedora ] && [ "$version_id" == 28 ]; then
|
||||
if [ "$id" == fedora ] && [ "$version_id" == 29 ]; then
|
||||
echo -e '[fahc]\nmetadata_expire=1m\nbaseurl=https://ci.centos.org/artifacts/sig-atomic/fahc/rdgo/build/\ngpgcheck=0\n' > /etc/yum.repos.d/fahc.repo
|
||||
# Until we fix https://github.com/rpm-software-management/libdnf/pull/149
|
||||
excludes='exclude=ostree ostree-libs ostree-grub2 rpm-ostree'
|
||||
|
||||
@ -4,7 +4,7 @@ set -xeuo pipefail
|
||||
|
||||
dn=$(cd $(dirname $0) && pwd)
|
||||
. ${dn}/libcomposetest.sh
|
||||
releasever=28
|
||||
releasever=29
|
||||
|
||||
# specifying the key but neither automatic_version_prefix nor
|
||||
# --add-metadata-string should cause no mutation
|
||||
|
||||
@ -36,7 +36,7 @@ do_commit2rojig() {
|
||||
echo "$(date): finished commit2rojig"
|
||||
}
|
||||
do_commit2rojig ${rev}
|
||||
test -f rojig-output/x86_64/fedora-atomic-host-42.0-1.fc28.x86_64.rpm
|
||||
test -f rojig-output/x86_64/fedora-atomic-host-42.0-1.fc29.x86_64.rpm
|
||||
|
||||
ostree --repo=rojig-unpack-repo init --mode=bare-user
|
||||
echo 'fsync=false' >> rojig-unpack-repo/config
|
||||
@ -83,7 +83,7 @@ assert_file_has_content test-newpkg-list.txt 'test-newpkg-1.0-1.x86_64'
|
||||
|
||||
# Rojig version 42.1
|
||||
do_commit2rojig ${newrev}
|
||||
path=rojig-output/x86_64/fedora-atomic-host-42.1-1.fc28.x86_64.rpm
|
||||
path=rojig-output/x86_64/fedora-atomic-host-42.1-1.fc29.x86_64.rpm
|
||||
rpm -qp --requires ${path} > requires.txt
|
||||
assert_file_has_content requires.txt 'glibc(.*) = '
|
||||
assert_file_has_content requires.txt 'systemd(.*) = '
|
||||
|
||||
@ -19,7 +19,7 @@ runcompose() {
|
||||
|
||||
runcompose
|
||||
test -f treecompose.json
|
||||
test -f rojig-repo/x86_64/fedora-atomic-host-42-1.fc28.x86_64.rpm
|
||||
test -f rojig-repo/x86_64/fedora-atomic-host-42-1.fc29.x86_64.rpm
|
||||
echo "ok rojig ♲📦 initial"
|
||||
|
||||
runcompose
|
||||
@ -29,5 +29,5 @@ echo "ok rojig no changes"
|
||||
pysetjsonmember "documentation" 'False'
|
||||
runcompose
|
||||
test -f treecompose.json
|
||||
test -f rojig-repo/x86_64/fedora-atomic-host-42.1-1.fc28.x86_64.rpm
|
||||
test -f rojig-repo/x86_64/fedora-atomic-host-42.1-1.fc29.x86_64.rpm
|
||||
echo "ok rojig dropped docs"
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
"license": "MIT",
|
||||
"summary": "Fedora Atomic Host"
|
||||
},
|
||||
"releasever": "28",
|
||||
"releasever": "29",
|
||||
|
||||
"repos": ["fedora", "updates"],
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ ref=bash
|
||||
packages=coreutils;bash;
|
||||
selinux=false
|
||||
repos=fedora;
|
||||
releasever=28
|
||||
releasever=29
|
||||
EOF
|
||||
|
||||
rpm-ostree ex container assemble bash.conf
|
||||
@ -27,7 +27,7 @@ ref=bash-nodocs
|
||||
packages=coreutils;bash;
|
||||
selinux=false
|
||||
repos=fedora;
|
||||
releasever=28
|
||||
releasever=29
|
||||
documentation=false;
|
||||
EOF
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ ref=httpd
|
||||
packages=httpd;
|
||||
selinux=false
|
||||
repos=fedora;
|
||||
releasever=28
|
||||
releasever=29
|
||||
EOF
|
||||
|
||||
# This one has non-root ownership in some of the dependencies, but we shouldn't
|
||||
|
||||
@ -31,25 +31,26 @@ if test "${osid}" != 'ID=fedora'; then
|
||||
fi
|
||||
|
||||
# Test that we can override the kernel. For ease of testing
|
||||
# I just picked the "gold" F28 kernel.
|
||||
# I just picked the "gold" F29 kernel.
|
||||
current=$(vm_get_booted_csum)
|
||||
vm_cmd rpm-ostree db list "${current}" > current-dblist.txt
|
||||
assert_not_file_has_content current-dblist.txt 'kernel-4.16.3-301.fc28'
|
||||
kernel_release=4.18.16-300.fc29.x86_64
|
||||
assert_not_file_has_content current-dblist.txt $kernel_release
|
||||
grep -E '^ kernel-4' current-dblist.txt | sed -e 's,^ *,,' > orig-kernel.txt
|
||||
assert_streq "$(wc -l < orig-kernel.txt)" "1"
|
||||
orig_kernel=$(cat orig-kernel.txt)
|
||||
URL_ROOT="https://dl.fedoraproject.org/pub/fedora/linux/releases/28/Everything/x86_64/os/Packages/k"
|
||||
URL_ROOT="https://dl.fedoraproject.org/pub/fedora/linux/releases/29/Everything/x86_64/os/Packages/k"
|
||||
vm_rpmostree override replace \
|
||||
"$URL_ROOT/kernel{,-core,-modules{,-extra}}-4.16.3-301.fc28.x86_64.rpm"
|
||||
"$URL_ROOT/kernel{,-core,-modules{,-extra}}-$kernel_release.rpm"
|
||||
new=$(vm_get_pending_csum)
|
||||
vm_cmd rpm-ostree db list "${new}" > new-dblist.txt
|
||||
assert_file_has_content_literal new-dblist.txt 'kernel-4.16.3-301.fc28'
|
||||
assert_file_has_content_literal new-dblist.txt $kernel_release
|
||||
if grep -q -F -e "${orig_kernel}" new-dblist.txt; then
|
||||
fatal "Found kernel: ${line}"
|
||||
fi
|
||||
newroot=$(vm_get_deployment_root 0)
|
||||
vm_cmd find ${newroot}/usr/lib/modules -maxdepth 1 -type d > modules-dirs.txt
|
||||
assert_streq "$(wc -l < modules-dirs.txt)" "2"
|
||||
assert_file_has_content_literal modules-dirs.txt '4.16.3-301.fc28'
|
||||
assert_file_has_content_literal modules-dirs.txt $kernel_release
|
||||
|
||||
echo "ok override kernel"
|
||||
|
||||
@ -61,6 +61,6 @@ vm_assert_status_jq '.deployments[0].origin|startswith("rojig://fahc:fedora-atom
|
||||
echo "ok rojig client deploy"
|
||||
|
||||
vm_cmd rpm-ostree status > status.txt
|
||||
assert_file_has_content_literal status.txt 'fahc:fedora-atomic-host-'${prev_version}'-1.fc28.x86_64'
|
||||
assert_file_has_content_literal status.txt 'fahc:fedora-atomic-host-'${prev_version}'-1.fc29.x86_64'
|
||||
|
||||
echo "ok rojig status"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user