From patchwork Thu Oct 24 15:59:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1183206 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 (no SPF record) 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 46zX616RdTz9sQm for ; Fri, 25 Oct 2019 03:00:57 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 75830C21D74; Thu, 24 Oct 2019 16:00:04 +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=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL 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 0A31FC21E35; Thu, 24 Oct 2019 15:59:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E4FC8C21E1D; Thu, 24 Oct 2019 15:59:39 +0000 (UTC) Received: from mail-yw1-f46.google.com (mail-yw1-f46.google.com [209.85.161.46]) by lists.denx.de (Postfix) with ESMTPS id 8E8FAC21C51 for ; Thu, 24 Oct 2019 15:59:38 +0000 (UTC) Received: by mail-yw1-f46.google.com with SMTP id k127so7611832ywc.6 for ; Thu, 24 Oct 2019 08:59:38 -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=7EmvbBqPmbsJkgbd5XDpHC+DNlwjd0XMgHI3PMisjvk=; b=WzCS9xy2nC54YOZaidBidN0CqmzM0zHqIFbqKwZNZ+F8SguGeQOMk1Je45Rw7xjpnB b0F2qdOXZ7p6FHL02L07o2/QF1XMpDhGY6+AUP7katE6hIrB7h41NnodmWaQNPyH1S51 xCnlql4tqmgo1DTrluSPMontrIA544XWzJUv1v2xkOVdq8I57juZGFSLNyPFgCIKNoWf clUP+fip/Y+6F13MaJksNms152ruisSxUP3J29ufPTISyj2a21/jKLONcJj6FbHMtYzA S1SFU/RkePHGnWy69dte0626N4V2gH+pymV5QT4FIFZkShi/0yeQDN/HItN6dNPwz5q0 9GHg== X-Gm-Message-State: APjAAAXK2SmLLSB82PYM06/FF6VdE4AC5RqxFyhoCLp3VWj67vyYX/JP B2mayBFWOV49+cmcX5AqK7vJl2c= X-Google-Smtp-Source: APXvYqzxHCmc9WEOBQyPKyFtGLO7H3rsRJOx+WesvjLBdPHbRw1/ybRqNWS/8gBZGjgXenJvdsC9Hg== X-Received: by 2002:a81:6288:: with SMTP id w130mr6799117ywb.438.1571932776990; Thu, 24 Oct 2019 08:59:36 -0700 (PDT) Received: from bill-the-cat.local (cpe-65-184-142-8.ec.res.rr.com. [65.184.142.8]) by smtp.gmail.com with ESMTPSA id u62sm5862758ywd.15.2019.10.24.08.59.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2019 08:59:36 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Thu, 24 Oct 2019 11:59:17 -0400 Message-Id: <20191024155928.28616-3-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191024155928.28616-1-trini@konsulko.com> References: <20191023032010.27725-1-trini@konsulko.com> <20191024155928.28616-1-trini@konsulko.com> Subject: [U-Boot] [PATCHv3 02/13] gitlab-ci: Prepend to PATH rather than replace it 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" Currently we set the entire PATH rather than prepend the new paths that we need to have searched. This however breaks parts of the "virtualenv" that was have set up and need to use as that also will be modifying PATH. To fix this, prepend our new locations instead. Reviewed-by: Stephen Warren Reviewed-by: Simon Glass Tested-by: Stephen Warren Signed-off-by: Tom Rini --- Changes in v2: - Reword slightly --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b91b5f67af98..ab294997e463 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ stages: # "-k something" even when $TEST_PY_TEST_SPEC doesnt need a custom # value. - export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/${TEST_PY_BD}; - export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:/usr/bin:/bin; + export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:${PATH}; export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci; if [[ "${TEST_PY_BD}" != "" ]]; then ./test/py/test.py --bd ${TEST_PY_BD} ${TEST_PY_ID}