From patchwork Mon Oct 14 07:49:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Paterson X-Patchwork-Id: 11188019 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 245F0912 for ; Mon, 14 Oct 2019 08:05:02 +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 0CD7B2054F for ; Mon, 14 Oct 2019 08:05:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0CD7B2054F 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 439282658; Mon, 14 Oct 2019 08:04:50 +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 EB9842548 for ; Mon, 14 Oct 2019 07:49:36 +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 CFD3B1DD4F for ; Mon, 14 Oct 2019 07:49:35 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.67,295,1566831600"; d="scan'208";a="29035322" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 14 Oct 2019 16:49:34 +0900 Received: from renesas-ubuntu18.ree.adwin.renesas.com (unknown [10.226.36.183]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id F322C418CD1B; Mon, 14 Oct 2019 16:49:15 +0900 (JST) From: Chris Paterson To: cip-dev@lists.cip-project.org Date: Mon, 14 Oct 2019 08:49:06 +0100 Message-Id: <20191014074911.11161-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.4.y-cip v2 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 --- v1 -> v2 * Added missing 'needs' entries .gitlab-ci.yml | 62 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e33099ea6594..ad8ec722b717 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,23 @@ arm_renesas_shmobile_defconfig: paths: - output -arm_siemens_am335x-axm2_defconfig: +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 + 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 +88,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 +104,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 +120,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 +136,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 +152,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 +168,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 +184,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 +200,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 +216,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 +232,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 +248,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 +264,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 +280,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,9 +300,9 @@ arm_shmobile_defconfig: paths: - output -# Testing -run_tests: +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 when: always variables: From patchwork Mon Oct 14 07:49: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: 11188015 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 A0F6417D4 for ; Mon, 14 Oct 2019 08:04:53 +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 891C62054F for ; Mon, 14 Oct 2019 08:04:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 891C62054F 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 0D119CE5; Mon, 14 Oct 2019 08:04:50 +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 4C1A32540 for ; Mon, 14 Oct 2019 07:49:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id 748935D3 for ; Mon, 14 Oct 2019 07:49:21 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.67,295,1566831600"; d="scan'208";a="28817208" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 14 Oct 2019 16:49:20 +0900 Received: from renesas-ubuntu18.ree.adwin.renesas.com (unknown [10.226.36.183]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 38D95418DA82; Mon, 14 Oct 2019 16:49:20 +0900 (JST) From: Chris Paterson To: cip-dev@lists.cip-project.org Date: Mon, 14 Oct 2019 08:49:10 +0100 Message-Id: <20191014074911.11161-5-chris.paterson2@renesas.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191014074911.11161-1-chris.paterson2@renesas.com> References: <20191014074911.11161-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.4.y-cip-rt v2 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 We should concentrate our testing on the offical configurations. We're essentially testing shmobile_defconfig anyway. Signed-off-by: Chris Paterson --- v1 -> v2 * No change .gitlab-ci.yml | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b710b00e153..39c4103227b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -298,39 +298,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 - needs: ["build:arm_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 From patchwork Mon Oct 14 07:49: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: 11188013 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 75EF117D4 for ; Mon, 14 Oct 2019 08:04:50 +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 5CF4F2089C for ; Mon, 14 Oct 2019 08:04:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5CF4F2089C 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 E84072655; Mon, 14 Oct 2019 08:04:49 +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 E14642540 for ; Mon, 14 Oct 2019 07:49:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id 73F958AB for ; Mon, 14 Oct 2019 07:49:22 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.67,295,1566831600"; d="scan'208";a="28817212" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 14 Oct 2019 16:49:21 +0900 Received: from renesas-ubuntu18.ree.adwin.renesas.com (unknown [10.226.36.183]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 3A76E418DAA7; Mon, 14 Oct 2019 16:49:21 +0900 (JST) From: Chris Paterson To: cip-dev@lists.cip-project.org Date: Mon, 14 Oct 2019 08:49:11 +0100 Message-Id: <20191014074911.11161-6-chris.paterson2@renesas.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191014074911.11161-1-chris.paterson2@renesas.com> References: <20191014074911.11161-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.4.y-cip-rt v2 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 --- v1 -> v2 * No change .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39c4103227b4..d1fff4b891b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,7 +63,6 @@ test:arm_renesas_shmobile_defconfig: when: always variables: GIT_STRATEGY: none - TEST_TIMEOUT: 60 script: - /opt/submit_tests.sh artifacts: