* [RFC PATCH] gitlab: upgrade the job definition for s390x to 20.04
@ 2022-02-21 23:06 Alex Bennée
2022-02-22 8:06 ` Christian Borntraeger
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Alex Bennée @ 2022-02-21 23:06 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Thomas Huth, Beraldo Leal, Cornelia Huck,
Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, open list:S390 general arch...,
Christian Borntraeger, 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>
---
.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/'
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [RFC PATCH] gitlab: upgrade the job definition for s390x to 20.04
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
2022-02-22 8:14 ` Thomas Huth
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Christian Borntraeger @ 2022-02-22 8:06 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Peter Maydell, Thomas Huth, Beraldo Leal, Cornelia Huck,
Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, open list:S390 general arch...
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/'
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [RFC PATCH] gitlab: upgrade the job definition for s390x to 20.04
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
@ 2022-02-22 8:14 ` Thomas Huth
2022-02-22 9:50 ` Philippe Mathieu-Daudé
2022-02-22 16:05 ` Cornelia Huck
3 siblings, 0 replies; 5+ messages in thread
From: Thomas Huth @ 2022-02-22 8:14 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Peter Maydell, Beraldo Leal, Cornelia Huck,
Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, open list:S390 general arch...,
Christian Borntraeger
On 22/02/2022 00.06, Alex Bennée wrote:
> 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>
> ---
> .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%)
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [RFC PATCH] gitlab: upgrade the job definition for s390x to 20.04
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
2022-02-22 8:14 ` Thomas Huth
@ 2022-02-22 9:50 ` Philippe Mathieu-Daudé
2022-02-22 16:05 ` Cornelia Huck
3 siblings, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-02-22 9:50 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Peter Maydell, Thomas Huth, Beraldo Leal, Cornelia Huck,
Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, open list:S390 general arch...,
Christian Borntraeger
On 22/2/22 00:06, Alex Bennée wrote:
> 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>
> ---
> .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%)
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [RFC PATCH] gitlab: upgrade the job definition for s390x to 20.04
2022-02-21 23:06 [RFC PATCH] gitlab: upgrade the job definition for s390x to 20.04 Alex Bennée
` (2 preceding siblings ...)
2022-02-22 9:50 ` Philippe Mathieu-Daudé
@ 2022-02-22 16:05 ` Cornelia Huck
3 siblings, 0 replies; 5+ messages in thread
From: Cornelia Huck @ 2022-02-22 16:05 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Peter Maydell, Thomas Huth, Beraldo Leal,
Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, open list:S390 general arch...,
Christian Borntraeger, Alex Bennée
On Mon, Feb 21 2022, Alex Bennée <alex.bennee@linaro.org> wrote:
> 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>
> ---
> .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%)
Acked-by: Cornelia Huck <cohuck@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-02-22 16:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2022-02-22 8:14 ` Thomas Huth
2022-02-22 9:50 ` Philippe Mathieu-Daudé
2022-02-22 16:05 ` Cornelia Huck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.