gitlab-ci: Split tests into separate jobs
PATCH 1/3 gitlab-ci: Split tests into separate jobs
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.
--- .gitlab-ci.yml | 84 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 66 insertions(+), 18 deletions(-)
.gitlab-ci.yml +66 -18
@@ -4,8 +4,10 @@ variables: DOCKER_DRIVER: overlay2 DOCKER_IMAGE_TAG: v2 -# Building -arm_hitachi_cyclonev_defconfig: +############################### +# Standard CIP configurations # +############################### +build:arm_hitachi_cyclonev_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_cyclonev_defconfig: paths: - output -arm_hitachi_omap_defconfig: +build:arm_hitachi_omap_defconfig: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:
@@ -37,7 +39,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:
@@ -53,7 +55,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:
@@ -70,7 +72,22 @@ arm_renesas_shmobile_defconfig: paths: - output -arm_siemens_imx6.config: +test:arm_renesas_shmobile_defconfig: + stage: test + needs: ["build:arm_renesas_shmobile_defconfig"] + image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG + variables: + GIT_STRATEGY: none + TEST_TIMEOUT: 60 + script: + - /opt/submit_tests.sh + artifacts: + name: "$CI_JOB_NAME" + when: always + paths: + - output + +build:arm_siemens_imx6.config: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:
@@ -86,7 +103,7 @@ arm_siemens_imx6.config: paths: - output -arm64_moxa_eds_defconfig: +build:arm64_moxa_eds_defconfig: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:
@@ -102,7 +119,7 @@ arm64_moxa_eds_defconfig: paths: - output -arm64_renesas_defconfig: +build:arm64_renesas_defconfig: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:
@@ -119,7 +136,22 @@ arm64_renesas_defconfig: paths: - output -x86_plathome_obsvx2.config: +test:arm64_renesas_defconfig: + stage: test + needs: ["build:arm64_renesas_defconfig"] + image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG + variables: + GIT_STRATEGY: none + TEST_TIMEOUT: 60 + script: + - /opt/submit_tests.sh + artifacts: + name: "$CI_JOB_NAME" + when: always + paths: + - output + +build:x86_plathome_obsvx2.config: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:
@@ -135,7 +167,7 @@ x86_plathome_obsvx2.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:
@@ -151,7 +183,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:
@@ -167,7 +199,7 @@ x86_siemens_server_defconfig: paths: - output -x86_toshiba_atom_baytrail_cip.config: +build:x86_toshiba_atom_baytrail_cip.config: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:
@@ -183,8 +215,10 @@ x86_toshiba_atom_baytrail_cip.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:
@@ -201,7 +235,22 @@ arm_shmobile_defconfig: paths: - output -arm64_defconfig: +test:arm_shmobile_defconfig: + stage: test + needs: ["build:arm_shmobile_defconfig"] + image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG + variables: + GIT_STRATEGY: none + TEST_TIMEOUT: 60 + script: + - /opt/submit_tests.sh + artifacts: + name: "$CI_JOB_NAME" + when: always + paths: + - output + +build:arm64_defconfig: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:
@@ -218,11 +267,10 @@ arm64_defconfig: paths: - output -# Testing -run_tests: +test:arm64_defconfig: stage: test + needs: ["build:arm64_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
Signature · 1 line
2.17.1
PATCH 1/3 gitlab-ci: Split tests into separate jobs
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.
--- .gitlab-ci.yml | 92 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 71 insertions(+), 21 deletions(-)
.gitlab-ci.yml +71 -21
@@ -4,8 +4,10 @@ variables: DOCKER_DRIVER: overlay2 DOCKER_IMAGE_TAG: v2 -# Building -arm_hitachi_cyclonev_defconfig: +############################### +# Standard CIP configurations # +############################### +build:arm_hitachi_cyclonev_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_cyclonev_defconfig: paths: - output -arm_hitachi_omap_defconfig: +build:arm_hitachi_omap_defconfig: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:
@@ -37,7 +39,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:
@@ -53,7 +55,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:
@@ -70,7 +72,22 @@ arm_renesas_shmobile_defconfig: paths: - output -arm_siemens_imx6.config: +test:arm_renesas_shmobile_defconfig: + stage: test + needs: ["build:arm_renesas_shmobile_defconfig"] + image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG + variables: + GIT_STRATEGY: none + TEST_TIMEOUT: 60 + script: + - /opt/submit_tests.sh + artifacts: + name: "$CI_JOB_NAME" + when: always + paths: + - output + +build:arm_siemens_imx6.config: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:
@@ -86,7 +103,7 @@ arm_siemens_imx6.config: paths: - output -arm64_moxa_eds_defconfig: +build:arm64_moxa_eds_defconfig: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:
@@ -102,7 +119,7 @@ arm64_moxa_eds_defconfig: paths: - output -arm64_renesas_defconfig: +build:arm64_renesas_defconfig: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:
@@ -119,7 +136,22 @@ arm64_renesas_defconfig: paths: - output -x86_plathome_obsvx2.config: +test:arm64_renesas_defconfig: + stage: test + needs: ["build:arm64_renesas_defconfig"] + image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG + variables: + GIT_STRATEGY: none + TEST_TIMEOUT: 60 + script: + - /opt/submit_tests.sh + artifacts: + name: "$CI_JOB_NAME" + when: always + paths: + - output + +build:x86_plathome_obsvx2.config: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:
@@ -135,7 +167,7 @@ x86_plathome_obsvx2.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:
@@ -151,7 +183,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:
@@ -167,7 +199,7 @@ x86_siemens_server_defconfig: paths: - output -x86_toshiba_atom_baytrail_cip.config: +build:x86_toshiba_atom_baytrail_cip.config: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:
@@ -183,8 +215,10 @@ x86_toshiba_atom_baytrail_cip.config: paths: - output -# RT build configurations -rt_arm_socfpga_defconfig: +######################### +# RT CIP configurations # +######################### +build:rt_arm_socfpga_defconfig: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:
@@ -200,7 +234,7 @@ rt_arm_socfpga_defconfig: paths: - output -rt_x86_siemens_i386-rt.config: +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:
@@ -216,8 +250,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:
@@ -234,7 +270,22 @@ arm_shmobile_defconfig: paths: - output -arm64_defconfig: +test:arm_shmobile_defconfig: + stage: test + needs: ["build:arm_shmobile_defconfig"] + image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG + variables: + GIT_STRATEGY: none + TEST_TIMEOUT: 60 + script: + - /opt/submit_tests.sh + artifacts: + name: "$CI_JOB_NAME" + when: always + paths: + - output + +build:arm64_defconfig: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:
@@ -251,11 +302,10 @@ arm64_defconfig: paths: - output -# Testing -run_tests: +test:arm64_defconfig: stage: test + needs: ["build:arm64_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
Signature · 1 line
2.17.1
PATCH 1/3 gitlab-ci: Split tests into separate jobs
In reply to Chris PatersonThis 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.
--- .gitlab-ci.yml | 60 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 21 deletions(-)
.gitlab-ci.yml +39 -21
@@ -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 -# 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:
@@ -280,8 +299,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
Signature · 1 line
2.17.1
PATCH 1/3 gitlab-ci: Split tests into separate jobs
Quoted 52 lines
From: Chris Paterson <[email protected]>
Sent: 13 October 2019 22:19This 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 <[email protected]>--- .gitlab-ci.yml | 60 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 21 deletions(-).gitlab-ci.yml +4
-2@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:
.gitlab-ci.yml arm_renesas_shmobile_defconfig: · line 60
Quoted 6 lines
.gitlab-ci.yml +2
-1@@ -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"]
Quoted 154 lines
.gitlab-ci.yml +1
-0+ image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
.gitlab-ci.yml +13
-0+ 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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +4
-2@@ -262,8 +279,10 @@ x86_toshiba_defconfig: 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:
.gitlab-ci.yml arm_shmobile_defconfig: · line 303
Quoted 7 lines
.gitlab-ci.yml +1
-2@@ -280,8 +299,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.
Chris
Quoted 5 lines
.gitlab-ci.yml +0
-0image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
when: always
--
2.17.1
PATCH 1/3 gitlab-ci: Split tests into separate jobs
In reply to Chris PatersonThis 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.
--- .gitlab-ci.yml | 66 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 23 deletions(-)
.gitlab-ci.yml +43 -23
@@ -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
Signature · 1 line
2.17.1
PATCH 1/3 gitlab-ci: Split tests into separate jobs
Quoted 52 lines
From: Chris Paterson <[email protected]>
Sent: 13 October 2019 22:19This 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 <[email protected]>--- .gitlab-ci.yml | 66 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 23 deletions(-).gitlab-ci.yml +4
-2@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:
.gitlab-ci.yml arm_renesas_shmobile_defconfig: · line 60
Quoted 6 lines
.gitlab-ci.yml +2
-1@@ -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"]
Quoted 168 lines
.gitlab-ci.yml +1
-0+ image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
.gitlab-ci.yml +13
-0+ 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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +1
-1@@ -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:.gitlab-ci.yml +4
-2@@ -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:.gitlab-ci.yml +4
-2@@ -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:
.gitlab-ci.yml arm_shmobile_defconfig: · line 322
Quoted 7 lines
.gitlab-ci.yml +1
-2@@ -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
Quoted 5 lines
.gitlab-ci.yml +0
-0image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
when: always
--
2.17.1
PATCH 1/3 gitlab-ci: Split tests into separate jobs
Hi!
Quoted 1 line
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
Signature · 9 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191014/594491b5/attachment.sig>
PATCH 1/3 gitlab-ci: Split tests into separate jobs
Quoted 11 lines
From: Pavel Machek <[email protected]>
Sent: 14 October 2019 08:36Hi!
Quoted 1 line
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
Quoted 7 lines
Best regards,
????? ??????? ??????? ??????? ??????? ??????? ??????? ??????? ??????? Pavel --
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures)
http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH 2/3 gitlab-ci: Remove unofficial build configurations
In reply to Chris PatersonThe Arm64 defconfig creates a huge image and an even larger modules archive.
Both the build and test takes a long time, and CIP don't officially support this configuration.
Also remove shmobile_defconfig as we're essentially building/testing the same already.
--- .gitlab-ci.yml | 67 -------------------------------------------------- 1 file changed, 67 deletions(-)
.gitlab-ci.yml +0 -67
@@ -214,70 +214,3 @@ build:x86_toshiba_atom_baytrail_cip.config: when: always paths: - output - -######################## -# Extra configurations # -######################## -build:arm_shmobile_defconfig: - stage: build - image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG - variables: - BUILD_ARCH: arm - CONFIG: shmobile_defconfig - CONFIG_LOC: intree - DEVICES: r8a7743-iwg20d-q7 r8a7745-iwg22d-sodimm - DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb r8a7745-iwg22d-sodimm-dbhd-ca.dtb - script: - - /opt/build_kernel.sh - artifacts: - name: "$CI_JOB_NAME" - when: always - paths: - - output - -test:arm_shmobile_defconfig: - stage: test - needs: ["build:arm_shmobile_defconfig"] - image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG - variables: - GIT_STRATEGY: none - TEST_TIMEOUT: 60 - script: - - /opt/submit_tests.sh - artifacts: - name: "$CI_JOB_NAME" - when: always - paths: - - output - -build:arm64_defconfig: - stage: build - image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG - variables: - BUILD_ARCH: arm64 - CONFIG: defconfig - CONFIG_LOC: intree - DEVICES: r8a774c0-ek874 r8a774a1-hihope-rzg2m-ex - DTBS: r8a774c0-ek874.dtb r8a774a1-hihope-rzg2m-ex.dtb - script: - - /opt/build_kernel.sh - artifacts: - name: "$CI_JOB_NAME" - when: always - paths: - - output - -test:arm64_defconfig: - stage: test - needs: ["build:arm64_defconfig"] - image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG - variables: - GIT_STRATEGY: none - TEST_TIMEOUT: 60 - script: - - /opt/submit_tests.sh - artifacts: - name: "$CI_JOB_NAME" - when: always - paths: - - output
Signature · 1 line
2.17.1
PATCH 2/3 gitlab-ci: Remove unofficial build configurations
In reply to Chris PatersonThe Arm64 defconfig creates a huge image and an even larger modules archive.
Both the build and test takes a long time, and CIP don't officially support this configuration.
Also remove shmobile_defconfig as we're essentially building/testing the same already.
--- .gitlab-ci.yml | 67 -------------------------------------------------- 1 file changed, 67 deletions(-)
.gitlab-ci.yml +0 -67
@@ -249,70 +249,3 @@ build:rt_x86_siemens_i386-rt.config: when: always paths: - output - -######################## -# Extra configurations # -######################## -build:arm_shmobile_defconfig: - stage: build - image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG - variables: - BUILD_ARCH: arm - CONFIG: shmobile_defconfig - CONFIG_LOC: intree - DEVICES: r8a7743-iwg20d-q7 r8a7745-iwg22d-sodimm - DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb r8a7745-iwg22d-sodimm-dbhd-ca.dtb - script: - - /opt/build_kernel.sh - artifacts: - name: "$CI_JOB_NAME" - when: always - paths: - - output - -test:arm_shmobile_defconfig: - stage: test - needs: ["build:arm_shmobile_defconfig"] - image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG - variables: - GIT_STRATEGY: none - TEST_TIMEOUT: 60 - script: - - /opt/submit_tests.sh - artifacts: - name: "$CI_JOB_NAME" - when: always - paths: - - output - -build:arm64_defconfig: - stage: build - image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG - variables: - BUILD_ARCH: arm64 - CONFIG: defconfig - CONFIG_LOC: intree - DEVICES: r8a774c0-ek874 r8a774a1-hihope-rzg2m-ex - DTBS: r8a774c0-ek874.dtb r8a774a1-hihope-rzg2m-ex.dtb - script: - - /opt/build_kernel.sh - artifacts: - name: "$CI_JOB_NAME" - when: always - paths: - - output - -test:arm64_defconfig: - stage: test - needs: ["build:arm64_defconfig"] - image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG - variables: - GIT_STRATEGY: none - TEST_TIMEOUT: 60 - script: - - /opt/submit_tests.sh - artifacts: - name: "$CI_JOB_NAME" - when: always - paths: - - output
Signature · 1 line
2.17.1
PATCH 2/3 gitlab-ci: Remove unofficial build configurations
In reply to Chris PatersonWe should concentrate our testing on the offical configurations. We're essentially testing shmobile_defconfig anyway.
--- .gitlab-ci.yml | 35 ----------------------------------- 1 file changed, 35 deletions(-)
.gitlab-ci.yml +0 -35
@@ -278,38 +278,3 @@ build:x86_toshiba_defconfig: when: always paths: - output - -######################## -# Extra configurations # -######################## -build:arm_shmobile_defconfig: - stage: build - image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG - variables: - BUILD_ARCH: arm - CONFIG: shmobile_defconfig - CONFIG_LOC: intree - DEVICES: r8a7743-iwg20d-q7 r8a7745-iwg22d-sodimm r8a77470-iwg23s-sbc - DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb r8a7745-iwg22d-sodimm-dbhd-ca.dtb r8a77470-iwg23s-sbc.dtb - script: - - /opt/build_kernel.sh - artifacts: - name: "$CI_JOB_NAME" - when: always - paths: - - output - -test:arm_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
Signature · 1 line
2.17.1
PATCH 2/3 gitlab-ci: Remove unofficial build configurations
In reply to Chris PatersonWe should concentrate our testing on the offical configurations. We're essentially testing shmobile_defconfig anyway.
--- .gitlab-ci.yml | 35 ----------------------------------- 1 file changed, 35 deletions(-)
.gitlab-ci.yml +0 -35
@@ -297,38 +297,3 @@ build:rt_x86_siemens_i386-rt.config: when: always paths: - output - -######################## -# Extra configurations # -######################## -build:arm_shmobile_defconfig: - stage: build - image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG - variables: - BUILD_ARCH: arm - CONFIG: shmobile_defconfig - CONFIG_LOC: intree - DEVICES: r8a7743-iwg20d-q7 r8a7745-iwg22d-sodimm r8a77470-iwg23s-sbc - DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb r8a7745-iwg22d-sodimm-dbhd-ca.dtb r8a77470-iwg23s-sbc.dtb - script: - - /opt/build_kernel.sh - artifacts: - name: "$CI_JOB_NAME" - when: always - paths: - - output - -test:arm_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
Signature · 1 line
2.17.1
PATCH 3/3 gitlab-ci: Remove test timeout
In reply to Chris PatersonSetting a relevant test timeout is hard as we've no idea how many other test jobs are running.
We have another two timeouts already:
1) The CI job timeut setting in the GitLab runner
2) The LAVA test job timeout
--- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-)
.gitlab-ci.yml +0 -2
@@ -78,7 +78,6 @@ test:arm_renesas_shmobile_defconfig: image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG variables: GIT_STRATEGY: none - TEST_TIMEOUT: 60 script: - /opt/submit_tests.sh artifacts:
@@ -142,7 +141,6 @@ test:arm64_renesas_defconfig: image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG variables: GIT_STRATEGY: none - TEST_TIMEOUT: 60 script: - /opt/submit_tests.sh artifacts:
Signature · 1 line
2.17.1
PATCH 3/3 gitlab-ci: Remove test timeout
In reply to Chris PatersonSetting a relevant test timeout is hard as we've no idea how many other test jobs are running.
We have another two timeouts already:
1) The CI job timeut setting in the GitLab runner
2) The LAVA test job timeout
--- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-)
.gitlab-ci.yml +0 -2
@@ -78,7 +78,6 @@ test:arm_renesas_shmobile_defconfig: image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG variables: GIT_STRATEGY: none - TEST_TIMEOUT: 60 script: - /opt/submit_tests.sh artifacts:
@@ -142,7 +141,6 @@ test:arm64_renesas_defconfig: image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG variables: GIT_STRATEGY: none - TEST_TIMEOUT: 60 script: - /opt/submit_tests.sh artifacts:
Signature · 1 line
2.17.1
PATCH 3/3 gitlab-ci: Remove test timeout
In reply to Chris PatersonSetting a relevant test timeout is hard as we've no idea how many other test jobs are running.
We have another two timeouts already:
1) The CI job timeut setting in the GitLab runner
2) The LAVA test job timeout
--- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-)
.gitlab-ci.yml +0 -1
@@ -62,7 +62,6 @@ test:arm_renesas_shmobile_defconfig: when: always variables: GIT_STRATEGY: none - TEST_TIMEOUT: 60 script: - /opt/submit_tests.sh artifacts:
Signature · 1 line
2.17.1
PATCH 3/3 gitlab-ci: Remove test timeout
In reply to Chris PatersonSetting a relevant test timeout is hard as we've no idea how many other test jobs are running.
We have another two timeouts already:
1) The CI job timeut setting in the GitLab runner
2) The LAVA test job timeout
--- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-)
.gitlab-ci.yml +0 -1
@@ -62,7 +62,6 @@ test:arm_renesas_shmobile_defconfig: when: always variables: GIT_STRATEGY: none - TEST_TIMEOUT: 60 script: - /opt/submit_tests.sh artifacts:
Signature · 1 line
2.17.1
[cip-dev] Rethinking .yml files in the repositories was Re: [PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs
In reply to Chris PatersonHi!
Quoted 5 lines
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.
When we agreed to merge .yml files into the git, I was assuming they would be kind of static... but apparently that was wrong assumption.
It seems the .yml needs to change as boards are added/removed and as our test infrastructure changes.
There are complications we did not foresee: these updates are made in parallel to -cip and -cip-rt trees. That unfortunately means, that when I'm updating -cip-rt tree, each of them tends to show up as a conflict. And then, when updating -cip-rt-rebase, I get to solve them again.
Which is not fun and it makes history more complex than it should have been. Jan already expressed concerns about too much churn.
So... there was proposal with separate repository for testing. I believe we need to explore that.
Best regards,
Pavel
Quoted 193 lines
Signed-off-by Chris Paterson <[email protected]>--- .gitlab-ci.yml | 84 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 66 insertions(+), 18 deletions(-).gitlab-ci.yml +66
-18@@ -4,8 +4,10 @@ variables: DOCKER_DRIVER: overlay2 DOCKER_IMAGE_TAG: v2 -# Building -arm_hitachi_cyclonev_defconfig: +############################### +# Standard CIP configurations # +############################### +build:arm_hitachi_cyclonev_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_cyclonev_defconfig: paths: - output -arm_hitachi_omap_defconfig: +build:arm_hitachi_omap_defconfig: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:@@ -37,7 +39,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:@@ -53,7 +55,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:@@ -70,7 +72,22 @@ arm_renesas_shmobile_defconfig: paths: - output -arm_siemens_imx6.config: +test:arm_renesas_shmobile_defconfig: + stage: test + needs: ["build:arm_renesas_shmobile_defconfig"] + image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG + variables: + GIT_STRATEGY: none + TEST_TIMEOUT: 60 + script: + - /opt/submit_tests.sh + artifacts: + name: "$CI_JOB_NAME" + when: always + paths: + - output + +build:arm_siemens_imx6.config: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:@@ -86,7 +103,7 @@ arm_siemens_imx6.config: paths: - output -arm64_moxa_eds_defconfig: +build:arm64_moxa_eds_defconfig: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:@@ -102,7 +119,7 @@ arm64_moxa_eds_defconfig: paths: - output -arm64_renesas_defconfig: +build:arm64_renesas_defconfig: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:@@ -119,7 +136,22 @@ arm64_renesas_defconfig: paths: - output -x86_plathome_obsvx2.config: +test:arm64_renesas_defconfig: + stage: test + needs: ["build:arm64_renesas_defconfig"] + image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG + variables: + GIT_STRATEGY: none + TEST_TIMEOUT: 60 + script: + - /opt/submit_tests.sh + artifacts: + name: "$CI_JOB_NAME" + when: always + paths: + - output + +build:x86_plathome_obsvx2.config: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:@@ -135,7 +167,7 @@ x86_plathome_obsvx2.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:@@ -151,7 +183,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:@@ -167,7 +199,7 @@ x86_siemens_server_defconfig: paths: - output -x86_toshiba_atom_baytrail_cip.config: +build:x86_toshiba_atom_baytrail_cip.config: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:@@ -183,8 +215,10 @@ x86_toshiba_atom_baytrail_cip.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:@@ -201,7 +235,22 @@ arm_shmobile_defconfig: paths: - output -arm64_defconfig: +test:arm_shmobile_defconfig: + stage: test + needs: ["build:arm_shmobile_defconfig"] + image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG + variables: + GIT_STRATEGY: none + TEST_TIMEOUT: 60 + script: + - /opt/submit_tests.sh + artifacts: + name: "$CI_JOB_NAME" + when: always + paths: + - output + +build:arm64_defconfig: stage: build image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables:@@ -218,11 +267,10 @@ arm64_defconfig: paths: - output -# Testing -run_tests: +test:arm64_defconfig: stage: test + needs: ["build:arm64_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
Signature · 9 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191014/1ec88db6/attachment.sig>
[cip-dev] Rethinking .yml files in the repositories was Re: [PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs
Hello Pavel, all,
Quoted 8 lines
From: Pavel Machek <[email protected]>
Sent: 14 October 2019 08:34Hi!
Quoted 3 lines
This will allow tests to run as soon as the corresponding build job is complete.
Quoted 8 lines
Quoted 2 lines
This will help spread the load on the test infrastructure and save time.
When we agreed to merge .yml files into the git, I was assuming they would be kind of static... but apparently that was wrong assumption.
It seems the .yml needs to change as boards are added/removed and as our test infrastructure changes.
Yep.
Quoted 6 lines
There are complications we did not foresee: these updates are made in parallel to -cip and -cip-rt trees. That unfortunately means, that when I'm updating -cip-rt tree, each of them tends to show up as a conflict. And then, when updating -cip-rt-rebase, I get to solve them again.
Yes, this is an issue. Although I guess it's a fairly easy merge, albeit an annoying one.
Quoted 3 lines
Which is not fun and it makes history more complex than it should have been. Jan already expressed concerns about too much churn.
Agreed, it's not ideal.
Quoted 3 lines
So... there was proposal with separate repository for testing. I believe we need to explore that.
We can, and I already have a bit with the LTS stable rc testing.
The main problem with using a separate GitLab project to run the CI is that it's very difficult to see in the GitLab CI interface what commit etc. was actually tested. The GitLab interface only shows the commit tested from the 'CI' project, not the project that was being built.
Please see [0] for an example, compared to a similar run where the CI is run from the same project as the source [1].
[0] https://gitlab.com/cip-playground/linux-stable-rc-ci/pipelines/88564586
[1] https://gitlab.com/cip-project/cip-kernel/linux-cip/pipelines/88520104
Some options, I'm sure there will be many more...
1) Stick with the current approach and rely on the maintainer to fix the gitlab-ci patches for RT. Fingers crossed for the next CIP Kernel we won't need a separate RT branch anyway. Actually, I'm pretty sure I can find a way to modify the gitlab-ci.yml file so the same one can be used for RT and non-RT branches.
This would help with the RT merge issues, but won't help with the churn (although the churn should die down after a while).
2) Use a separate GitLab repository for CI work and use a different front end to view the CI results (e.g. KernelCI).
3) Stop using GitLab entirely and use another external CI setup like Jenkins.
Any thoughts?
Kind regards, Chris