From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25701C11F65 for ; Wed, 30 Jun 2021 19:01:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9353461435 for ; Wed, 30 Jun 2021 19:01:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9353461435 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyfT6-0004rK-J3 for qemu-devel@archiver.kernel.org; Wed, 30 Jun 2021 15:01:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyfQX-0001Jj-AD for qemu-devel@nongnu.org; Wed, 30 Jun 2021 14:59:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54941) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyfQT-0000W5-0N for qemu-devel@nongnu.org; Wed, 30 Jun 2021 14:59:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625079547; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AsnvT1HWerT+utWT1HZ5TR+HUz4Naxm+lEYHZCqoJLE=; b=jMHNY3QUcK9QRYxG96ovmS6E6D8cLOT0tp0RXG5TOt+kEEHvjbBgAXDpjVw0wy2Wws9vjE 9St4ofDzc5jc2BJzu2CTQRNWzw2Bgk4ZpAyGQcYBIwDB3IT4WYxYm6LuzC+ECKNy2hsBlg elC1Yjuwd6vy93TcVuC6K9LzPwyXCkc= Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-89-ZYxPiFK8MtSaOwmRlk8sQw-1; Wed, 30 Jun 2021 14:59:04 -0400 X-MC-Unique: ZYxPiFK8MtSaOwmRlk8sQw-1 Received: by mail-pf1-f197.google.com with SMTP id 197-20020a6219ce0000b029030a0d1ff0ffso2319971pfz.15 for ; Wed, 30 Jun 2021 11:59:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:subject:to:cc:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding:content-language; bh=AsnvT1HWerT+utWT1HZ5TR+HUz4Naxm+lEYHZCqoJLE=; b=SVfPi4/2rVqvZRT7m/85TFZ5BwHqN0lupJGHmRXSb0r/aUmJI9B7J9DOJZHm0CgB3F VveJoz7bb8f36hho5UM9fMmWElb0YW2ckANo6oa57lcZ0es5RcIBUR9BveTfdL7zQpgn mww+HYllPhsdewUE1WtABsf/2NG+B+5FIsQ4Ka95ImmCKaAs4B3umx1KPHzo1CvnRmlr gkd9FuTKRYsFGpzTFA+jI9CweRuwhHKxuYvpHOEv2fd4SpZT0hZD9uscHvwJd85D6xAA FynZdbzyXoycEYRfbresE640xzQuD3mzXOfcBdF5M8SU1rVi5hY+HtJnxrNOnUH1Fhbn FHSQ== X-Gm-Message-State: AOAM532dcFWvLaxm/+1P2cGhBCGWKYxI5FzBPBcQQx5XWVR4ybn69BKM dvtX4wlfUND86q1idesmB19XY/qfoAkYnCfNaz0s/5eEzzCHRSszoMQh0agRwRfzIaA6g61cSn+ AMHN0bWmyVm+t+Ao= X-Received: by 2002:a17:90a:708d:: with SMTP id g13mr5735777pjk.81.1625079543665; Wed, 30 Jun 2021 11:59:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3yZ0JDofyHNR56ONO/8asD8wlw+5VPTzmjqR9b9aEnQsle/LU2zZBhica4puhYeCryP4hWg== X-Received: by 2002:a17:90a:708d:: with SMTP id g13mr5735752pjk.81.1625079543315; Wed, 30 Jun 2021 11:59:03 -0700 (PDT) Received: from wainer-laptop.localdomain ([179.105.223.44]) by smtp.gmail.com with ESMTPSA id v11sm7511259pjs.13.2021.06.30.11.58.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 30 Jun 2021 11:59:02 -0700 (PDT) Subject: Re: [PATCH 2/3] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run To: =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , qemu-devel@nongnu.org References: <20210625172211.451010-1-berrange@redhat.com> <20210625172211.451010-3-berrange@redhat.com> From: Wainer dos Santos Moschetta Message-ID: Date: Wed, 30 Jun 2021 15:58:57 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210625172211.451010-3-berrange@redhat.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=wainersm@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Received-SPF: pass client-ip=216.205.24.124; envelope-from=wainersm@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.435, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: wainersm@redhat.com Cc: Thomas Huth , Ed Maste , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Willian Rampazzo , Yonggang Luo , =?UTF-8?Q?Alex_Benn=c3=a9e?= , Li-Wen Hsu Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi, On 6/25/21 2:22 PM, Daniel P. Berrangé wrote: > This adds support for running 4 jobs via Cirrus CI runners: > > * FreeBSD 12 > * FreeBSD 13 > * macOS 11 with default XCode > * macOS 11 with latest XCode > > The gitlab job uses a container published by the libvirt-ci > project (https://gitlab.com/libvirt/libvirt-ci) that contains > the 'cirrus-run' command. This accepts a short yaml file that > describes a single Cirrus CI job, runs it using the Cirrus CI > REST API, and reports any output to the console. > > In this way Cirrus CI is effectively working as an indirect > custom runner for GitLab CI pipelines. The key benefit is that > Cirrus CI job results affect the GitLab CI pipeline result and > so the user only has look at one CI dashboard. > > Signed-off-by: Daniel P. Berrangé > --- > .gitlab-ci.d/cirrus.yml | 103 ++++++++++++++++++++++++++++ > .gitlab-ci.d/cirrus/README.rst | 54 +++++++++++++++ > .gitlab-ci.d/cirrus/build.yml | 35 ++++++++++ > .gitlab-ci.d/cirrus/freebsd-12.vars | 13 ++++ > .gitlab-ci.d/cirrus/freebsd-13.vars | 13 ++++ > .gitlab-ci.d/cirrus/macos-11.vars | 15 ++++ > .gitlab-ci.d/qemu-project.yml | 1 + > 7 files changed, 234 insertions(+) > create mode 100644 .gitlab-ci.d/cirrus.yml > create mode 100644 .gitlab-ci.d/cirrus/README.rst > create mode 100644 .gitlab-ci.d/cirrus/build.yml > create mode 100644 .gitlab-ci.d/cirrus/freebsd-12.vars > create mode 100644 .gitlab-ci.d/cirrus/freebsd-13.vars > create mode 100644 .gitlab-ci.d/cirrus/macos-11.vars > > diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml > new file mode 100644 > index 0000000000..d7b4cce79b > --- /dev/null > +++ b/.gitlab-ci.d/cirrus.yml > @@ -0,0 +1,103 @@ > +# Jobs that we delegate to Cirrus CI because they require an operating > +# system other than Linux. These jobs will only run if the required > +# setup has been performed on the GitLab account. > +# > +# The Cirrus CI configuration is generated by replacing target-specific > +# variables in a generic template: some of these variables are provided > +# when the GitLab CI job is defined, others are taken from a shell > +# snippet generated using lcitool. > +# > +# Note that the $PATH environment variable has to be treated with > +# special care, because we can't just override it at the GitLab CI job > +# definition level or we risk breaking it completely. > +.cirrus_build_job: > + stage: build > + image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master > + needs: [] > + script: > + - source .gitlab-ci.d/cirrus/$NAME.vars > + - sed -e "s|[@]CI_REPOSITORY_URL@|$CI_REPOSITORY_URL|g" > + -e "s|[@]CI_COMMIT_REF_NAME@|$CI_COMMIT_REF_NAME|g" > + -e "s|[@]CI_COMMIT_SHA@|$CI_COMMIT_SHA|g" > + -e "s|[@]CIRRUS_VM_INSTANCE_TYPE@|$CIRRUS_VM_INSTANCE_TYPE|g" > + -e "s|[@]CIRRUS_VM_IMAGE_SELECTOR@|$CIRRUS_VM_IMAGE_SELECTOR|g" > + -e "s|[@]CIRRUS_VM_IMAGE_NAME@|$CIRRUS_VM_IMAGE_NAME|g" > + -e "s|[@]CIRRUS_VM_CPUS@|$CIRRUS_VM_CPUS|g" > + -e "s|[@]CIRRUS_VM_RAM@|$CIRRUS_VM_RAM|g" > + -e "s|[@]UPDATE_COMMAND@|$UPDATE_COMMAND|g" > + -e "s|[@]INSTALL_COMMAND@|$INSTALL_COMMAND|g" > + -e "s|[@]PATH@|$PATH_EXTRA${PATH_EXTRA:+:}\$PATH|g" > + -e "s|[@]PKG_CONFIG_PATH@|$PKG_CONFIG_PATH|g" > + -e "s|[@]PKGS@|$PKGS|g" > + -e "s|[@]MAKE@|$MAKE|g" > + -e "s|[@]PYTHON@|$PYTHON|g" > + -e "s|[@]PIP3@|$PIP3|g" > + -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g" > + -e "s|[@]CONFIGURE_ARGS@|$CONFIGURE_ARGS|g" > + -e "s|[@]TEST_TARGETSS@|$TEST_TARGETSS|g" > + <.gitlab-ci.d/cirrus/build.yml >.gitlab-ci.d/cirrus/$NAME.yml > + - cat .gitlab-ci.d/cirrus/$NAME.yml > + - cirrus-run -v --show-build-log always .gitlab-ci.d/cirrus/$NAME.yml > + rules: > + - if: "$TEMPORARILY_DISABLED" Reading 'TEMPORARILY_DISABLED' I immediately think the job is malfunctioning or under maintenance. But since the plan is to keep it running as 'non-gate' until it proves reliable, so maybe you could rename the variable to 'NON_GATE' or 'STAGING_JOB' (i.e. some words to better express the intent). Thanks! - Wainer > + allow_failure: true > + - if: "$CIRRUS_GITHUB_REPO && $CIRRUS_API_TOKEN" > + > +x64-freebsd-12-build: > + extends: .cirrus_build_job > + variables: > + NAME: freebsd-12 > + CIRRUS_VM_INSTANCE_TYPE: freebsd_instance > + CIRRUS_VM_IMAGE_SELECTOR: image_family > + CIRRUS_VM_IMAGE_NAME: freebsd-12-2 > + CIRRUS_VM_CPUS: 8 > + CIRRUS_VM_RAM: 8G > + UPDATE_COMMAND: pkg update > + INSTALL_COMMAND: pkg install -y > + # TODO: Enable gnutls again once FreeBSD's libtasn1 got fixed > + # See: https://gitlab.com/gnutls/libtasn1/-/merge_requests/71 > + CONFIGURE_ARGS: --disable-gnutls > + TEST_TARGETS: check > + > +x64-freebsd-13-build: > + extends: .cirrus_build_job > + variables: > + NAME: freebsd-13 > + CIRRUS_VM_INSTANCE_TYPE: freebsd_instance > + CIRRUS_VM_IMAGE_SELECTOR: image_family > + CIRRUS_VM_IMAGE_NAME: freebsd-13-0 > + CIRRUS_VM_CPUS: 8 > + CIRRUS_VM_RAM: 8G > + UPDATE_COMMAND: pkg update > + INSTALL_COMMAND: pkg install -y > + TEST_TARGETS: check > + > +x64-macos-11-base-build: > + extends: .cirrus_build_job > + variables: > + NAME: macos-11 > + CIRRUS_VM_INSTANCE_TYPE: osx_instance > + CIRRUS_VM_IMAGE_SELECTOR: image > + CIRRUS_VM_IMAGE_NAME: big-sur-base > + CIRRUS_VM_CPUS: 12 > + CIRRUS_VM_RAM: 24G > + UPDATE_COMMAND: brew update > + INSTALL_COMMAND: brew install > + PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin > + PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig > + TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64 > + > +x64-macos-11-xcode-build: > + extends: .cirrus_build_job > + variables: > + NAME: macos-11 > + CIRRUS_VM_INSTANCE_TYPE: osx_instance > + CIRRUS_VM_IMAGE_SELECTOR: image > + CIRRUS_VM_IMAGE_NAME: big-sur-xcode > + CIRRUS_VM_CPUS: 12 > + CIRRUS_VM_RAM: 24G > + UPDATE_COMMAND: brew update > + INSTALL_COMMAND: brew install > + PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin > + PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig > + TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64 > diff --git a/.gitlab-ci.d/cirrus/README.rst b/.gitlab-ci.d/cirrus/README.rst > new file mode 100644 > index 0000000000..657b0706d7 > --- /dev/null > +++ b/.gitlab-ci.d/cirrus/README.rst > @@ -0,0 +1,54 @@ > +Cirrus CI integration > +===================== > + > +GitLab CI shared runners only provide a docker environment running on Linux. > +While it is possible to provide private runners for non-Linux platforms this > +is not something most contributors/maintainers will wish to do. > + > +To work around this limitation, we take advantage of `Cirrus CI`_'s free > +offering: more specifically, we use the `cirrus-run`_ script to trigger Cirrus > +CI jobs from GitLab CI jobs so that Cirrus CI job output is integrated into > +the main GitLab CI pipeline dashboard. > + > +There is, however, some one-time setup required. If you want FreeBSD and macOS > +builds to happen when you push to your GitLab repository, you need to > + > +* set up a GitHub repository for the project, eg. ``yourusername/qemu``. > + This repository needs to exist for cirrus-run to work, but it doesn't need to > + be kept up to date, so you can create it and then forget about it; > + > +* enable the `Cirrus CI GitHub app`_ for your GitHub account; > + > +* sign up for Cirrus CI. It's enough to log into the website using your GitHub > + account; > + > +* grab an API token from the `Cirrus CI settings`_ page; > + > +* it may be necessary to push an empty ``.cirrus.yml`` file to your github fork > + for Cirrus CI to properly recognize the project. You can check whether > + Cirrus CI knows about your project by navigating to: > + > + ``https://cirrus-ci.com/yourusername/qemu`` > + > +* in the *CI/CD / Variables* section of the settings page for your GitLab > + repository, create two new variables: > + > + * ``CIRRUS_GITHUB_REPO``, containing the name of the GitHub repository > + created earlier, eg. ``yourusername/qemu``; > + > + * ``CIRRUS_API_TOKEN``, containing the Cirrus CI API token generated earlier. > + This variable **must** be marked as *Masked*, because anyone with knowledge > + of it can impersonate you as far as Cirrus CI is concerned. > + > + Neither of these variables should be marked as *Protected*, because in > + general you'll want to be able to trigger Cirrus CI builds from non-protected > + branches. > + > +Once this one-time setup is complete, you can just keep pushing to your GitLab > +repository as usual and you'll automatically get the additional CI coverage. > + > + > +.. _Cirrus CI GitHub app: https://github.com/marketplace/cirrus-ci > +.. _Cirrus CI settings: https://cirrus-ci.com/settings/profile/ > +.. _Cirrus CI: https://cirrus-ci.com/ > +.. _cirrus-run: https://github.com/sio/cirrus-run/ > diff --git a/.gitlab-ci.d/cirrus/build.yml b/.gitlab-ci.d/cirrus/build.yml > new file mode 100644 > index 0000000000..857bdc5536 > --- /dev/null > +++ b/.gitlab-ci.d/cirrus/build.yml > @@ -0,0 +1,35 @@ > +@CIRRUS_VM_INSTANCE_TYPE@: > + @CIRRUS_VM_IMAGE_SELECTOR@: @CIRRUS_VM_IMAGE_NAME@ > + cpu: @CIRRUS_VM_CPUS@ > + memory: @CIRRUS_VM_RAM@ > + > +env: > + CIRRUS_CLONE_DEPTH: 1 > + CI_REPOSITORY_URL: "@CI_REPOSITORY_URL@" > + CI_COMMIT_REF_NAME: "@CI_COMMIT_REF_NAME@" > + CI_COMMIT_SHA: "@CI_COMMIT_SHA@" > + PATH: "@PATH@" > + PKG_CONFIG_PATH: "@PKG_CONFIG_PATH@" > + PYTHON: "@PYTHON@" > + MAKE: "@MAKE@" > + CONFIGURE_ARGS: "@CONFIGURE_ARGS@" > + > +build_task: > + install_script: > + - @UPDATE_COMMAND@ > + - @INSTALL_COMMAND@ @PKGS@ > + - if test -n "@PYPI_PKGS@" ; then @PIP3@ install @PYPI_PKGS@ ; fi > + clone_script: > + - git clone --depth 100 "$CI_REPOSITORY_URL" . > + - git fetch origin "$CI_COMMIT_REF_NAME" > + - git reset --hard "$CI_COMMIT_SHA" > + build_script: > + - mkdir build > + - cd build > + - ../configure --enable-werror $CONFIGURE_ARGS > + || { cat config.log meson-logs/meson-log.txt; exit 1; } > + - $MAKE -j$(sysctl -n hw.ncpu) > + - for TARGET in $TEST_TARGETS ; > + do > + $MAKE -j$(sysctl -n hw.ncpu) $TARGET V=1 ; > + done > diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars > new file mode 100644 > index 0000000000..5e51e50ea9 > --- /dev/null > +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars > @@ -0,0 +1,13 @@ > +# THIS FILE WAS AUTO-GENERATED > +# > +# $ lcitool variables freebsd-12 qemu > +# > +# https://gitlab.com/libvirt/libvirt-ci/-/commit/c7e275ab27ac0dcd09da290817b9adeea1fd1eb1 > + > +PACKAGING_COMMAND='pkg' > +CCACHE='/usr/local/bin/ccache' > +MAKE='/usr/local/bin/gmake' > +NINJA='/usr/local/bin/ninja' > +PYTHON='/usr/local/bin/python3' > +PIP3='/usr/local/bin/pip-3.7' > +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py37-numpy py37-pillow py37-pip py37-sphinx py37-sphinx_rtd_theme py37-virtualenv py37-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' > diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars > new file mode 100644 > index 0000000000..07716833d9 > --- /dev/null > +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars > @@ -0,0 +1,13 @@ > +# THIS FILE WAS AUTO-GENERATED > +# > +# $ lcitool variables freebsd-13 qemu > +# > +# https://gitlab.com/libvirt/libvirt-ci/-/commit/c7e275ab27ac0dcd09da290817b9adeea1fd1eb1 > + > +PACKAGING_COMMAND='pkg' > +CCACHE='/usr/local/bin/ccache' > +MAKE='/usr/local/bin/gmake' > +NINJA='/usr/local/bin/ninja' > +PYTHON='/usr/local/bin/python3' > +PIP3='/usr/local/bin/pip-3.7' > +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py37-numpy py37-pillow py37-pip py37-sphinx py37-sphinx_rtd_theme py37-virtualenv py37-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' > diff --git a/.gitlab-ci.d/cirrus/macos-11.vars b/.gitlab-ci.d/cirrus/macos-11.vars > new file mode 100644 > index 0000000000..cbec8a44a3 > --- /dev/null > +++ b/.gitlab-ci.d/cirrus/macos-11.vars > @@ -0,0 +1,15 @@ > +# THIS FILE WAS AUTO-GENERATED > +# > +# $ lcitool variables macos-11 qemu > +# > +# https://gitlab.com/libvirt/libvirt-ci/-/commit/c7e275ab27ac0dcd09da290817b9adeea1fd1eb1 > + > +PACKAGING_COMMAND='brew' > +CCACHE='/usr/local/bin/ccache' > +MAKE='/usr/local/bin/gmake' > +NINJA='/usr/local/bin/ninja' > +PYTHON='/usr/local/bin/python3' > +PIP3='/usr/local/bin/pip3' > +PKGS='bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb libxml2 llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' > +PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv' > +CPAN_PKGS='Test::Harness' > diff --git a/.gitlab-ci.d/qemu-project.yml b/.gitlab-ci.d/qemu-project.yml > index 64cb2ba1da..35d4e62c12 100644 > --- a/.gitlab-ci.d/qemu-project.yml > +++ b/.gitlab-ci.d/qemu-project.yml > @@ -9,3 +9,4 @@ include: > - local: '/.gitlab-ci.d/crossbuilds.yml' > - local: '/.gitlab-ci.d/buildtest.yml' > - local: '/.gitlab-ci.d/static_checks.yml' > + - local: '/.gitlab-ci.d/cirrus.yml'