From patchwork Sun Oct 13 21:19:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Paterson X-Patchwork-Id: 11187519 X-Patchwork-Delegate: chris.paterson2@renesas.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 03F5613BD for ; Sun, 13 Oct 2019 21:29:09 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C9C6B207FF for ; Sun, 13 Oct 2019 21:29:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C9C6B207FF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=renesas.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=cip-dev-bounces@lists.cip-project.org Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 8604A24A9; Sun, 13 Oct 2019 21:29:08 +0000 (UTC) X-Original-To: cip-dev@lists.cip-project.org Delivered-To: cip-dev@mail.linuxfoundation.org Received: from smtp2.linuxfoundation.org (smtp2.linux-foundation.org [172.17.192.36]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 59C8A248B for ; Sun, 13 Oct 2019 21:19:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by smtp2.linuxfoundation.org (Postfix) with ESMTP id B0DA21DE65 for ; Sun, 13 Oct 2019 21:19:36 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.67,293,1566831600"; d="scan'208";a="28998026" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 14 Oct 2019 06:19:35 +0900 Received: from localhost.localdomain (unknown [172.29.51.221]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 5AC9F40083F8; Mon, 14 Oct 2019 06:19:34 +0900 (JST) From: Chris Paterson To: cip-dev@lists.cip-project.org Date: Sun, 13 Oct 2019 22:19:09 +0100 Message-Id: <20191013211920.9370-1-chris.paterson2@renesas.com> X-Mailer: git-send-email 2.17.1 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp2.linux-foundation.org Subject: [cip-dev] [PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs X-BeenThere: cip-dev@lists.cip-project.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: cip-dev-bounces@lists.cip-project.org Errors-To: cip-dev-bounces@lists.cip-project.org 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 --- .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 From patchwork Sun Oct 13 21:19:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Paterson X-Patchwork-Id: 11187525 X-Patchwork-Delegate: chris.paterson2@renesas.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8778313BD for ; Sun, 13 Oct 2019 21:29:16 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6D110206B7 for ; Sun, 13 Oct 2019 21:29:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D110206B7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=renesas.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=cip-dev-bounces@lists.cip-project.org Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 044BD249A; Sun, 13 Oct 2019 21:29:09 +0000 (UTC) X-Original-To: cip-dev@lists.cip-project.org Delivered-To: cip-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 94D1C248B for ; Sun, 13 Oct 2019 21:19:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id CAE4B88E for ; Sun, 13 Oct 2019 21:19:37 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.67,293,1566831600"; d="scan'208";a="28998029" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 14 Oct 2019 06:19:36 +0900 Received: from localhost.localdomain (unknown [172.29.51.221]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 9270F40083F8; Mon, 14 Oct 2019 06:19:35 +0900 (JST) From: Chris Paterson To: cip-dev@lists.cip-project.org Date: Sun, 13 Oct 2019 22:19:10 +0100 Message-Id: <20191013211920.9370-2-chris.paterson2@renesas.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191013211920.9370-1-chris.paterson2@renesas.com> References: <20191013211920.9370-1-chris.paterson2@renesas.com> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [cip-dev] [PATCH linux-4.19.y-cip 2/3] gitlab-ci: Remove unofficial build configurations X-BeenThere: cip-dev@lists.cip-project.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: cip-dev-bounces@lists.cip-project.org Errors-To: cip-dev-bounces@lists.cip-project.org 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 --- .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 From patchwork Sun Oct 13 21:19:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Paterson X-Patchwork-Id: 11187521 X-Patchwork-Delegate: chris.paterson2@renesas.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 302D117EE for ; Sun, 13 Oct 2019 21:29:09 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1869F207FF for ; Sun, 13 Oct 2019 21:29:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1869F207FF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=renesas.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=cip-dev-bounces@lists.cip-project.org Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id A2D77248E; Sun, 13 Oct 2019 21:29:08 +0000 (UTC) X-Original-To: cip-dev@lists.cip-project.org Delivered-To: cip-dev@mail.linuxfoundation.org Received: from smtp2.linuxfoundation.org (smtp2.linux-foundation.org [172.17.192.36]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 110C5248B for ; Sun, 13 Oct 2019 21:19:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by smtp2.linuxfoundation.org (Postfix) with ESMTP id 8D0D31DE65 for ; Sun, 13 Oct 2019 21:19:38 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.67,293,1566831600"; d="scan'208";a="28998033" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 14 Oct 2019 06:19:37 +0900 Received: from localhost.localdomain (unknown [172.29.51.221]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 98C9040083F8; Mon, 14 Oct 2019 06:19:36 +0900 (JST) From: Chris Paterson To: cip-dev@lists.cip-project.org Date: Sun, 13 Oct 2019 22:19:11 +0100 Message-Id: <20191013211920.9370-3-chris.paterson2@renesas.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191013211920.9370-1-chris.paterson2@renesas.com> References: <20191013211920.9370-1-chris.paterson2@renesas.com> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp2.linux-foundation.org Subject: [cip-dev] [PATCH linux-4.19.y-cip 3/3] gitlab-ci: Remove test timeout X-BeenThere: cip-dev@lists.cip-project.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: cip-dev-bounces@lists.cip-project.org Errors-To: cip-dev-bounces@lists.cip-project.org 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 --- .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: