From 592d6052b9c376462793d488a3f372a57efa4208 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Sat, 19 May 2018 10:48:18 -0400 Subject: [PATCH] ci: Bump to F28 Closes: #1358 Approved by: cgwalters --- .papr.yml | 39 ++++++++++++------- ci/build-check.sh | 4 ++ tests/compose-tests/test-mutate-os-release.sh | 2 +- tests/composedata/fedora-base.json | 2 +- tests/ex-container-tests/test-bash.sh | 4 +- tests/ex-container-tests/test-httpd.sh | 2 +- tests/vmcheck/test-override-kernel.sh | 19 ++++----- 7 files changed, 43 insertions(+), 29 deletions(-) diff --git a/.papr.yml b/.papr.yml index d04ad02d..40d5e00e 100644 --- a/.papr.yml +++ b/.papr.yml @@ -3,10 +3,11 @@ branches: - auto - try -context: f27-codestyle +context: f28-codestyle + required: true container: - image: registry.fedoraproject.org/fedora:27 + image: registry.fedoraproject.org/fedora:28 tests: - ci/ci-commitmessage-submodules.sh @@ -14,19 +15,27 @@ tests: --- -context: f27-primary +context: f28-primary inherit: true cluster: hosts: - name: vmcheck1 - distro: fedora/27/atomic + distro: fedora/28/atomic + # XXX: use updates ref for now so that we can use GA kernel in + # test-override-kernel.sh -- remove once another f28 AH update comes out + ostree: + branch: fedora/28/x86_64/updates/atomic-host - name: vmcheck2 - distro: fedora/27/atomic + distro: fedora/28/atomic + ostree: + branch: fedora/28/x86_64/updates/atomic-host - name: vmcheck3 - distro: fedora/27/atomic + distro: fedora/28/atomic + ostree: + branch: fedora/28/x86_64/updates/atomic-host container: - image: registry.fedoraproject.org/fedora:27 + image: registry.fedoraproject.org/fedora:28 env: HOSTS: vmcheck1 vmcheck2 vmcheck3 @@ -98,9 +107,9 @@ branches: - auto - try -# NB: when bumping 27 here, also bump fedora.repo, and compose script +# NB: when bumping 28 here, also bump fedora.repo, and compose script -context: f27-compose +context: f28-compose build: false @@ -112,7 +121,7 @@ required: true # which we don't have right now; so just provision a VM and do a # docker --privileged run. host: - distro: fedora/27/atomic + distro: fedora/28/atomic # Compose tests are slow and should be parallelized specs: cpus: 4 @@ -125,7 +134,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:27 /bin/sh -c + registry.fedoraproject.org/fedora:28 /bin/sh -c "./ci/build.sh && make install && ./tests/compose" artifacts: @@ -138,21 +147,21 @@ branches: - auto - try -context: f27-ex-container +context: f28-ex-container build: false timeout: 30m required: false -# See the f27-compose context for why we do things this way. +# See the f28-compose context for why we do things this way. host: - distro: fedora/27/atomic + distro: fedora/28/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:27 /bin/sh -c + registry.fedoraproject.org/fedora:28 /bin/sh -c "./ci/build.sh && make install && adduser unpriv && setfacl -m u:unpriv:rwX . && runuser -u unpriv ./tests/ex-container" artifacts: diff --git a/ci/build-check.sh b/ci/build-check.sh index 46606b2a..5e00e282 100755 --- a/ci/build-check.sh +++ b/ci/build-check.sh @@ -15,6 +15,9 @@ make install # build.sh) because it doesn't support -Wno-error=macro-redefined, (and neither # does clang on CentOS). Anyway, all we want is at least one clang run. if test -x /usr/bin/clang; then + if grep -q -e 'static inline.*_GLIB_AUTOPTR_LIST_FUNC_NAME' /usr/include/glib-2.0/glib/gmacros.h; then + echo 'Skipping clang check, see https://bugzilla.gnome.org/show_bug.cgi?id=796346' + else # Except unused-command-line-argument: # error: argument unused during compilation: '-specs=/usr/lib/rpm/redhat/redhat-hardened -cc1' [-Werror,-Wunused-command-line-argument] # Except for macro-redefined: @@ -25,4 +28,5 @@ if test -x /usr/bin/clang; then export CC=clang git clean -dfx && git submodule foreach git clean -dfx build ${CONFIGOPTS:-} + fi fi diff --git a/tests/compose-tests/test-mutate-os-release.sh b/tests/compose-tests/test-mutate-os-release.sh index b2f231c2..50ea5e89 100755 --- a/tests/compose-tests/test-mutate-os-release.sh +++ b/tests/compose-tests/test-mutate-os-release.sh @@ -4,7 +4,7 @@ set -xeuo pipefail dn=$(cd $(dirname $0) && pwd) . ${dn}/libcomposetest.sh -releasever=27 +releasever=28 # specifying the key but neither automatic_version_prefix nor # --add-metadata-string should cause no mutation diff --git a/tests/composedata/fedora-base.json b/tests/composedata/fedora-base.json index fd7e62f1..e5dc691c 100644 --- a/tests/composedata/fedora-base.json +++ b/tests/composedata/fedora-base.json @@ -1,6 +1,6 @@ { "ref": "fedora/stable/${basearch}", - "releasever": "27", + "releasever": "28", "repos": ["fedora", "updates"], diff --git a/tests/ex-container-tests/test-bash.sh b/tests/ex-container-tests/test-bash.sh index 304dfe84..f21f56cd 100755 --- a/tests/ex-container-tests/test-bash.sh +++ b/tests/ex-container-tests/test-bash.sh @@ -11,7 +11,7 @@ cat >bash.conf <bash-nodocs.conf <httpd.conf < current-dblist.txt -assert_not_file_has_content current-dblist.txt 'kernel-4.13.9-300.fc27' +assert_not_file_has_content current-dblist.txt 'kernel-4.16.3-301.fc28' 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) -vm_rpmostree override replace ./kernel*4.13.9*.rpm +vm_rpmostree override replace ./kernel*4.16.3*.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.13.9-300.fc27' +assert_file_has_content_literal new-dblist.txt 'kernel-4.16.3-301.fc28' 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.13.9-300.fc27' +assert_file_has_content_literal modules-dirs.txt '4.16.3-301.fc28' echo "ok override kernel"