From: Christian Borntraeger <borntraeger@linux.ibm.com>
To: "Alex Bennée" <alex.bennee@linaro.org>, qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>,
"Cornelia Huck" <cohuck@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"open list:S390 general arch..." <qemu-s390x@nongnu.org>
Subject: Re: [RFC PATCH] gitlab: upgrade the job definition for s390x to 20.04
Date: Tue, 22 Feb 2022 09:06:53 +0100 [thread overview]
Message-ID: <026cbf2c-df86-9d19-671b-bf29097519d1@linux.ibm.com> (raw)
In-Reply-To: <20220221230607.1277120-1-alex.bennee@linaro.org>
Am 22.02.22 um 00:06 schrieb Alex Bennée:
> The new s390x machine has more of everything including the OS. As
> 18.04 will soon be going we might as well get onto something moderately
> modern.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
> Cc: Peter Maydell <peter.maydell@linaro.org>
Looks sane,
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
> .gitlab-ci.d/custom-runners.yml | 2 +-
> ...18.04-s390x.yml => ubuntu-20.04-s390x.yml} | 28 +++++++++----------
> 2 files changed, 15 insertions(+), 15 deletions(-)
> rename .gitlab-ci.d/custom-runners/{ubuntu-18.04-s390x.yml => ubuntu-20.04-s390x.yml} (87%)
>
> diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml
> index 056c374619..3e76a2034a 100644
> --- a/.gitlab-ci.d/custom-runners.yml
> +++ b/.gitlab-ci.d/custom-runners.yml
> @@ -14,6 +14,6 @@ variables:
> GIT_STRATEGY: clone
>
> include:
> - - local: '/.gitlab-ci.d/custom-runners/ubuntu-18.04-s390x.yml'
> + - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml'
> - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml'
> - local: '/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml'
> diff --git a/.gitlab-ci.d/custom-runners/ubuntu-18.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
> similarity index 87%
> rename from .gitlab-ci.d/custom-runners/ubuntu-18.04-s390x.yml
> rename to .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
> index f39d874a1e..0333872113 100644
> --- a/.gitlab-ci.d/custom-runners/ubuntu-18.04-s390x.yml
> +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
> @@ -1,12 +1,12 @@
> -# All ubuntu-18.04 jobs should run successfully in an environment
> +# All ubuntu-20.04 jobs should run successfully in an environment
> # setup by the scripts/ci/setup/build-environment.yml task
> -# "Install basic packages to build QEMU on Ubuntu 18.04/20.04"
> +# "Install basic packages to build QEMU on Ubuntu 20.04/20.04"
>
> -ubuntu-18.04-s390x-all-linux-static:
> +ubuntu-20.04-s390x-all-linux-static:
> needs: []
> stage: build
> tags:
> - - ubuntu_18.04
> + - ubuntu_20.04
> - s390x
> rules:
> - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
> @@ -21,11 +21,11 @@ ubuntu-18.04-s390x-all-linux-static:
> - make --output-sync -j`nproc` check V=1
> - make --output-sync -j`nproc` check-tcg V=1
>
> -ubuntu-18.04-s390x-all:
> +ubuntu-20.04-s390x-all:
> needs: []
> stage: build
> tags:
> - - ubuntu_18.04
> + - ubuntu_20.04
> - s390x
> rules:
> - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
> @@ -37,11 +37,11 @@ ubuntu-18.04-s390x-all:
> - make --output-sync -j`nproc`
> - make --output-sync -j`nproc` check V=1
>
> -ubuntu-18.04-s390x-alldbg:
> +ubuntu-20.04-s390x-alldbg:
> needs: []
> stage: build
> tags:
> - - ubuntu_18.04
> + - ubuntu_20.04
> - s390x
> rules:
> - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
> @@ -58,11 +58,11 @@ ubuntu-18.04-s390x-alldbg:
> - make --output-sync -j`nproc`
> - make --output-sync -j`nproc` check V=1
>
> -ubuntu-18.04-s390x-clang:
> +ubuntu-20.04-s390x-clang:
> needs: []
> stage: build
> tags:
> - - ubuntu_18.04
> + - ubuntu_20.04
> - s390x
> rules:
> - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
> @@ -78,11 +78,11 @@ ubuntu-18.04-s390x-clang:
> - make --output-sync -j`nproc`
> - make --output-sync -j`nproc` check V=1
>
> -ubuntu-18.04-s390x-tci:
> +ubuntu-20.04-s390x-tci:
> needs: []
> stage: build
> tags:
> - - ubuntu_18.04
> + - ubuntu_20.04
> - s390x
> rules:
> - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
> @@ -97,11 +97,11 @@ ubuntu-18.04-s390x-tci:
> - ../configure --disable-libssh --enable-tcg-interpreter
> - make --output-sync -j`nproc`
>
> -ubuntu-18.04-s390x-notcg:
> +ubuntu-20.04-s390x-notcg:
> needs: []
> stage: build
> tags:
> - - ubuntu_18.04
> + - ubuntu_20.04
> - s390x
> rules:
> - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
next prev parent reply other threads:[~2022-02-22 8:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 23:06 [RFC PATCH] gitlab: upgrade the job definition for s390x to 20.04 Alex Bennée
2022-02-22 8:06 ` Christian Borntraeger [this message]
2022-02-22 8:14 ` Thomas Huth
2022-02-22 9:50 ` Philippe Mathieu-Daudé
2022-02-22 16:05 ` Cornelia Huck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=026cbf2c-df86-9d19-671b-bf29097519d1@linux.ibm.com \
--to=borntraeger@linux.ibm.com \
--cc=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=cohuck@redhat.com \
--cc=f4bug@amsat.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).