From patchwork Mon Aug 12 16:08:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1145798 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 466gl95gyGz9sN6 for ; Tue, 13 Aug 2019 02:09:07 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 98793C21EE7; Mon, 12 Aug 2019 16:08:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A1995C21E4E; Mon, 12 Aug 2019 16:08:54 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E5E0FC21E50; Mon, 12 Aug 2019 16:08:53 +0000 (UTC) Received: from mail-yb1-f175.google.com (mail-yb1-f175.google.com [209.85.219.175]) by lists.denx.de (Postfix) with ESMTPS id 600CCC21DF9 for ; Mon, 12 Aug 2019 16:08:53 +0000 (UTC) Received: by mail-yb1-f175.google.com with SMTP id o82so7153160ybg.10 for ; Mon, 12 Aug 2019 09:08:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=GxI/SWDis/UQ9BXCnAIEBrttNFp+Xqg3GoWUmJQgToI=; b=tWrnNGwiYo/9BozSj/WIzvh3cerTzO7AQEjnfh0kDDEifs3WwvhCSgod94lIZNi7g6 tk8T4ThqX0xqD0KZd6G+Khuxj449kIXK4ye2szOSW5sYkHtnEvLArzSjl0p2Eht3wQwx re2Kck8s+fNaTsvXtbpzEVoP1Z6OwyFwBSU43yTQpOgvZAEDr2FgX621ib0lqSnJqvGU D9RNbuAYNKst9i+nPlT1YWMyJv3MR6uCx5drIYAo61fLSdij/riK5wUH2QTclWzkoAvX ei6ys4CY8cmD/vCP/C3bPrB58ycDCEdgON1hqIiPuaWYPWTXD6tg0f/6Lg/BAIvaUef3 r2sQ== X-Gm-Message-State: APjAAAXPaVMkb66Xodfhs1io2wOn+cBTxnWkwPV1Igc9vFnw7+nMLRQT 2rHwEEdoUlci2NnN8hK5X3xlWqw= X-Google-Smtp-Source: APXvYqzpWKusr3n4MXTgrFCqcCYAEAZ0H+8y8W6iyTIK1F5JtgjMGlAO3Fe7UNf7TGsphpyUZnO8Wg== X-Received: by 2002:a25:bd87:: with SMTP id f7mr23481888ybh.143.1565626131603; Mon, 12 Aug 2019 09:08:51 -0700 (PDT) Received: from bill-the-cat.local (cpe-2606-A000-1401-82DE-9469-3D3A-521-4B3E.dyn6.twc.com. [2606:a000:1401:82de:9469:3d3a:521:4b3e]) by smtp.gmail.com with ESMTPSA id e127sm1641117ywb.28.2019.08.12.09.08.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Aug 2019 09:08:50 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Mon, 12 Aug 2019 12:08:47 -0400 Message-Id: <1565626128-2563-1-git-send-email-trini@konsulko.com> X-Mailer: git-send-email 2.7.4 Subject: [U-Boot] [PATCH 1/2] gitlab-ci: Add USER environment variable to buildman/patman tests X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The way that some of the tests here are designed, they expect USER to be set in the environment. This is not the case in the docker images, so set a reasonable value. Signed-off-by: Tom Rini --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0759561ce9a8..98e03d6ffb43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -152,12 +152,14 @@ Run patman testsuite: script: - git config --global user.name "GitLab CI Runner" - git config --global user.email trini@konsulko.com + - export USER=gitlab - ./tools/patman/patman --test Run buildman testsuite: tags: [ 'all' ] stage: testsuites script: + - export USER=gitlab - ./tools/buildman/buildman -t Run binman and dtoc testsuite: From patchwork Mon Aug 12 16:08:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1145799 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=konsulko.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 466glW3qFMz9sN6 for ; Tue, 13 Aug 2019 02:09:27 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id EC9ACC21EEF; Mon, 12 Aug 2019 16:09:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1E2B1C21EC2; Mon, 12 Aug 2019 16:08:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 24512C21DF9; Mon, 12 Aug 2019 16:08:54 +0000 (UTC) Received: from mail-yb1-f181.google.com (mail-yb1-f181.google.com [209.85.219.181]) by lists.denx.de (Postfix) with ESMTPS id 990C0C21E4E for ; Mon, 12 Aug 2019 16:08:53 +0000 (UTC) Received: by mail-yb1-f181.google.com with SMTP id x10so1227517ybs.13 for ; Mon, 12 Aug 2019 09:08:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=vJKmReo4Bm35eVSRTgONYUflSwRtbLIHDpelCWFgPgU=; b=BtzH5cLbKKjev/bThgSI6XoVMX48hgCO/D36idrYCFCiMeN/uoH1mnWhtkQ4OeTOe4 zeqeQ4tF0eZdleKteMLzRbMHNfnGSQ17doFrgLciYvlFQ81kTeAznjorWFf4/ZEf2EP2 CJel1FjtKZQnvp9gzRwR0UWfjLDNz4n8dPFXdFJ3i3rNdAGLW2mwa+IR24hAS+Dth8Uq GB/nRGhj1UHqmP6gT2TDmK9BSJ0CV7ZURaXShRU70HhfLu02sVRu5Tic9HSlpvfCVR+l IeVseeXCpCX1t+23KjbQIKJe5xwYFs7WSveWNamoZ8eS04tcUxzIZFUrEZKdunkU6UkY Kuug== X-Gm-Message-State: APjAAAUuwnrrATz/NO2fFR5fXhPvYfBbgPMVf+qaFQ09EjBczg+MoVSG YBSZwGCkLoRTp/gDhEKRDaaenw0= X-Google-Smtp-Source: APXvYqwMxysUnKwzeI0znpoGoY4nnb4Gyta2bJLfJRLkOKvIjSlP1DlX/abG9FqIMm4kFJfGRT++BA== X-Received: by 2002:a25:ae5d:: with SMTP id g29mr18926206ybe.42.1565626132263; Mon, 12 Aug 2019 09:08:52 -0700 (PDT) Received: from bill-the-cat.local (cpe-2606-A000-1401-82DE-9469-3D3A-521-4B3E.dyn6.twc.com. [2606:a000:1401:82de:9469:3d3a:521:4b3e]) by smtp.gmail.com with ESMTPSA id e127sm1641117ywb.28.2019.08.12.09.08.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Aug 2019 09:08:51 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Mon, 12 Aug 2019 12:08:48 -0400 Message-Id: <1565626128-2563-2-git-send-email-trini@konsulko.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1565626128-2563-1-git-send-email-trini@konsulko.com> References: <1565626128-2563-1-git-send-email-trini@konsulko.com> Subject: [U-Boot] [PATCH 2/2] gitlab-ci: Consolidate some testsuite jobs X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" We do not need to split binman, buildman, dtoc and patman test suite runs into 3 jobs. Instead, run them as a single job. Signed-off-by: Tom Rini --- .gitlab-ci.yml | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98e03d6ffb43..84e79bf03218 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -145,36 +145,24 @@ Build tools-only: script: - make tools-only_config tools-only -j$(nproc) -# Run various tool tests -Run patman testsuite: +Run binman, buildman, dtoc and patman testsuites: tags: [ 'all' ] stage: testsuites script: - - git config --global user.name "GitLab CI Runner" - - git config --global user.email trini@konsulko.com - - export USER=gitlab - - ./tools/patman/patman --test - -Run buildman testsuite: - tags: [ 'all' ] - stage: testsuites - script: - - export USER=gitlab - - ./tools/buildman/buildman -t - -Run binman and dtoc testsuite: - tags: [ 'all' ] - stage: testsuites - script: - - virtualenv /tmp/venv - - . /tmp/venv/bin/activate - - pip install pyelftools - - export UBOOT_TRAVIS_BUILD_DIR=`cd .. && pwd`/.bm-work/sandbox_spl; - ./tools/buildman/buildman -P sandbox_spl && - export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"; - export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}"; - ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test && - ./tools/dtoc/dtoc -t + - git config --global user.name "GitLab CI Runner"; + git config --global user.email trini@konsulko.com; + export USER=gitlab; + virtualenv /tmp/venv; + . /tmp/venv/bin/activate; + pip install pyelftools; + export UBOOT_TRAVIS_BUILD_DIR=`cd .. && pwd`/.bm-work/sandbox_spl; + export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"; + export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}"; + ./tools/buildman/buildman -P sandbox_spl; + ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test; + ./tools/buildman/buildman -t; + ./tools/dtoc/dtoc -t; + ./tools/patman/patman --test # Test sandbox with test.py sandbox test.py: