[PATCH 4/4] Jobs based on custom runners: add CentOS Stream 8
This introduces three different parts of a job designed to run on a custom runner managed by Red Hat. The goals include: a) serve as a model for other organizations that want to onboard their own runners, with their specific platforms, build configuration and tests. b) bring awareness to the differences between upstream QEMU and the version available under CentOS Stream, which is "A preview of upcoming Red Hat Enterprise Linux minor and major releases.". c) becase of b), it should be easier to identify and reduce the gap between Red Hat's downstream and upstream QEMU. The components themselves to achieve this custom job are: 1) build environment configuration: documentation and a playbook for a base Enterprise Linux 8 system (also applicable to CentOS Stream), which other users can run on their system to get the environment suitable for building QEMU. 2) QEMU build configuration: how QEMU will be built to match, as closely as possible, the binaries built and packaged on CentOS stream 8. 3) job definition: GitLab CI jobs that will dispatch the build/test job to the machine specifically configured according to #1. Signed-off-by: Cleber Rosa --- .gitlab-ci.d/custom-runners.yml| 29 scripts/ci/org.centos/stream/README| 2 + scripts/ci/org.centos/stream/configure | 190 + scripts/ci/setup/build-environment.yml | 38 + 4 files changed, 259 insertions(+) create mode 100644 scripts/ci/org.centos/stream/README create mode 100755 scripts/ci/org.centos/stream/configure diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml index 061d3cdfed..ee5143995e 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -220,3 +220,32 @@ ubuntu-20.04-aarch64-notcg: - ../configure --disable-libssh --disable-tcg - make --output-sync -j`nproc` - make --output-sync -j`nproc` check V=1 + +centos-stream-8-x86_64: + allow_failure: true + needs: [] + stage: build + tags: + - centos_stream_8 + - x86_64 + rules: + - if: '$CI_COMMIT_BRANCH =~ /^staging/' + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" + when: on_failure + expire_in: 7 days + paths: + - build/tests/results/latest/results.xml + - build/tests/results/latest/test-results + reports: + junit: build/tests/results/latest/results.xml + script: + - mkdir build + - cd build + - ../scripts/ci/org.centos/stream/configure + - make --output-sync -j`nproc` + - make --output-sync -j`nproc` check V=1 + - make get-vm-images + # Only run tests that are either marked explicitly for KVM and x86_64 + # or tests that are supposed to be valid for all targets + - ./tests/venv/bin/avocado run --job-results-dir=tests/results/ --filter-by-tags-include-empty --filter-by-tags-include-empty-key -t accel:kvm,arch:x86_64 -- tests/acceptance/ diff --git a/scripts/ci/org.centos/stream/README b/scripts/ci/org.centos/stream/README new file mode 100644 index 00..f99bda99b8 --- /dev/null +++ b/scripts/ci/org.centos/stream/README @@ -0,0 +1,2 @@ +This directory contains scripts for generating a build of QEMU that +closely matches the CentOS Stream builds of the qemu-kvm package. diff --git a/scripts/ci/org.centos/stream/configure b/scripts/ci/org.centos/stream/configure new file mode 100755 index 00..1e7207faec --- /dev/null +++ b/scripts/ci/org.centos/stream/configure @@ -0,0 +1,190 @@ +#!/bin/sh -e +../configure \ +--prefix="/usr" \ +--libdir="/usr/lib64" \ +--datadir="/usr/share" \ +--sysconfdir="/etc" \ +--interp-prefix=/usr/qemu-%M \ +--localstatedir="/var" \ +--docdir="/usr/share/doc" \ +--libexecdir="/usr/libexec" \ +--extra-ldflags="-Wl,--build-id -Wl,-z,relro -Wl,-z,now" \ +--extra-cflags="-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection" \ +--with-suffix="qemu-kvm" \ +--firmwarepath=/usr/share/qemu-firmware \ +--meson="/usr/bin/meson" \ +--target-list="x86_64-softmmu" \ +--block-drv-rw-whitelist=qcow2,raw,file,host_device,nbd,iscsi,rbd,blkdebug,luks,null-co,nvme,copy-on-read,throttle,gluster \ +--audio-drv-list= \ +--block-drv-ro-whitelist=vmdk,vhdx,vpc,https,ssh \ +--with-coroutine=ucontext \ +--with-git=git \ +--tls-priority=@QEMU,SYSTEM \ +--disable-attr \ +--disable-auth-pam \ +--disable-avx2 \ +--disable-avx512f \ +--disable-bochs \ +--disable-brlapi \ +--disable-bsd-user \ +--disable-bzip2 \ +--disable-cap-ng \ +--disable-capstone \ +--disable-cfi \ +--disable-cfi-debug \ +--disable-cloop \ +--disable-cocoa \ +--disable-coroutine-pool \ +--disable-crypto-afalg \ +--disable-curl \ +--disable-curses \ +--disable-debug-info \ +--disable-debug-mutex \ +--disable-debug-tcg \ +--disable-dmg \ +--dis
Re: [PATCH 4/4] Jobs based on custom runners: add CentOS Stream 8
On Tue, Jun 8, 2021 at 10:10 AM Cleber Rosa wrote: > > This introduces three different parts of a job designed to run > on a custom runner managed by Red Hat. The goals include: > > a) serve as a model for other organizations that want to onboard > their own runners, with their specific platforms, build > configuration and tests. > > b) bring awareness to the differences between upstream QEMU and the > version available under CentOS Stream, which is "A preview of > upcoming Red Hat Enterprise Linux minor and major releases.". > > c) becase of b), it should be easier to identify and reduce the gap > between Red Hat's downstream and upstream QEMU. > > The components themselves to achieve this custom job are: > > 1) build environment configuration: documentation and a playbook for > a base Enterprise Linux 8 system (also applicable to CentOS > Stream), which other users can run on their system to get the > environment suitable for building QEMU. > > 2) QEMU build configuration: how QEMU will be built to match, as > closely as possible, the binaries built and packaged on CentOS > stream 8. > > 3) job definition: GitLab CI jobs that will dispatch the build/test > job to the machine specifically configured according to #1. > > Signed-off-by: Cleber Rosa > --- > .gitlab-ci.d/custom-runners.yml| 29 > scripts/ci/org.centos/stream/README| 2 + > scripts/ci/org.centos/stream/configure | 190 + > scripts/ci/setup/build-environment.yml | 38 + > 4 files changed, 259 insertions(+) > create mode 100644 scripts/ci/org.centos/stream/README > create mode 100755 scripts/ci/org.centos/stream/configure > > diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml > index 061d3cdfed..ee5143995e 100644 > --- a/.gitlab-ci.d/custom-runners.yml > +++ b/.gitlab-ci.d/custom-runners.yml > @@ -220,3 +220,32 @@ ubuntu-20.04-aarch64-notcg: > - ../configure --disable-libssh --disable-tcg > - make --output-sync -j`nproc` > - make --output-sync -j`nproc` check V=1 > + > +centos-stream-8-x86_64: > + allow_failure: true > + needs: [] > + stage: build > + tags: > + - centos_stream_8 > + - x86_64 > + rules: > + - if: '$CI_COMMIT_BRANCH =~ /^staging/' > + artifacts: > + name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" > + when: on_failure > + expire_in: 7 days > + paths: > + - build/tests/results/latest/results.xml > + - build/tests/results/latest/test-results > + reports: > + junit: build/tests/results/latest/results.xml > + script: > + - mkdir build > + - cd build > + - ../scripts/ci/org.centos/stream/configure > + - make --output-sync -j`nproc` > + - make --output-sync -j`nproc` check V=1 > + - make get-vm-images > + # Only run tests that are either marked explicitly for KVM and x86_64 > + # or tests that are supposed to be valid for all targets > + - ./tests/venv/bin/avocado run --job-results-dir=tests/results/ > --filter-by-tags-include-empty --filter-by-tags-include-empty-key -t > accel:kvm,arch:x86_64 -- tests/acceptance/ > diff --git a/scripts/ci/org.centos/stream/README > b/scripts/ci/org.centos/stream/README > new file mode 100644 > index 00..f99bda99b8 > --- /dev/null > +++ b/scripts/ci/org.centos/stream/README > @@ -0,0 +1,2 @@ > +This directory contains scripts for generating a build of QEMU that > +closely matches the CentOS Stream builds of the qemu-kvm package. > diff --git a/scripts/ci/org.centos/stream/configure > b/scripts/ci/org.centos/stream/configure > new file mode 100755 > index 00..1e7207faec > --- /dev/null > +++ b/scripts/ci/org.centos/stream/configure > @@ -0,0 +1,190 @@ > +#!/bin/sh -e > +../configure \ > +--prefix="/usr" \ > +--libdir="/usr/lib64" \ > +--datadir="/usr/share" \ > +--sysconfdir="/etc" \ > +--interp-prefix=/usr/qemu-%M \ > +--localstatedir="/var" \ > +--docdir="/usr/share/doc" \ > +--libexecdir="/usr/libexec" \ > +--extra-ldflags="-Wl,--build-id -Wl,-z,relro -Wl,-z,now" \ > +--extra-cflags="-O2 -g -pipe -Wall -Werror=format-security > -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions > -fstack-protector-strong -grecord-gcc-switches > -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 > -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic > -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection" \ > +--with-suffix="qemu-kvm" \ > +--firmwarepath=/usr/share/qemu-firmware \ > +--meson="/usr/bin/meson" \ > +--target-list="x86_64-softmmu" \ > +--block-drv-rw-whitelist=qcow2,raw,file,host_device,nbd,iscsi,rbd,blkdebug,luks,null-co,nvme,copy-on-read,throttle,gluster > \ > +--audio-drv-list= \ > +--block-drv-ro-whitelist=vmdk,vhdx,vpc,https,ssh \ > +--with-coroutine=ucontext \ > +--with-git=git \ > +--tls-priority=@QEMU,SYSTEM \ > +--disable-attr \ > +--disable-auth-pam \ > +--disable-avx2 \ > +--disable-avx512f \ > +--disable-bochs \ > +--disable-brlapi \ > +--disable-bsd-user \ > +--disable-bzip2 \ > +-
Re: [PATCH 4/4] Jobs based on custom runners: add CentOS Stream 8
On Tue, Jun 8, 2021 at 11:10 AM Cleber Rosa wrote: > > This introduces three different parts of a job designed to run > on a custom runner managed by Red Hat. The goals include: > > a) serve as a model for other organizations that want to onboard > their own runners, with their specific platforms, build > configuration and tests. > > b) bring awareness to the differences between upstream QEMU and the > version available under CentOS Stream, which is "A preview of > upcoming Red Hat Enterprise Linux minor and major releases.". > > c) becase of b), it should be easier to identify and reduce the gap > between Red Hat's downstream and upstream QEMU. > > The components themselves to achieve this custom job are: > > 1) build environment configuration: documentation and a playbook for > a base Enterprise Linux 8 system (also applicable to CentOS > Stream), which other users can run on their system to get the > environment suitable for building QEMU. > > 2) QEMU build configuration: how QEMU will be built to match, as > closely as possible, the binaries built and packaged on CentOS > stream 8. > > 3) job definition: GitLab CI jobs that will dispatch the build/test > job to the machine specifically configured according to #1. > > Signed-off-by: Cleber Rosa > --- > .gitlab-ci.d/custom-runners.yml| 29 > scripts/ci/org.centos/stream/README| 2 + > scripts/ci/org.centos/stream/configure | 190 + > scripts/ci/setup/build-environment.yml | 38 + > 4 files changed, 259 insertions(+) > create mode 100644 scripts/ci/org.centos/stream/README > create mode 100755 scripts/ci/org.centos/stream/configure > > diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml > index 061d3cdfed..ee5143995e 100644 > --- a/.gitlab-ci.d/custom-runners.yml > +++ b/.gitlab-ci.d/custom-runners.yml > @@ -220,3 +220,32 @@ ubuntu-20.04-aarch64-notcg: > - ../configure --disable-libssh --disable-tcg > - make --output-sync -j`nproc` > - make --output-sync -j`nproc` check V=1 > + > +centos-stream-8-x86_64: > + allow_failure: true > + needs: [] > + stage: build > + tags: > + - centos_stream_8 > + - x86_64 What happens if another organization wants to add its own custom runner with its own set of tests based on centos stream 8? My suggestion is to add an organization tag to the custom runners. If this job runs tests important to Red Hat, we should name it and tag the runner with it. Unless Red Hat is willing to add other tests that are interesting to other organizations and run it on its custom runner. If that is the case, who should check those tests in case of failure? > + rules: > + - if: '$CI_COMMIT_BRANCH =~ /^staging/' > + artifacts: > + name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" > + when: on_failure > + expire_in: 7 days > + paths: > + - build/tests/results/latest/results.xml > + - build/tests/results/latest/test-results > + reports: > + junit: build/tests/results/latest/results.xml > + script: > + - mkdir build > + - cd build > + - ../scripts/ci/org.centos/stream/configure > + - make --output-sync -j`nproc` > + - make --output-sync -j`nproc` check V=1 > + - make get-vm-images > + # Only run tests that are either marked explicitly for KVM and x86_64 > + # or tests that are supposed to be valid for all targets > + - ./tests/venv/bin/avocado run --job-results-dir=tests/results/ > --filter-by-tags-include-empty --filter-by-tags-include-empty-key -t > accel:kvm,arch:x86_64 -- tests/acceptance/ > diff --git a/scripts/ci/org.centos/stream/README > b/scripts/ci/org.centos/stream/README > new file mode 100644 > index 00..f99bda99b8 > --- /dev/null > +++ b/scripts/ci/org.centos/stream/README > @@ -0,0 +1,2 @@ > +This directory contains scripts for generating a build of QEMU that > +closely matches the CentOS Stream builds of the qemu-kvm package. > diff --git a/scripts/ci/org.centos/stream/configure > b/scripts/ci/org.centos/stream/configure > new file mode 100755 > index 00..1e7207faec > --- /dev/null > +++ b/scripts/ci/org.centos/stream/configure > @@ -0,0 +1,190 @@ > +#!/bin/sh -e > +../configure \ > +--prefix="/usr" \ > +--libdir="/usr/lib64" \ > +--datadir="/usr/share" \ > +--sysconfdir="/etc" \ > +--interp-prefix=/usr/qemu-%M \ > +--localstatedir="/var" \ > +--docdir="/usr/share/doc" \ > +--libexecdir="/usr/libexec" \ > +--extra-ldflags="-Wl,--build-id -Wl,-z,relro -Wl,-z,now" \ > +--extra-cflags="-O2 -g -pipe -Wall -Werror=format-security > -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions > -fstack-protector-strong -grecord-gcc-switches > -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 > -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic > -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection" \ > +--with-suffix="qemu-kvm" \ > +--firmwarepath=/usr/share/qemu-firmware \ > +--meson="/usr/bin/meson" \ > +--target-list="x86_64-softm
