All of lore.kernel.org
 help / color / mirror / Atom feed
* [cip-dev] [PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs
@ 2019-10-13 21:19 Chris Paterson
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.19.y-cip 2/3] gitlab-ci: Remove unofficial build configurations Chris Paterson
                   ` (11 more replies)
  0 siblings, 12 replies; 18+ messages in thread
From: Chris Paterson @ 2019-10-13 21:19 UTC (permalink / raw)
  To: cip-dev

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@renesas.com>
---
 .gitlab-ci.yml | 84 +++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 66 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba8b75abaee7..b72f0325435a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [cip-dev] [PATCH linux-4.19.y-cip 2/3] gitlab-ci: Remove unofficial build configurations
  2019-10-13 21:19 [cip-dev] [PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
@ 2019-10-13 21:19 ` Chris Paterson
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.19.y-cip 3/3] gitlab-ci: Remove test timeout Chris Paterson
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Chris Paterson @ 2019-10-13 21:19 UTC (permalink / raw)
  To: cip-dev

The 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.

Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
---
 .gitlab-ci.yml | 67 --------------------------------------------------
 1 file changed, 67 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b72f0325435a..d297f3deaced 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [cip-dev] [PATCH linux-4.19.y-cip 3/3] gitlab-ci: Remove test timeout
  2019-10-13 21:19 [cip-dev] [PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.19.y-cip 2/3] gitlab-ci: Remove unofficial build configurations Chris Paterson
@ 2019-10-13 21:19 ` Chris Paterson
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.19.y-cip-rt 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Chris Paterson @ 2019-10-13 21:19 UTC (permalink / raw)
  To: cip-dev

Setting 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

Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d297f3deaced..3e6d493bbc89 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [cip-dev] [PATCH linux-4.19.y-cip-rt 1/3] gitlab-ci: Split tests into separate jobs
  2019-10-13 21:19 [cip-dev] [PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.19.y-cip 2/3] gitlab-ci: Remove unofficial build configurations Chris Paterson
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.19.y-cip 3/3] gitlab-ci: Remove test timeout Chris Paterson
@ 2019-10-13 21:19 ` Chris Paterson
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.19.y-cip-rt 2/3] gitlab-ci: Remove unofficial build configurations Chris Paterson
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Chris Paterson @ 2019-10-13 21:19 UTC (permalink / raw)
  To: cip-dev

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@renesas.com>
---
 .gitlab-ci.yml | 92 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 71 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52f084fe37b5..b5a225c96f90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [cip-dev] [PATCH linux-4.19.y-cip-rt 2/3] gitlab-ci: Remove unofficial build configurations
  2019-10-13 21:19 [cip-dev] [PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
                   ` (2 preceding siblings ...)
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.19.y-cip-rt 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
@ 2019-10-13 21:19 ` Chris Paterson
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.19.y-cip-rt 3/3] gitlab-ci: Remove test timeout Chris Paterson
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Chris Paterson @ 2019-10-13 21:19 UTC (permalink / raw)
  To: cip-dev

