* [PATCH 0/3] Assorted Gitlab CI improvements
@ 2018-11-16 13:12 Wei Liu
2018-11-16 13:12 ` [PATCH 1/3] automation: refactor gitlab-ci.yaml Wei Liu
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Wei Liu @ 2018-11-16 13:12 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Doug Goldstein
Wei Liu (3):
automation: refactor gitlab-ci.yaml
automation: introduce some RANDCONFIG tests
automation: properly tag x86 jobs in Gitlab CI
.gitlab-ci.yml | 309 ++++++++++++++++++++++++++++++---------------------------
1 file changed, 162 insertions(+), 147 deletions(-)
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] automation: refactor gitlab-ci.yaml
2018-11-16 13:12 [PATCH 0/3] Assorted Gitlab CI improvements Wei Liu
@ 2018-11-16 13:12 ` Wei Liu
2018-11-16 13:12 ` [PATCH 2/3] automation: introduce some RANDCONFIG tests Wei Liu
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Wei Liu @ 2018-11-16 13:12 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Doug Goldstein
Use the "extends" keyword introduced in 11.3 to reduce repetition in
jobs. More importantly, this helps us better organise the properties
of jobs.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
.gitlab-ci.yml | 281 +++++++++++++++++++++++++++------------------------------
1 file changed, 134 insertions(+), 147 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a3b393fade..1c7b3d3d5b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,298 +28,285 @@ stages:
CXX: clang++
clang: y
-centos-7-2-gcc:
+.x86-64-build-tmpl:
<<: *build
variables:
- <<: *gcc
- CONTAINER: centos:7.2
- debug: n
XEN_TARGET_ARCH: x86_64
-centos-7-2-gcc-debug:
+.x86-64-build:
+ extends: .x86-64-build-tmpl
+ variables:
+ debug: n
+
+.x86-64-build-debug:
+ extends: .x86-64-build-tmpl
+ variables:
+ debug: y
+
+.x86-32-build-tmpl:
<<: *build
variables:
- <<: *gcc
- CONTAINER: centos:7.2
+ XEN_TARGET_ARCH: x86_32
+
+.x86-32-build:
+ extends: .x86-32-build-tmpl
+ variables:
+ debug: n
+
+.x86-32-build-debug:
+ extends: .x86-32-build-tmpl
+ variables:
debug: y
- XEN_TARGET_ARCH: x86_64
-centos-7-gcc:
+.gcc-x86-64-build:
+ extends: .x86-64-build
+ variables:
+ <<: *gcc
+
+.gcc-x86-64-build-debug:
+ extends: .x86-64-build-debug
+ variables:
+ <<: *gcc
+
+.gcc-x86-32-build:
+ extends: .x86-32-build
+ variables:
+ <<: *gcc
+
+.gcc-x86-32-build-debug:
+ extends: .x86-32-build-debug
+ variables:
+ <<: *gcc
+
+.clang-x86-64-build:
+ extends: .x86-64-build
+ variables:
+ <<: *clang
+
+.clang-x86-64-build-debug:
+ extends: .x86-64-build-debug
+ variables:
+ <<: *clang
+
+.clang-x86-32-build:
+ extends: .x86-32-build
+ variables:
+ <<: *clang
+
+.clang-x86-32-build-debug:
+ extends: .x86-32-build-debug
+ variables:
+ <<: *clang
+
+.arm64-build-tmpl:
<<: *build
variables:
+ XEN_TARGET_ARCH: arm64
+ tags:
+ - arm64
+
+.arm64-build:
+ extends: .arm64-build-tmpl
+ variables:
+ debug: n
+
+.arm64-build-debug:
+ extends: .arm64-build-tmpl
+ variables:
+ debug: y
+
+.gcc-arm64-build:
+ extends: .arm64-build
+ variables:
<<: *gcc
+
+.gcc-arm64-build-debug:
+ extends: .arm64-build-debug
+ variables:
+ <<: *gcc
+
+# Jobs below this line
+
+centos-7-2-gcc:
+ extends: .gcc-x86-64-build
+ variables:
+ CONTAINER: centos:7.2
+
+centos-7-2-gcc-debug:
+ extends: .gcc-x86-64-build-debug
+ variables:
+ CONTAINER: centos:7.2
+
+centos-7-gcc:
+ extends: .gcc-x86-64-build
+ variables:
CONTAINER: centos:7
- debug: n
- XEN_TARGET_ARCH: x86_64
centos-7-gcc-debug:
- <<: *build
+ extends: .gcc-x86-64-build-debug
variables:
- <<: *gcc
CONTAINER: centos:7
- debug: y
- XEN_TARGET_ARCH: x86_64
debian-jessie-clang:
- <<: *build
+ extends: .clang-x86-64-build
variables:
- <<: *clang
CONTAINER: debian:jessie
- debug: n
- XEN_TARGET_ARCH: x86_64
debian-jessie-clang-debug:
- <<: *build
+ extends: .clang-x86-64-build-debug
variables:
- <<: *clang
CONTAINER: debian:jessie
- debug: y
- XEN_TARGET_ARCH: x86_64
debian-jessie-gcc:
- <<: *build
+ extends: .gcc-x86-64-build
variables:
- <<: *gcc
CONTAINER: debian:jessie
- debug: n
- XEN_TARGET_ARCH: x86_64
debian-jessie-gcc-debug:
- <<: *build
+ extends: .gcc-x86-64-build-debug
variables:
- <<: *gcc
CONTAINER: debian:jessie
- debug: y
- XEN_TARGET_ARCH: x86_64
debian-stretch-clang:
- <<: *build
+ extends: .clang-x86-64-build
variables:
- <<: *clang
CONTAINER: debian:stretch
- debug: n
- XEN_TARGET_ARCH: x86_64
debian-stretch-clang-debug:
- <<: *build
+ extends: .clang-x86-64-build-debug
variables:
- <<: *clang
CONTAINER: debian:stretch
- debug: y
- XEN_TARGET_ARCH: x86_64
debian-stretch-gcc:
- <<: *build
+ extends: .gcc-x86-64-build
variables:
- <<: *gcc
CONTAINER: debian:stretch
- debug: n
- XEN_TARGET_ARCH: x86_64
debian-stretch-gcc-debug:
- <<: *build
+ extends: .gcc-x86-64-build-debug
variables:
- <<: *gcc
CONTAINER: debian:stretch
- debug: y
- XEN_TARGET_ARCH: x86_64
debian-stretch-32-clang:
- <<: *build
+ extends: .clang-x86-32-build
variables:
- <<: *clang
CONTAINER: debian:stretch-i386
- debug: n
- XEN_TARGET_ARCH: x86_32
debian-stretch-32-clang-debug:
- <<: *build
+ extends: .clang-x86-32-build-debug
variables:
- <<: *clang
CONTAINER: debian:stretch-i386
- debug: y
- XEN_TARGET_ARCH: x86_32
debian-stretch-32-gcc:
- <<: *build
+ extends: .gcc-x86-32-build
variables:
- <<: *gcc
CONTAINER: debian:stretch-i386
- debug: n
- XEN_TARGET_ARCH: x86_32
debian-stretch-32-gcc-debug:
- <<: *build
+ extends: .gcc-x86-64-build-debug
variables:
- <<: *gcc
CONTAINER: debian:stretch-i386
- debug: y
- XEN_TARGET_ARCH: x86_32
debian-unstable-clang:
- <<: *build
+ extends: .clang-x86-64-build
variables:
- <<: *clang
CONTAINER: debian:unstable
- debug: n
- XEN_TARGET_ARCH: x86_64
debian-unstable-clang-debug:
- <<: *build
+ extends: .clang-x86-64-build-debug
variables:
- <<: *clang
CONTAINER: debian:unstable
- debug: y
- XEN_TARGET_ARCH: x86_64
debian-unstable-gcc:
- <<: *build
+ extends: .gcc-x86-64-build
variables:
- <<: *gcc
CONTAINER: debian:unstable
- debug: n
- XEN_TARGET_ARCH: x86_64
debian-unstable-gcc-debug:
- <<: *build
+ extends: .gcc-x86-64-build-debug
variables:
- <<: *gcc
CONTAINER: debian:unstable
- debug: y
- XEN_TARGET_ARCH: x86_64
debian-unstable-32-clang:
- <<: *build
+ extends: .clang-x86-32-build
variables:
- <<: *clang
CONTAINER: debian:unstable-i386
- debug: n
- XEN_TARGET_ARCH: x86_32
debian-unstable-32-clang-debug:
- <<: *build
+ extends: .clang-x86-32-build-debug
variables:
- <<: *clang
CONTAINER: debian:unstable-i386
- debug: y
- XEN_TARGET_ARCH: x86_32
debian-unstable-32-gcc:
- <<: *build
+ extends: .gcc-x86-32-build
variables:
- <<: *gcc
CONTAINER: debian:unstable-i386
- debug: n
- XEN_TARGET_ARCH: x86_32
debian-unstable-32-gcc-debug:
- <<: *build
+ extends: .gcc-x86-64-build-debug
variables:
- <<: *gcc
CONTAINER: debian:unstable-i386
- debug: y
- XEN_TARGET_ARCH: x86_32
# Ubuntu Trusty's Clang is 3.4 while Xen requires 3.5
ubuntu-trusty-gcc:
- <<: *build
+ extends: .gcc-x86-64-build
variables:
- <<: *gcc
CONTAINER: ubuntu:trusty
- debug: n
- XEN_TARGET_ARCH: x86_64
ubuntu-trusty-gcc-debug:
- <<: *build
+ extends: .gcc-x86-64-build-debug
variables:
- <<: *gcc
CONTAINER: ubuntu:trusty
- debug: y
- XEN_TARGET_ARCH: x86_64
ubuntu-xenial-clang:
- <<: *build
+ extends: .clang-x86-64-build
variables:
- <<: *clang
CONTAINER: ubuntu:xenial
- debug: n
- XEN_TARGET_ARCH: x86_64
ubuntu-xenial-clang-debug:
- <<: *build
+ extends: .clang-x86-64-build-debug
variables:
- <<: *clang
CONTAINER: ubuntu:xenial
- debug: y
- XEN_TARGET_ARCH: x86_64
ubuntu-xenial-gcc:
- <<: *build
+ extends: .gcc-x86-64-build
variables:
- <<: *gcc
CONTAINER: ubuntu:xenial
- debug: n
- XEN_TARGET_ARCH: x86_64
ubuntu-xenial-gcc-debug:
- <<: *build
+ extends: .gcc-x86-64-build-debug
variables:
- <<: *gcc
CONTAINER: ubuntu:xenial
- debug: y
- XEN_TARGET_ARCH: x86_64
ubuntu-bionic-clang:
- <<: *build
+ extends: .clang-x86-64-build
variables:
- <<: *clang
CONTAINER: ubuntu:bionic
- debug: n
- XEN_TARGET_ARCH: x86_64
ubuntu-bionic-clang-debug:
- <<: *build
+ extends: .clang-x86-64-build-debug
variables:
- <<: *clang
CONTAINER: ubuntu:bionic
- debug: y
- XEN_TARGET_ARCH: x86_64
ubuntu-bionic-gcc:
- <<: *build
+ extends: .gcc-x86-64-build
variables:
- <<: *gcc
CONTAINER: ubuntu:bionic
- debug: n
- XEN_TARGET_ARCH: x86_64
ubuntu-bionic-gcc-debug:
- <<: *build
+ extends: .gcc-x86-64-build-debug
variables:
- <<: *gcc
CONTAINER: ubuntu:bionic
- debug: y
- XEN_TARGET_ARCH: x86_64
# Arm builds
debian-unstable-gcc-arm64:
- <<: *build
+ extends: .gcc-arm64-build
variables:
- <<: *gcc
CONTAINER: debian:unstable-arm64v8
- debug: n
- XEN_TARGET_ARCH: arm64
- tags:
- - arm64
debian-unstable-gcc-debug-arm64:
- <<: *build
+ extends: .gcc-arm64-build-debug
variables:
- <<: *gcc
CONTAINER: debian:unstable-arm64v8
- debug: y
- XEN_TARGET_ARCH: arm64
- tags:
- - arm64
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] automation: introduce some RANDCONFIG tests
2018-11-16 13:12 [PATCH 0/3] Assorted Gitlab CI improvements Wei Liu
2018-11-16 13:12 ` [PATCH 1/3] automation: refactor gitlab-ci.yaml Wei Liu
@ 2018-11-16 13:12 ` Wei Liu
2018-11-16 13:12 ` [PATCH 3/3] automation: properly tag x86 jobs in Gitlab CI Wei Liu
2018-11-19 19:34 ` [PATCH 0/3] Assorted Gitlab CI improvements Doug Goldstein
3 siblings, 0 replies; 6+ messages in thread
From: Wei Liu @ 2018-11-16 13:12 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Doug Goldstein
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
.gitlab-ci.yml | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c7b3d3d5b..b268182bc6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -227,6 +227,18 @@ debian-unstable-gcc-debug:
variables:
CONTAINER: debian:unstable
+debian-unstable-gcc-randconfig:
+ extends: .gcc-x86-64-build
+ variables:
+ CONTAINER: debian:unstable
+ RANDCONFIG: y
+
+debian-unstable-gcc-debug-randconfig:
+ extends: .gcc-x86-64-build-debug
+ variables:
+ CONTAINER: debian:unstable
+ RANDCONFIG: y
+
debian-unstable-32-clang:
extends: .clang-x86-32-build
variables:
@@ -310,3 +322,15 @@ debian-unstable-gcc-debug-arm64:
extends: .gcc-arm64-build-debug
variables:
CONTAINER: debian:unstable-arm64v8
+
+debian-unstable-gcc-arm64-randconfig:
+ extends: .gcc-arm64-build
+ variables:
+ CONTAINER: debian:unstable-arm64v8
+ RANDCONFIG: y
+
+debian-unstable-gcc-debug-arm64-randconfig:
+ extends: .gcc-arm64-build-debug
+ variables:
+ CONTAINER: debian:unstable-arm64v8
+ RANDCONFIG: y
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] automation: properly tag x86 jobs in Gitlab CI
2018-11-16 13:12 [PATCH 0/3] Assorted Gitlab CI improvements Wei Liu
2018-11-16 13:12 ` [PATCH 1/3] automation: refactor gitlab-ci.yaml Wei Liu
2018-11-16 13:12 ` [PATCH 2/3] automation: introduce some RANDCONFIG tests Wei Liu
@ 2018-11-16 13:12 ` Wei Liu
2018-11-19 14:27 ` Wei Liu
2018-11-19 19:34 ` [PATCH 0/3] Assorted Gitlab CI improvements Doug Goldstein
3 siblings, 1 reply; 6+ messages in thread
From: Wei Liu @ 2018-11-16 13:12 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Doug Goldstein
Since we have introduced arm64 variants, we'd better start tagging the
old ones.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Doug, this requires properly tagging all the x86 runner hosts first.
---
.gitlab-ci.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b268182bc6..00c9fb9e3c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,6 +32,8 @@ stages:
<<: *build
variables:
XEN_TARGET_ARCH: x86_64
+ tags:
+ - x86_64
.x86-64-build:
extends: .x86-64-build-tmpl
@@ -47,6 +49,8 @@ stages:
<<: *build
variables:
XEN_TARGET_ARCH: x86_32
+ tags:
+ - x86_32
.x86-32-build:
extends: .x86-32-build-tmpl
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] automation: properly tag x86 jobs in Gitlab CI
2018-11-16 13:12 ` [PATCH 3/3] automation: properly tag x86 jobs in Gitlab CI Wei Liu
@ 2018-11-19 14:27 ` Wei Liu
0 siblings, 0 replies; 6+ messages in thread
From: Wei Liu @ 2018-11-19 14:27 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Doug Goldstein
On Fri, Nov 16, 2018 at 01:12:30PM +0000, Wei Liu wrote:
> Since we have introduced arm64 variants, we'd better start tagging the
> old ones.
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> Doug, this requires properly tagging all the x86 runner hosts first.
All runners are properly configured at this point, either by hand (the
one registered by Rackspace) or by terraform (the one controlled by xen
project).
Wei.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] Assorted Gitlab CI improvements
2018-11-16 13:12 [PATCH 0/3] Assorted Gitlab CI improvements Wei Liu
` (2 preceding siblings ...)
2018-11-16 13:12 ` [PATCH 3/3] automation: properly tag x86 jobs in Gitlab CI Wei Liu
@ 2018-11-19 19:34 ` Doug Goldstein
3 siblings, 0 replies; 6+ messages in thread
From: Doug Goldstein @ 2018-11-19 19:34 UTC (permalink / raw)
To: Wei Liu; +Cc: xen-devel
On Fri, Nov 16, 2018 at 01:12:27PM +0000, Wei Liu wrote:
> Wei Liu (3):
> automation: refactor gitlab-ci.yaml
> automation: introduce some RANDCONFIG tests
> automation: properly tag x86 jobs in Gitlab CI
>
> .gitlab-ci.yml | 309 ++++++++++++++++++++++++++++++---------------------------
> 1 file changed, 162 insertions(+), 147 deletions(-)
>
> --
> 2.11.0
>
Whole series looks great. I merged the changes to the Terraform configs
as well.
Acked-by: Doug Goldstein <cardoe@cardoe.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-11-19 19:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-16 13:12 [PATCH 0/3] Assorted Gitlab CI improvements Wei Liu
2018-11-16 13:12 ` [PATCH 1/3] automation: refactor gitlab-ci.yaml Wei Liu
2018-11-16 13:12 ` [PATCH 2/3] automation: introduce some RANDCONFIG tests Wei Liu
2018-11-16 13:12 ` [PATCH 3/3] automation: properly tag x86 jobs in Gitlab CI Wei Liu
2018-11-19 14:27 ` Wei Liu
2018-11-19 19:34 ` [PATCH 0/3] Assorted Gitlab CI improvements Doug Goldstein
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.