From patchwork Fri Feb 26 12:52:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1444921 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dn8hH6K9yz9rx8 for ; Fri, 26 Feb 2021 23:52:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1B75682764; Fri, 26 Feb 2021 13:52:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id B907C82770; Fri, 26 Feb 2021 13:52:41 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 391028275B for ; Fri, 26 Feb 2021 13:52:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f54.google.com with SMTP id k5so4422850qvu.2 for ; Fri, 26 Feb 2021 04:52:37 -0800 (PST) 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=hxPrPlnONxB9+V5niARBKF7jZwfYR2zOF1hj4M+zQo0=; b=IWTsK0h03dQRj7hVqbz9quC/0Qb6f1726Y2xxtp/XDReISbFbOpNGBiqRLeXPrj1hD XZPFxVpoc84HqYUMzvmXz6WDYXOF+6JKjeXvOoQOi7JcJ9Z5Bm/6bYwW95jyRpXw90gd YWxpi2M8MPGhEpGOKDHZTGAFkpqrOlCrpanrDPVRtSOjCi6ST5FnyPsemlv6tMo2HmYs 9XffjWkoO6gaMuDSE1bM/Wu1JLt3ywQA5ErjbAZooDUeuFFZagRrhdDUgejf2LlRXrI6 xLAi6uf+jwoZcA9pM3iKidYjXpKTu2FNZYzjLEWnb3fLR5+nKE8X8YdWXQFWoEpl4yYq P5Zg== X-Gm-Message-State: AOAM531/pUQBSCs3VRbyKKTP5rhPyakdMXb6NhAGzW5sWnh2DqIzobTR kcXKZDdQnPk5qJaIyv4OGpWvHJRdtw== X-Google-Smtp-Source: ABdhPJzz0b9kVMOcL3g6ZLTG88Jb3Gq1L+XcxvHHYSXFaXQ966ASjl/xksRyfUjlNbPRka1TPTYfGw== X-Received: by 2002:ad4:5629:: with SMTP id cb9mr314808qvb.62.1614343955313; Fri, 26 Feb 2021 04:52:35 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b07-927a-9cc6-7e57-e413-2a3f.res6.spectrum.com. [2603:6081:7b07:927a:9cc6:7e57:e413:2a3f]) by smtp.gmail.com with ESMTPSA id q3sm5479097qtd.44.2021.02.26.04.52.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 04:52:34 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 1/5] GitLab: Remove "tags" stanzas Date: Fri, 26 Feb 2021 07:52:27 -0500 Message-Id: <20210226125231.7476-1-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean Given the structure of our current GitLab tests, we don't make real use of the tags. Furthermore, these tags prevent the automatic usage of the default GitLab runners. Remove these tags. Reported-by: Roger Meier Signed-off-by: Tom Rini --- .gitlab-ci.yml | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2cdcd864c86a..ceba5ce7a905 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,6 @@ stages: - world build .buildman_and_testpy_template: &buildman_and_testpy_dfn - tags: [ 'all' ] stage: test.py before_script: # Clone uboot-test-hooks @@ -53,7 +52,6 @@ stages: --build-dir "$UBOOT_TRAVIS_BUILD_DIR" build all 32bit ARM platforms: - tags: [ 'all' ] stage: world build script: - ret=0; @@ -64,7 +62,6 @@ build all 32bit ARM platforms: fi; build all 64bit ARM platforms: - tags: [ 'all' ] stage: world build script: - virtualenv -p /usr/bin/python3 /tmp/venv @@ -78,7 +75,6 @@ build all 64bit ARM platforms: fi; build all PowerPC platforms: - tags: [ 'all' ] stage: world build script: - ret=0; @@ -89,7 +85,6 @@ build all PowerPC platforms: fi; build all other platforms: - tags: [ 'all' ] stage: world build script: - ret=0; @@ -102,14 +97,12 @@ build all other platforms: # QA jobs for code analytics # static code analysis with cppcheck (we can add --enable=all later) cppcheck: - tags: [ 'all' ] stage: testsuites script: - cppcheck -j$(nproc) --force --quiet --inline-suppr . # search for TODO within source tree grep TODO/FIXME/HACK: - tags: [ 'all' ] stage: testsuites script: - grep -r TODO . @@ -119,7 +112,6 @@ grep TODO/FIXME/HACK: # build HTML documentation htmldocs: - tags: [ 'all' ] stage: testsuites script: - virtualenv -p /usr/bin/python3 /tmp/venvhtml @@ -129,34 +121,29 @@ htmldocs: # some statistics about the code base sloccount: - tags: [ 'all' ] stage: testsuites script: - sloccount . # ensure all configs have MAINTAINERS entries Check for configs without MAINTAINERS entry: - tags: [ 'all' ] stage: testsuites script: - if [ `./tools/genboardscfg.py -f 2>&1 | wc -l` -ne 0 ]; then exit 1; fi # Ensure host tools build Build tools-only: - tags: [ 'all' ] stage: testsuites script: - make tools-only_config tools-only -j$(nproc) # Ensure env tools build Build envtools: - tags: [ 'all' ] stage: testsuites script: - make tools-only_config envtools -j$(nproc) Run binman, buildman, dtoc, Kconfig and patman testsuites: - tags: [ 'all' ] stage: testsuites script: - git config --global user.name "GitLab CI Runner"; @@ -176,7 +163,6 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites: make testconfig Run tests for Nokia RX-51 (aka N900): - tags: [ 'all' ] stage: testsuites script: - ./tools/buildman/buildman --fetch-arch arm; @@ -185,54 +171,46 @@ Run tests for Nokia RX-51 (aka N900): # Test sandbox with test.py sandbox test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "sandbox" <<: *buildman_and_testpy_dfn sandbox with clang test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "sandbox" OVERRIDE: "-O clang-10" <<: *buildman_and_testpy_dfn sandbox_spl test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "sandbox_spl" TEST_PY_TEST_SPEC: "test_ofplatdata or test_handoff or test_spl" <<: *buildman_and_testpy_dfn evb-ast2500 test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "evb-ast2500" TEST_PY_ID: "--id qemu" <<: *buildman_and_testpy_dfn sandbox_flattree test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "sandbox_flattree" <<: *buildman_and_testpy_dfn vexpress_ca15_tc2 test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "vexpress_ca15_tc2" TEST_PY_ID: "--id qemu" <<: *buildman_and_testpy_dfn vexpress_ca9x4 test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "vexpress_ca9x4" TEST_PY_ID: "--id qemu" <<: *buildman_and_testpy_dfn integratorcp_cm926ejs test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "integratorcp_cm926ejs" TEST_PY_TEST_SPEC: "not sleep" @@ -240,49 +218,42 @@ integratorcp_cm926ejs test.py: <<: *buildman_and_testpy_dfn qemu_arm test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "qemu_arm" TEST_PY_TEST_SPEC: "not sleep" <<: *buildman_and_testpy_dfn qemu_arm64 test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "qemu_arm64" TEST_PY_TEST_SPEC: "not sleep" <<: *buildman_and_testpy_dfn qemu_mips test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "qemu_mips" TEST_PY_TEST_SPEC: "not sleep" <<: *buildman_and_testpy_dfn qemu_mipsel test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "qemu_mipsel" TEST_PY_TEST_SPEC: "not sleep" <<: *buildman_and_testpy_dfn qemu_mips64 test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "qemu_mips64" TEST_PY_TEST_SPEC: "not sleep" <<: *buildman_and_testpy_dfn qemu_mips64el test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "qemu_mips64el" TEST_PY_TEST_SPEC: "not sleep" <<: *buildman_and_testpy_dfn qemu_malta test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "malta" TEST_PY_TEST_SPEC: "not sleep and not efi" @@ -290,7 +261,6 @@ qemu_malta test.py: <<: *buildman_and_testpy_dfn qemu_maltael test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "maltael" TEST_PY_TEST_SPEC: "not sleep and not efi" @@ -298,7 +268,6 @@ qemu_maltael test.py: <<: *buildman_and_testpy_dfn qemu_malta64 test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "malta64" TEST_PY_TEST_SPEC: "not sleep and not efi" @@ -306,7 +275,6 @@ qemu_malta64 test.py: <<: *buildman_and_testpy_dfn qemu_malta64el test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "malta64el" TEST_PY_TEST_SPEC: "not sleep and not efi" @@ -314,84 +282,72 @@ qemu_malta64el test.py: <<: *buildman_and_testpy_dfn qemu-ppce500 test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "qemu-ppce500" TEST_PY_TEST_SPEC: "not sleep" <<: *buildman_and_testpy_dfn qemu-riscv32 test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "qemu-riscv32" TEST_PY_TEST_SPEC: "not sleep" <<: *buildman_and_testpy_dfn qemu-riscv64 test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "qemu-riscv64" TEST_PY_TEST_SPEC: "not sleep" <<: *buildman_and_testpy_dfn qemu-riscv32_spl test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "qemu-riscv32_spl" TEST_PY_TEST_SPEC: "not sleep" <<: *buildman_and_testpy_dfn qemu-riscv64_spl test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "qemu-riscv64_spl" TEST_PY_TEST_SPEC: "not sleep" <<: *buildman_and_testpy_dfn qemu-x86 test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "qemu-x86" TEST_PY_TEST_SPEC: "not sleep" <<: *buildman_and_testpy_dfn qemu-x86_64 test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "qemu-x86_64" TEST_PY_TEST_SPEC: "not sleep" <<: *buildman_and_testpy_dfn r2dplus_i82557c test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "r2dplus" TEST_PY_ID: "--id i82557c_qemu" <<: *buildman_and_testpy_dfn r2dplus_pcnet test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "r2dplus" TEST_PY_ID: "--id pcnet_qemu" <<: *buildman_and_testpy_dfn r2dplus_rtl8139 test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "r2dplus" TEST_PY_ID: "--id rtl8139_qemu" <<: *buildman_and_testpy_dfn r2dplus_tulip test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "r2dplus" TEST_PY_ID: "--id tulip_qemu" <<: *buildman_and_testpy_dfn xilinx_zynq_virt test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "xilinx_zynq_virt" TEST_PY_TEST_SPEC: "not sleep" @@ -399,7 +355,6 @@ xilinx_zynq_virt test.py: <<: *buildman_and_testpy_dfn xilinx_versal_virt test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "xilinx_versal_virt" TEST_PY_TEST_SPEC: "not sleep" @@ -407,7 +362,6 @@ xilinx_versal_virt test.py: <<: *buildman_and_testpy_dfn xtfpga test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "xtfpga" TEST_PY_TEST_SPEC: "not sleep" From patchwork Fri Feb 26 12:52:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1444922 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dn8hS2mcdz9sTD for ; Fri, 26 Feb 2021 23:52:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9511482777; Fri, 26 Feb 2021 13:52:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id ADAB282774; Fri, 26 Feb 2021 13:52:42 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 99CA082764 for ; Fri, 26 Feb 2021 13:52:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f179.google.com with SMTP id q85so8853939qke.8 for ; Fri, 26 Feb 2021 04:52:37 -0800 (PST) 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=XA70e1QoGrh4veHeD6w0PKTxs5DGyMOqLLpWsQ/Q70E=; b=QzUoy0DnzQAnQ4YihNKEgXFUcPO2QzPHCTF7urS/Hn6gIrx5QrVCpieIAKoxBMauDb hlV7sbklGCep1zreJF14IlboBHFZ7T3tZYcZGDkhYLLqCLkD47brZiXDoSXBpNWJdmtF pKGL/czVtQJH3PFQMlXl60ycqRxjpKQTIQTcZBd065w1oQkKbTu21v4WecWVdBkcs8tZ kdOv82Ow61xBV5fwCrlwWKehCmK0/HQEzbjoeZgGvRcWt24TFhAIk8bqy8PE7ROTe97j 3nLjtgsLzmtzYRMFSMxxYTrcW7T7xGj0cjVISv3IaIAnsSvW2pJFE78uVdWrMu15hYlG dA9g== X-Gm-Message-State: AOAM531BrVyR/y3+9VHMZHglaYp2ifFtZMTeetabDyBg/MKt1WH7lgMu LUUhv7tRsKI2Lam2DQjflMf6xmemaA== X-Google-Smtp-Source: ABdhPJzov1phc6mAYok0awg0ISBwCGiQrUUrOGAhbJdoGSmq1QqNAyOyjvzx/4wssLUfMIjIfcJgXA== X-Received: by 2002:a05:620a:49a:: with SMTP id 26mr2335608qkr.436.1614343956230; Fri, 26 Feb 2021 04:52:36 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b07-927a-9cc6-7e57-e413-2a3f.res6.spectrum.com. [2603:6081:7b07:927a:9cc6:7e57:e413:2a3f]) by smtp.gmail.com with ESMTPSA id q3sm5479097qtd.44.2021.02.26.04.52.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 04:52:35 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 2/5] pytest: Lower pygit2 requirement Date: Fri, 26 Feb 2021 07:52:28 -0500 Message-Id: <20210226125231.7476-2-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210226125231.7476-1-trini@konsulko.com> References: <20210226125231.7476-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean The latest versions of pygit2 are not available in practically any distribution at this time. Furthermore, we don't need the latest in order to run all of our testsuites. Reduce this version requirement to something older that meets our needs while still supporting running our tests on older hosts (and so, test labs). Reported-by: Tom Warren Signed-off-by: Tom Rini --- test/py/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/py/requirements.txt b/test/py/requirements.txt index 926bccad694f..89ca259b213b 100644 --- a/test/py/requirements.txt +++ b/test/py/requirements.txt @@ -11,7 +11,7 @@ pbr==5.4.3 pluggy==0.13.0 py==1.8.0 pyelftools==0.27 -pygit2==1.4.0 +pygit2==0.28.2 pyparsing==2.4.2 pytest==5.2.1 python-mimeparse==1.6.0 From patchwork Fri Feb 26 12:52:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1444924 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dn8hs6prhz9sCD for ; Fri, 26 Feb 2021 23:53:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0CCA5827B4; Fri, 26 Feb 2021 13:53:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id BC11B8275B; Fri, 26 Feb 2021 13:52:43 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A76888276B for ; Fri, 26 Feb 2021 13:52:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f44.google.com with SMTP id k7so1754702qvo.6 for ; Fri, 26 Feb 2021 04:52:38 -0800 (PST) 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=FfcIMamRLTinQKv0xSXK0g77zksUPPfA0zLNtcxMMVA=; b=ueWDu5mS+hLaVGu4VVRn/frP1d0SiO7M8c5ZFGC5wiWXpVxMTHYR7dWh9o0y8HXnj8 PGWaOo17wY+gAeQgujlY9pjJmbIvQY+UzE/+9K50YTk3UeNFudfCBPTpAX3qYXMBo2Ds 5EPVINEsLQbORpFgYWYZ24F0aWElOlVgpfULIuuQjyKX8HUJknxpEQd8oj3RzQnxTHwY YHUzfEQubuK3xc2WsgxxppQL1ohxzUQ10el1u1QZhIIaDenbt+1ee6h+833ztpImYWHQ 1psquwp1O0t0bpy83xerIebAazDuRvfhVzG7AmL7KbdnV94kONQh1B+QDSkUEK7vW8eK FQeA== X-Gm-Message-State: AOAM532Lzwh3gqo/LKDRFBIy9v3h9HXq4mSEqz5F0JnrBDUPFEjnuIH+ uhjbb5/cFg89DxgndyOkG1On93CC0g== X-Google-Smtp-Source: ABdhPJw+CL+zskPdPNoQMBp2EJtjf79Ci+Cb47+fRhEKXC2s+QzYcMiynTFryisvGrjhFYzU9VrQYQ== X-Received: by 2002:a0c:90ae:: with SMTP id p43mr2558556qvp.47.1614343957169; Fri, 26 Feb 2021 04:52:37 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b07-927a-9cc6-7e57-e413-2a3f.res6.spectrum.com. [2603:6081:7b07:927a:9cc6:7e57:e413:2a3f]) by smtp.gmail.com with ESMTPSA id q3sm5479097qtd.44.2021.02.26.04.52.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 04:52:36 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 3/5] Azure/GitLab: Ensure we use requirements.txt for testsuites Date: Fri, 26 Feb 2021 07:52:29 -0500 Message-Id: <20210226125231.7476-3-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210226125231.7476-1-trini@konsulko.com> References: <20210226125231.7476-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean Given that test/py/requirements.txt has all required test modules, make use of that rather than a manual pip install list before running our assorted tool testsuites. Signed-off-by: Tom Rini Reviewed-by: Bin Meng --- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index a6279427e138..0a4f90f75f3b 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -144,7 +144,7 @@ jobs: export USER=azure virtualenv -p /usr/bin/python3 /tmp/venv . /tmp/venv/bin/activate - pip install pyelftools pytest pygit2 + pip install -r test/py/requirements.txt export UBOOT_TRAVIS_BUILD_DIR=/tmp/sandbox_spl export PYTHONPATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt export PATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ceba5ce7a905..ce0e63481a11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -151,7 +151,7 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites: export USER=gitlab; virtualenv -p /usr/bin/python3 /tmp/venv; . /tmp/venv/bin/activate; - pip install pyelftools pytest pygit2; + pip install -r test/py/requirements.txt; export UBOOT_TRAVIS_BUILD_DIR=/tmp/sandbox_spl; export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"; export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}"; From patchwork Fri Feb 26 12:52:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1444923 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dn8hf5QW5z9rx8 for ; Fri, 26 Feb 2021 23:53:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A8C068278B; Fri, 26 Feb 2021 13:52:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 1D39382764; Fri, 26 Feb 2021 13:52:43 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B9994826B2 for ; Fri, 26 Feb 2021 13:52:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qv1-f45.google.com with SMTP id s3so4409893qvn.7 for ; Fri, 26 Feb 2021 04:52:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dHTd0NxRWRIvhHw296LcwjJOFV9k+kwBETZSeuifTK8=; b=uBcXTFdHwCLOpv6CBwygClhDZhwMl8ZTwuzr5X85gAp+Syq9yUsM7SX7IVMegdXnJk zRbLx64QiXCRz1jI1eJxtbqFlKj0RiY2GwnyeG6JOFnbNBI9LweKYcP/oJlfgtpa0Q3h tgTv7XjqYoyCKEeMwqtvu90j7dIJ48GCZADB01+t5kKkM1CUK5xWD2MJVjRo4HgeSBLq /65djVlmMMM51HTZLgn3YPhRHCAFQvbUN0YUyXQbxuq2Dn+zXQuJdnWV/0KwneGD0mRd nh5Rm8KXmDGSgDDWMzsDizonzIfzjg7Cgu4dHqXOHbE5vbxisdsC4k53yoeroqzXb/eW RPTw== X-Gm-Message-State: AOAM533KHqdCB/sn3rwM6yMEAxaT1Aljw+jXN/EjLCc3vg0FsGC/v4sU raRFWSHxeKTUWkCzRKPXaWY2Uqx3xg== X-Google-Smtp-Source: ABdhPJydljiMjW2V0arXTwtAiIBYjrWCjws4eZxhDbJ1k843J9yFK+BDxjsvG1cqcJT1q5AAE0gXiA== X-Received: by 2002:a05:6214:1424:: with SMTP id o4mr2698632qvx.34.1614343958307; Fri, 26 Feb 2021 04:52:38 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b07-927a-9cc6-7e57-e413-2a3f.res6.spectrum.com. [2603:6081:7b07:927a:9cc6:7e57:e413:2a3f]) by smtp.gmail.com with ESMTPSA id q3sm5479097qtd.44.2021.02.26.04.52.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 04:52:37 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Simon Glass Subject: [PATCH 4/5] tests: patman: Add requests to the module list Date: Fri, 26 Feb 2021 07:52:30 -0500 Message-Id: <20210226125231.7476-4-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210226125231.7476-1-trini@konsulko.com> References: <20210226125231.7476-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean The patman tests require the requests module, add it. Cc: Simon Glass Signed-off-by: Tom Rini --- test/py/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/py/requirements.txt b/test/py/requirements.txt index 89ca259b213b..f396eb646362 100644 --- a/test/py/requirements.txt +++ b/test/py/requirements.txt @@ -16,6 +16,7 @@ pyparsing==2.4.2 pytest==5.2.1 python-mimeparse==1.6.0 python-subunit==1.3.0 +requests==2.25.1 six==1.12.0 testtools==2.3.0 traceback2==1.4.0 From patchwork Fri Feb 26 12:52:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1444925 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dn8j546SYz9sCD for ; Fri, 26 Feb 2021 23:53:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 24116827AB; Fri, 26 Feb 2021 13:53:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 4B0048276B; Fri, 26 Feb 2021 13:52:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B80F1826F3 for ; Fri, 26 Feb 2021 13:52:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f169.google.com with SMTP id n28so7360869qkk.4 for ; Fri, 26 Feb 2021 04:52:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Av31FN6EgfuQN6RM+sb1/QrlvU2g1eril+NoWnKG45E=; b=UHnZRy3WxOg+ZQRPOoCYLduz6LPOMGm4HUar2jLKCVmoMaDPJqW0wSF5si2uUzCiay 5yTC5ICn6ocZsKdH2oMxKbkQ3oQfihLjPN3Mq3uubzvkXbAGKzt3MV8UMphYIoYUwJU3 jVdz88ncskbAjYQmQpt07nh7T/bENlhYZtC7czHSdO00uHmZ8uEiMphSkN/U/psAL8j9 HWL2HI6CB/73MQ32qx6Hn+Ltnkl1nX83sPg/jd7aUbQ5atBYgG5G9y3FtAnD1AS5RhJV VA5WP0hUiDl4CzzujxF/WMbib8LH75iRrhfC/C9e4TIwYfcba3A3fLz6iK7e9CeCLrZ7 SHNw== X-Gm-Message-State: AOAM533GL3UZiPbbYfdhbBh++5YyKI3gSl2sddCd8oPUeIPdwSg1pW0J 3Tj3ZffA9ZGEh/vqiCbkSACubopTDA== X-Google-Smtp-Source: ABdhPJxiXU7J0zfZM9VKxMn5UhtlcaaevHm/rwHBn30P05tVQs11RMY4JUTOuLRE4KprhqKYb++6Zw== X-Received: by 2002:a37:4e54:: with SMTP id c81mr2277477qkb.454.1614343959296; Fri, 26 Feb 2021 04:52:39 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b07-927a-9cc6-7e57-e413-2a3f.res6.spectrum.com. [2603:6081:7b07:927a:9cc6:7e57:e413:2a3f]) by smtp.gmail.com with ESMTPSA id q3sm5479097qtd.44.2021.02.26.04.52.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 04:52:38 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Simon Glass Subject: [PATCH 5/5] patman: Assume we always have pygit2 for tests Date: Fri, 26 Feb 2021 07:52:31 -0500 Message-Id: <20210226125231.7476-5-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210226125231.7476-1-trini@konsulko.com> References: <20210226125231.7476-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean Given that we have tests that require pygit2 and it can be installed like any other python module, fail much more loudly if it is missing. Cc: Simon Glass Signed-off-by: Tom Rini --- tools/patman/func_test.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/tools/patman/func_test.py b/tools/patman/func_test.py index 89072b1ae7fa..b956fb96f396 100644 --- a/tools/patman/func_test.py +++ b/tools/patman/func_test.py @@ -25,13 +25,8 @@ from patman import terminal from patman import tools from patman.test_util import capture_sys_output -try: - import pygit2 - HAVE_PYGIT2 = True - from patman import status -except ModuleNotFoundError: - HAVE_PYGIT2 = False - +import pygit2 +from patman import status class TestFunctional(unittest.TestCase): """Functional tests for checking that patman behaves correctly""" @@ -458,7 +453,6 @@ complicated as possible''') repo.branches.local.create('base', base_target) return repo - @unittest.skipIf(not HAVE_PYGIT2, 'Missing python3-pygit2') def testBranch(self): """Test creating patches from a branch""" repo = self.make_git_tree() @@ -604,7 +598,6 @@ diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c ["Found possible blank line(s) at end of file 'lib/fdtdec.c'"], pstrm.commit.warn) - @unittest.skipIf(not HAVE_PYGIT2, 'Missing python3-pygit2') def testNoUpstream(self): """Test CountCommitsToBranch when there is no upstream""" repo = self.make_git_tree() @@ -642,7 +635,6 @@ diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c {'id': '1', 'name': 'Some patch'}]} raise ValueError('Fake Patchwork does not understand: %s' % subpath) - @unittest.skipIf(not HAVE_PYGIT2, 'Missing python3-pygit2') def testStatusMismatch(self): """Test Patchwork patches not matching the series""" series = Series() @@ -652,7 +644,6 @@ diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c self.assertIn('Warning: Patchwork reports 1 patches, series has 0', err.getvalue()) - @unittest.skipIf(not HAVE_PYGIT2, 'Missing python3-pygit2') def testStatusReadPatch(self): """Test handling a single patch in Patchwork""" series = Series() @@ -665,7 +656,6 @@ diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c self.assertEqual('1', patch.id) self.assertEqual('Some patch', patch.raw_subject) - @unittest.skipIf(not HAVE_PYGIT2, 'Missing python3-pygit2') def testParseSubject(self): """Test parsing of the patch subject""" patch = status.Patch('1') @@ -728,7 +718,6 @@ diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c self.assertEqual('RESEND', patch.prefix) self.assertEqual(None, patch.version) - @unittest.skipIf(not HAVE_PYGIT2, 'Missing python3-pygit2') def testCompareSeries(self): """Test operation of compare_with_series()""" commit1 = Commit('abcd') @@ -831,7 +820,6 @@ diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c return patch.comments raise ValueError('Fake Patchwork does not understand: %s' % subpath) - @unittest.skipIf(not HAVE_PYGIT2, 'Missing python3-pygit2') def testFindNewResponses(self): """Test operation of find_new_responses()""" commit1 = Commit('abcd') @@ -970,7 +958,6 @@ diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c return patch.comments raise ValueError('Fake Patchwork does not understand: %s' % subpath) - @unittest.skipIf(not HAVE_PYGIT2, 'Missing python3-pygit2') def testCreateBranch(self): """Test operation of create_branch()""" repo = self.make_git_tree() @@ -1058,7 +1045,6 @@ diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c self.assertEqual('Reviewed-by: %s' % self.mary, next(lines)) self.assertEqual('Tested-by: %s' % self.leb, next(lines)) - @unittest.skipIf(not HAVE_PYGIT2, 'Missing python3-pygit2') def testParseSnippets(self): """Test parsing of review snippets""" text = '''Hi Fred, @@ -1142,7 +1128,6 @@ line8 'line2', 'line3', 'line4', 'line5', 'line6', 'line7', 'line8']], pstrm.snippets) - @unittest.skipIf(not HAVE_PYGIT2, 'Missing python3-pygit2') def testReviewSnippets(self): """Test showing of review snippets""" def _to_submitter(who):