The 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.

Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
---
 .gitlab-ci.yml | 67 --------------------------------------------------
 1 file changed, 67 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5a225c96f90..7ebd29b94c3a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [cip-dev] [PATCH linux-4.19.y-cip-rt 3/3] gitlab-ci: Remove test timeout
  2019-10-13 21:19 [cip-dev] [PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
                   ` (3 preceding siblings ...)
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.19.y-cip-rt 2/3] gitlab-ci: Remove unofficial build configurations Chris Paterson
@ 2019-10-13 21:19 ` Chris Paterson
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Chris Paterson @ 2019-10-13 21:19 UTC (permalink / raw)
  To: cip-dev

Setting 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

Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ebd29b94c3a..08b3913d295e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [cip-dev] [PATCH linux-4.4.y-cip 1/3] gitlab-ci: Split tests into separate jobs
  2019-10-13 21:19 [cip-dev] [PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
                   ` (4 preceding siblings ...)
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.19.y-cip-rt 3/3] gitlab-ci: Remove test timeout Chris Paterson
@ 2019-10-13 21:19 ` Chris Paterson
  2019-10-14  5:54   ` Chris Paterson
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip 2/3] gitlab-ci: Remove unofficial build configurations Chris Paterson
                   ` (5 subsequent siblings)
  11 siblings, 1 reply; 18+ messages in thread
From: Chris Paterson @ 2019-10-13 21:19 UTC (permalink / raw)
  To: cip-dev

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@renesas.com>
---
 .gitlab-ci.yml | 60 ++++++++++++++++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e33099ea6594..73cea6bbce89 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
 
-# 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
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [cip-dev] [PATCH linux-4.4.y-cip 2/3] gitlab-ci: Remove unofficial build configurations
  2019-10-13 21:19 [cip-dev] [PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
                   ` (5 preceding siblings ...)
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
@ 2019-10-13 21:19 ` Chris Paterson
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip 3/3] gitlab-ci: Remove test timeout Chris Paterson
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Chris Paterson @ 2019-10-13 21:19 UTC (permalink / raw)
  To: cip-dev

We should concentrate our testing on the offical configurations.
We're essentially testing shmobile_defconfig anyway.

Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
---
 .gitlab-ci.yml | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73cea6bbce89..3ec65a007646 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [cip-dev] [PATCH linux-4.4.y-cip 3/3] gitlab-ci: Remove test timeout
  2019-10-13 21:19 [cip-dev] [PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
                   ` (6 preceding siblings ...)
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip 2/3] gitlab-ci: Remove unofficial build configurations Chris Paterson
@ 2019-10-13 21:19 ` Chris Paterson
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip-rt 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 18+ messages in thread
From: Chris Paterson @ 2019-10-13 21:19 UTC (permalink / raw)
  To: cip-dev

Setting 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

Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ec65a007646..1abe0735326c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,7 +62,6 @@ test:arm_renesas_shmobile_defconfig:
   when: always
   variables:
     GIT_STRATEGY: none
-    TEST_TIMEOUT: 60
   script:
     - /opt/submit_tests.sh
   artifacts:
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [cip-dev] [PATCH linux-4.4.y-cip-rt 1/3] gitlab-ci: Split tests into separate jobs
  2019-10-13 21:19 [cip-dev] [PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
                   ` (7 preceding siblings ...)
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip 3/3] gitlab-ci: Remove test timeout Chris Paterson
@ 2019-10-13 21:19 ` Chris Paterson
  2019-10-14  5:56   ` Chris Paterson
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip-rt 2/3] gitlab-ci: Remove unofficial build configurations Chris Paterson
                   ` (2 subsequent siblings)
  11 siblings, 1 reply; 18+ messages in thread
From: Chris Paterson @ 2019-10-13 21:19 UTC (permalink / raw)
  To: cip-dev

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@renesas.com>
---
 .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

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [cip-dev] [PATCH linux-4.4.y-cip-rt 2/3] gitlab-ci: Remove unofficial build configurations
  2019-10-13 21:19 [cip-dev] [PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
                   ` (8 preceding siblings ...)
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip-rt 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
@ 2019-10-13 21:19 ` Chris Paterson
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip-rt 3/3] gitlab-ci: Remove test timeout Chris Paterson
  2019-10-14  7:33 ` [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 Pavel Machek
  11 siblings, 0 replies; 18+ messages in thread
From: Chris Paterson @ 2019-10-13 21:19 UTC (permalink / raw)
  To: cip-dev

We should concentrate our testing on the offical configurations.
We're essentially testing shmobile_defconfig anyway.

Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
---
 .gitlab-ci.yml | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fcbfdd0b2197..bb7af78a5978 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [cip-dev] [PATCH linux-4.4.y-cip-rt 3/3] gitlab-ci: Remove test timeout
  2019-10-13 21:19 [cip-dev] [PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
                   ` (9 preceding siblings ...)
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip-rt 2/3] gitlab-ci: Remove unofficial build configurations Chris Paterson
@ 2019-10-13 21:19 ` Chris Paterson
  2019-10-14  7:33 ` [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 Pavel Machek
  11 siblings, 0 replies; 18+ messages in thread
From: Chris Paterson @ 2019-10-13 21:19 UTC (permalink / raw)
  To: cip-dev

Setting 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

Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb7af78a5978..6ff8f4e516c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,7 +62,6 @@ test:arm_renesas_shmobile_defconfig:
   when: always
   variables:
     GIT_STRATEGY: none
-    TEST_TIMEOUT: 60
   script:
     - /opt/submit_tests.sh
   artifacts:
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [cip-dev] [PATCH linux-4.4.y-cip 1/3] gitlab-ci: Split tests into separate jobs
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
@ 2019-10-14  5:54   ` Chris Paterson
  0 siblings, 0 replies; 18+ messages in thread
From: Chris Paterson @ 2019-10-14  5:54 UTC (permalink / raw)
  To: cip-dev

> From: Chris Paterson <chris.paterson2@renesas.com>
> 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@renesas.com>
> ---
>  .gitlab-ci.yml | 60 ++++++++++++++++++++++++++++++++------------------
>  1 file changed, 39 insertions(+), 21 deletions(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index e33099ea6594..73cea6bbce89 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
> 
> -# 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

Missing:
needs: ["build:arm_shmobile_defconfig"]

I'll send a v2 for the series.

Chris

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

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [cip-dev] [PATCH linux-4.4.y-cip-rt 1/3] gitlab-ci: Split tests into separate jobs
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip-rt 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
@ 2019-10-14  5:56   ` Chris Paterson
  2019-10-14  7:36     ` Pavel Machek
  0 siblings, 1 reply; 18+ messages in thread
From: Chris Paterson @ 2019-10-14  5:56 UTC (permalink / raw)
  To: cip-dev

> From: Chris Paterson <chris.paterson2@renesas.com>
> 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@renesas.com>
> ---
>  .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

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [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
  2019-10-13 21:19 [cip-dev] [PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
                   ` (10 preceding siblings ...)
  2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip-rt 3/3] gitlab-ci: Remove test timeout Chris Paterson
@ 2019-10-14  7:33 ` Pavel Machek
  2019-10-14  8:08   ` Chris Paterson
  11 siblings, 1 reply; 18+ messages in thread
From: Pavel Machek @ 2019-10-14  7:33 UTC (permalink / raw)
  To: cip-dev

Hi!

> 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


> Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
> ---
>  .gitlab-ci.yml | 84 +++++++++++++++++++++++++++++++++++++++-----------
>  1 file changed, 66 insertions(+), 18 deletions(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index ba8b75abaee7..b72f0325435a 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -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

-- 
(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>

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [cip-dev] [PATCH linux-4.4.y-cip-rt 1/3] gitlab-ci: Split tests into separate jobs
  2019-10-14  5:56   ` Chris Paterson
@ 2019-10-14  7:36     ` Pavel Machek
  2019-10-14  8:03       ` Chris Paterson
  0 siblings, 1 reply; 18+ messages in thread
From: Pavel Machek @ 2019-10-14  7:36 UTC (permalink / raw)
  To: cip-dev

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
-------------- 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>

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [cip-dev] [PATCH linux-4.4.y-cip-rt 1/3] gitlab-ci: Split tests into separate jobs
  2019-10-14  7:36     ` Pavel Machek
@ 2019-10-14  8:03       ` Chris Paterson
  0 siblings, 0 replies; 18+ messages in thread
From: Chris Paterson @ 2019-10-14  8:03 UTC (permalink / raw)
  To: cip-dev

> From: Pavel Machek <pavel@denx.de>
> 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

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [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
  2019-10-14  7:33 ` [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 Pavel Machek
@ 2019-10-14  8:08   ` Chris Paterson
  0 siblings, 0 replies; 18+ messages in thread
From: Chris Paterson @ 2019-10-14  8:08 UTC (permalink / raw)
  To: cip-dev

Hello Pavel, all,

> From: Pavel Machek <pavel@denx.de>
> Sent: 14 October 2019 08:34
>
> Hi!
>
> > 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.

Yep.

>
> 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.

>
> 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.

>
> 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

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2019-10-14  8:08 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-13 21:19 [cip-dev] [PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.19.y-cip 2/3] gitlab-ci: Remove unofficial build configurations Chris Paterson
2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.19.y-cip 3/3] gitlab-ci: Remove test timeout Chris Paterson
2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.19.y-cip-rt 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.19.y-cip-rt 2/3] gitlab-ci: Remove unofficial build configurations Chris Paterson
2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.19.y-cip-rt 3/3] gitlab-ci: Remove test timeout Chris Paterson
2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
2019-10-14  5:54   ` Chris Paterson
2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip 2/3] gitlab-ci: Remove unofficial build configurations Chris Paterson
2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip 3/3] gitlab-ci: Remove test timeout Chris Paterson
2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip-rt 1/3] gitlab-ci: Split tests into separate jobs Chris Paterson
2019-10-14  5:56   ` Chris Paterson
2019-10-14  7:36     ` Pavel Machek
2019-10-14  8:03       ` Chris Paterson
2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip-rt 2/3] gitlab-ci: Remove unofficial build configurations Chris Paterson
2019-10-13 21:19 ` [cip-dev] [PATCH linux-4.4.y-cip-rt 3/3] gitlab-ci: Remove test timeout Chris Paterson
2019-10-14  7:33 ` [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 Pavel Machek
2019-10-14  8:08   ` Chris Paterson

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.