From patchwork Wed Jul 31 22:02:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Paterson X-Patchwork-Id: 11069629 X-Patchwork-Delegate: iwamatsu@nigauri.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D0575112C for ; Wed, 31 Jul 2019 22:11:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1D9727DA4 for ; Wed, 31 Jul 2019 22:11:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B688C27F81; Wed, 31 Jul 2019 22:11:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0C27227DA4 for ; Wed, 31 Jul 2019 22:11:22 +0000 (UTC) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id B295C3EA2; Wed, 31 Jul 2019 22:11:22 +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 6CAD741FF for ; Wed, 31 Jul 2019 22:02:53 +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 388397DB for ; Wed, 31 Jul 2019 22:02:51 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.64,331,1559487600"; d="scan'208";a="22991713" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 01 Aug 2019 07:02:50 +0900 Received: from localhost.localdomain (unknown [172.29.51.24]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 33BDB40061AA; Thu, 1 Aug 2019 07:02:48 +0900 (JST) From: Chris Paterson To: cip-dev@lists.cip-project.org Date: Wed, 31 Jul 2019 23:02:41 +0100 Message-Id: <20190731220244.20321-1-chris.paterson2@renesas.com> X-Mailer: git-send-email 2.17.1 Subject: [cip-dev] [PATCH 4.19.y-cip-rt] Update CI to use the latest linux-cip-ci containers 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 X-Virus-Scanned: ClamAV using ClamSMTP The main aim of this update is to add support for more build architectures. In addition, we need to include a fix so that builds using Kernel configs from cip-kernel-config will work again, after changes to the directory structure caused us problems. Signed-off-by: Chris Paterson --- .gitlab-ci.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 96eed0e0c81a..fb775f4950b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,16 +2,17 @@ variables: GIT_STRATEGY: clone GIT_DEPTH: 10 DOCKER_DRIVER: overlay2 + DOCKER_IMAGE_TAG: v2 -build_arm_renesas_shmobile_defconfig: +arm_renesas_shmobile_defconfig: stage: build - image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1 + image: registry.gitlab.com/cip-playground/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables: BUILD_ARCH: arm CONFIG: renesas_shmobile_defconfig CONFIG_LOC: cip-kernel-config DEVICES: r8a7743-iwg20d-q7 r8a7745-iwg22d-sodimm - DTBS: arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dtb arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dtb + DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb r8a7745-iwg22d-sodimm-dbhd-ca.dtb script: - /opt/build_kernel.sh artifacts: @@ -20,15 +21,15 @@ build_arm_renesas_shmobile_defconfig: paths: - output -build_arm64_renesas_defconfig: +arm64_renesas_defconfig: stage: build - image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1 + image: registry.gitlab.com/cip-playground/linux-cip-ci:build-$DOCKER_IMAGE_TAG variables: BUILD_ARCH: arm64 CONFIG: renesas_defconfig CONFIG_LOC: cip-kernel-config DEVICES: r8a774c0-ek874 - DTBS: arch/arm64/boot/dts/renesas/r8a774c0-ek874.dtb + DTBS: r8a774c0-ek874.dtb script: - /opt/build_kernel.sh artifacts: @@ -37,15 +38,15 @@ build_arm64_renesas_defconfig: paths: - output -build_arm_shmobile_defconfig: +arm_shmobile_defconfig: stage: build - image: registry.gitlab.com/cip-playground/linux-cip-ci:build-v1 + image: registry.gitlab.com/cip-playground/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: arch/arm/boot/dts/r8a7743-iwg20d-q7-dbcm-ca.dtb arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dtb + DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb r8a7745-iwg22d-sodimm-dbhd-ca.dtb script: - /opt/build_kernel.sh artifacts: @@ -56,10 +57,11 @@ build_arm_shmobile_defconfig: run_tests: stage: test - image: registry.gitlab.com/cip-playground/linux-cip-ci:test-v1 + image: registry.gitlab.com/cip-playground/linux-cip-ci:test-$DOCKER_IMAGE_TAG when: always variables: GIT_STRATEGY: none + TEST_TIMEOUT: 30 script: - /opt/submit_tests.sh artifacts: