[PATCH linux-4.4.y-cip-rt 1/3] gitlab-ci: Split tests into separate jobs


Chris Paterson
 

This will allow tests to run as soon as the corresponding build job is
complete.

This will help spread the load on the test infrastructure and save time.

Signed-off-by: Chris Paterson <chris.paterson2@...>
---
.gitlab-ci.yml | 66 ++++++++++++++++++++++++++++++++------------------
1 file changed, 43 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59323dd06c6a..fcbfdd0b2197 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,10 @@ variables:
DOCKER_DRIVER: overlay2
DOCKER_IMAGE_TAG: v2

-# Building
-arm_hitachi_omap_defconfig:
+###############################
+# Standard CIP configurations #
+###############################
+build:arm_hitachi_omap_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -21,7 +23,7 @@ arm_hitachi_omap_defconfig:
paths:
- output

-arm_moxa_mxc_defconfig:
+build:arm_moxa_mxc_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -37,7 +39,7 @@ arm_moxa_mxc_defconfig:
paths:
- output

-arm_renesas_shmobile_defconfig:
+build:arm_renesas_shmobile_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -54,7 +56,22 @@ arm_renesas_shmobile_defconfig:
paths:
- output

-arm_siemens_am335x-axm2_defconfig:
+test:arm_renesas_shmobile_defconfig:
+ stage: test
+ image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
+ when: always
+ variables:
+ GIT_STRATEGY: none
+ TEST_TIMEOUT: 60
+ script:
+ - /opt/submit_tests.sh
+ artifacts:
+ name: "$CI_JOB_NAME"
+ when: always
+ paths:
+ - output
+
+build:arm_siemens_am335x-axm2_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -70,7 +87,7 @@ arm_siemens_am335x-axm2_defconfig:
paths:
- output

-arm_siemens_am335x-draco_defconfig:
+build:arm_siemens_am335x-draco_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -86,7 +103,7 @@ arm_siemens_am335x-draco_defconfig:
paths:
- output

-arm_siemens_am335x-dxr2_defconfig:
+build:arm_siemens_am335x-dxr2_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -102,7 +119,7 @@ arm_siemens_am335x-dxr2_defconfig:
paths:
- output

-arm_siemens_am335x-etamin_defconfig:
+build:arm_siemens_am335x-etamin_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -118,7 +135,7 @@ arm_siemens_am335x-etamin_defconfig:
paths:
- output

-arm_siemens_am57xx-pxm3.config:
+build:arm_siemens_am57xx-pxm3.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -134,7 +151,7 @@ arm_siemens_am57xx-pxm3.config:
paths:
- output

-arm_siemens_dcu2.config:
+build:arm_siemens_dcu2.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -150,7 +167,7 @@ arm_siemens_dcu2.config:
paths:
- output

-arm_siemens_imx6_defconfig:
+build:arm_siemens_imx6_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -166,7 +183,7 @@ arm_siemens_imx6_defconfig:
paths:
- output

-arm_toshiba_tegra_defconfig:
+build:arm_toshiba_tegra_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -182,7 +199,7 @@ arm_toshiba_tegra_defconfig:
paths:
- output

-arm_toshiba_zynq_defconfig:
+build:arm_toshiba_zynq_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -198,7 +215,7 @@ arm_toshiba_zynq_defconfig:
paths:
- output

-x86_plathome_obsvx1.config:
+build:x86_plathome_obsvx1.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -214,7 +231,7 @@ x86_plathome_obsvx1.config:
paths:
- output

-x86_siemens_iot2000.config:
+build:x86_siemens_iot2000.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -230,7 +247,7 @@ x86_siemens_iot2000.config:
paths:
- output

-x86_siemens_server_defconfig:
+build:x86_siemens_server_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -246,7 +263,7 @@ x86_siemens_server_defconfig:
paths:
- output

-x86_toshiba_defconfig:
+build:x86_toshiba_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -262,8 +279,10 @@ x86_toshiba_defconfig:
paths:
- output

-# RT build configurations
-rt_x86_siemens_i386-rt.config:
+#########################
+# RT CIP configurations #
+#########################
+build:rt_x86_siemens_i386-rt.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -279,8 +298,10 @@ rt_x86_siemens_i386-rt.config:
paths:
- output

-# Extra build configurations
-arm_shmobile_defconfig:
+########################
+# Extra configurations #
+########################
+build:arm_shmobile_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -297,8 +318,7 @@ arm_shmobile_defconfig:
paths:
- output

-# Testing
-run_tests:
+test:arm_shmobile_defconfig:
stage: test
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
when: always
--
2.17.1


Chris Paterson
 

From: Chris Paterson <chris.paterson2@...>
Sent: 13 October 2019 22:19

This will allow tests to run as soon as the corresponding build job is
complete.

This will help spread the load on the test infrastructure and save time.

Signed-off-by: Chris Paterson <chris.paterson2@...>
---
.gitlab-ci.yml | 66 ++++++++++++++++++++++++++++++++------------------
1 file changed, 43 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59323dd06c6a..fcbfdd0b2197 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,10 @@ variables:
DOCKER_DRIVER: overlay2
DOCKER_IMAGE_TAG: v2

-# Building
-arm_hitachi_omap_defconfig:
+###############################
+# Standard CIP configurations #
+###############################
+build:arm_hitachi_omap_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -21,7 +23,7 @@ arm_hitachi_omap_defconfig:
paths:
- output

-arm_moxa_mxc_defconfig:
+build:arm_moxa_mxc_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -37,7 +39,7 @@ arm_moxa_mxc_defconfig:
paths:
- output

-arm_renesas_shmobile_defconfig:
+build:arm_renesas_shmobile_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -54,7 +56,22 @@ arm_renesas_shmobile_defconfig:
paths:
- output

-arm_siemens_am335x-axm2_defconfig:
+test:arm_renesas_shmobile_defconfig:
+ stage: test
Missing:
needs: ["build:arm_renesas_shmobile_defconfig"]

+ image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-
$DOCKER_IMAGE_TAG
+ when: always
+ variables:
+ GIT_STRATEGY: none
+ TEST_TIMEOUT: 60
+ script:
+ - /opt/submit_tests.sh
+ artifacts:
+ name: "$CI_JOB_NAME"
+ when: always
+ paths:
+ - output
+
+build:arm_siemens_am335x-axm2_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -70,7 +87,7 @@ arm_siemens_am335x-axm2_defconfig:
paths:
- output

-arm_siemens_am335x-draco_defconfig:
+build:arm_siemens_am335x-draco_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -86,7 +103,7 @@ arm_siemens_am335x-draco_defconfig:
paths:
- output

-arm_siemens_am335x-dxr2_defconfig:
+build:arm_siemens_am335x-dxr2_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -102,7 +119,7 @@ arm_siemens_am335x-dxr2_defconfig:
paths:
- output

-arm_siemens_am335x-etamin_defconfig:
+build:arm_siemens_am335x-etamin_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -118,7 +135,7 @@ arm_siemens_am335x-etamin_defconfig:
paths:
- output

-arm_siemens_am57xx-pxm3.config:
+build:arm_siemens_am57xx-pxm3.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -134,7 +151,7 @@ arm_siemens_am57xx-pxm3.config:
paths:
- output

-arm_siemens_dcu2.config:
+build:arm_siemens_dcu2.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -150,7 +167,7 @@ arm_siemens_dcu2.config:
paths:
- output

-arm_siemens_imx6_defconfig:
+build:arm_siemens_imx6_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -166,7 +183,7 @@ arm_siemens_imx6_defconfig:
paths:
- output

-arm_toshiba_tegra_defconfig:
+build:arm_toshiba_tegra_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -182,7 +199,7 @@ arm_toshiba_tegra_defconfig:
paths:
- output

-arm_toshiba_zynq_defconfig:
+build:arm_toshiba_zynq_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -198,7 +215,7 @@ arm_toshiba_zynq_defconfig:
paths:
- output

-x86_plathome_obsvx1.config:
+build:x86_plathome_obsvx1.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -214,7 +231,7 @@ x86_plathome_obsvx1.config:
paths:
- output

-x86_siemens_iot2000.config:
+build:x86_siemens_iot2000.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -230,7 +247,7 @@ x86_siemens_iot2000.config:
paths:
- output

-x86_siemens_server_defconfig:
+build:x86_siemens_server_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -246,7 +263,7 @@ x86_siemens_server_defconfig:
paths:
- output

-x86_toshiba_defconfig:
+build:x86_toshiba_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -262,8 +279,10 @@ x86_toshiba_defconfig:
paths:
- output

-# RT build configurations
-rt_x86_siemens_i386-rt.config:
+#########################
+# RT CIP configurations #
+#########################
+build:rt_x86_siemens_i386-rt.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -279,8 +298,10 @@ rt_x86_siemens_i386-rt.config:
paths:
- output

-# Extra build configurations
-arm_shmobile_defconfig:
+########################
+# Extra configurations #
+########################
+build:arm_shmobile_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-
$DOCKER_IMAGE_TAG
variables:
@@ -297,8 +318,7 @@ arm_shmobile_defconfig:
paths:
- output

-# Testing
-run_tests:
+test:arm_shmobile_defconfig:
stage: test
Missing:
needs: ["build:arm_shmobile_defconfig"]

I'll send a v2 for the series.

Kind regards, Chris

image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-
$DOCKER_IMAGE_TAG
when: always
--
2.17.1


Pavel Machek
 

Hi!

I'll send a v2 for the series.
Ok. Feel free to send just _one_ series for -cip; I can apply it to
both branches, or maybe just apply it to -cip, and rely on regular
-cip -> -cip-rt merge to propagate it to -rt so that history is clean.

Best regards,
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html


Chris Paterson
 

From: Pavel Machek <pavel@...>
Sent: 14 October 2019 08:36


Hi!

I'll send a v2 for the series.
Ok. Feel free to send just _one_ series for -cip; I can apply it to
both branches, or maybe just apply it to -cip, and rely on regular
-cip -> -cip-rt merge to propagate it to -rt so that history is clean.
Ah, sorry. Too late!

Feel free to disregard the -rt patches.

Kind regards, Chris


Best regards,
                                                                      Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures)
http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html