From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7192322883099557888 X-Received: by 2002:a05:620a:1132:b0:6fc:bfec:9b21 with SMTP id p18-20020a05620a113200b006fcbfec9b21mr1798779qkk.727.1674593184725; Tue, 24 Jan 2023 12:46:24 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:70d:0:b0:3b6:2b54:44df with SMTP id g13-20020ac8070d000000b003b62b5444dfls12904438qth.4.-pod-prod-gmail; Tue, 24 Jan 2023 12:46:24 -0800 (PST) X-Google-Smtp-Source: AMrXdXtLVfdxZlTdYs95hSazMB9gcGlqsM0MrBEjKUEdjN88AOqCZJ3x6tnAXHPTsdrutuy6iwF5 X-Received: by 2002:ac8:7156:0:b0:3b5:bd73:12bd with SMTP id h22-20020ac87156000000b003b5bd7312bdmr44936826qtp.29.1674593183971; Tue, 24 Jan 2023 12:46:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674593183; cv=none; d=google.com; s=arc-20160816; b=ZHOnhnB7rap7u9NM0bgAgbZ2ZZOm4IM62tXP2hspXXmG2NmU6e+a6ak36vy3+8bdDo bXuDcS1svATc8zW6L2OEtQWo7aCoEhuvMUGTvC3X/DCWW+2ZpK3+RYItNoeunxFNANrP c5K6GJGQZNOTeSF0WaKFSlbcf/oESFPBsPkAbX1snZx4wGMI5AXwLe03sQZH3eG6NEGU WK+hMa7PvMWQoZRL++O31ceZTskhnyMMiyR2ee4jAEGgPy2Seu+sg8gxp7t6M7iwURQz B5av7T23pcId5VloDpG5zHKnHI3wv4xBCS7IZrH8rbteTPYBCJA9VfkHAjbNeEGFm2ug nbUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=Q1N+U0s4dcRLDBNzbQ/OibuTeeFb6ZH+j8BkQtZv1ps=; b=Hm9EnBlXDfde5kr9hmZM099jKDAw+z9+7YbXtc6mSzyK2cZYLiQDKLBSw2tWpxg+2E /IOFv+4T4RZXaPF6NtbJ+5sokglmR6VLBT+dBJUAm53ZTzE2ixjJLOhUsEwO4GykHUJP IpsigazDw+cnlACn8BddDKSQ66Jqvuvy7pzcYPl1QduZrWBhaw3V6ep9TnFjgiIRcP/O 4YcCSpaBIzz0m5oRX4DtGpW6ONqvazuXTvaHwjrriC501R3s180ar3obcRHZ27JZhLxA 9oUt42BjRnmRec5yBrg5eLs018B2FbLlS4kBP6A6RKGqyU8g9XxoS/11iwrx0UAzURPk qsiA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id gd9-20020a05622a5c0900b003b0b903b957si358569qtb.2.2023.01.24.12.46.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jan 2023 12:46:23 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.. (IN-213-226-141-182.bitemobile.lv [213.226.141.182] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 30OKk19d023256 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Jan 2023 21:46:21 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 09/15] CI: Get rid of setting cross from outside Date: Tue, 24 Jan 2023 22:45:52 +0200 Message-Id: <20230124204558.31025-10-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230124204558.31025-1-amikan@ilbers.de> References: <20230124204558.31025-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: RHGOpYrp2cbt There is no need in setting cross compilation mode from outside because it was already done inside test cases. This also makes test cases more unified. Signed-off-by: Anton Mikanovich --- .gitlab-ci.yml | 2 +- scripts/ci_build.sh | 9 +-------- testsuite/cibuilder.py | 4 +--- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a49ce4..d1d22a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,7 @@ full-ci: - PREVIOUS_SHA="$(cat .CI_COMMIT_SHA || true)" - if [ "$CI_COMMIT_SHA" != "$PREVIOUS_SHA" ]; then echo "$CI_COMMIT_SHA" > .CI_COMMIT_SHA; - scripts/ci_build.sh -q -c -r; + scripts/ci_build.sh -q -r; fi cache: key: "$CI_COMMIT_REF_SLUG" diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 960ee94..02aeba5 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -48,7 +48,6 @@ show_help() { echo "Parameters:" echo " -b, --base BASE_DIR set path to base directory. If not set," echo " the tests will be started in current path." - echo " -c, --cross enable cross-compilation." echo " -d, --debug enable debug bitbake output." echo " -f, --fast cross build reduced set of configurations." echo " -q, --quiet suppress verbose bitbake output." @@ -64,7 +63,6 @@ show_help() { } TAGS="full" -CROSS_BUILD="0" QUIET="0" TIMEOUT=300 @@ -82,17 +80,12 @@ do BASE_DIR="$2" shift ;; - -c|--cross) - CROSS_BUILD="1" - ;; -d|--debug) VERBOSE="--show=app,test" ;; -f|--fast) # Start build for the reduced set of configurations - # Enforce cross-compilation to speed up the build TAGS="fast" - CROSS_BUILD="1" ;; -q|--quiet) QUIET="1" @@ -150,4 +143,4 @@ set -x avocado ${VERBOSE} run "${TESTSUITE_DIR}/citest.py" \ -t "${TAGS}" --nrunner-max-parallel-tasks=1 --disable-sysinfo \ - -p quiet="${QUIET}" -p cross="${CROSS_BUILD}" -p time_to_wait="${TIMEOUT}" + -p quiet="${QUIET}" -p time_to_wait="${TIMEOUT}" diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 4e55121..830918d 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -52,7 +52,7 @@ class CIBuilder(Test): if not hasattr(self, 'build_dir'): self.error("Broken test implementation: need to call init().") - def configure(self, compat_arch=True, cross=None, debsrc_cache=False, + def configure(self, compat_arch=True, cross=False, debsrc_cache=False, container=False, ccache=False, sstate=False, offline=False, gpg_pub_key=None, wic_deploy_parts=False, dl_dir=None, source_date_epoch=None, image_install=None, **kwargs): @@ -62,8 +62,6 @@ class CIBuilder(Test): # get parameters from avocado cmdline quiet = bool(int(self.params.get('quiet', default=0))) - if cross is None: - cross = bool(int(self.params.get('cross', default=0))) if dl_dir is None: dl_dir = os.path.join(isar_root, 'downloads') -- 2.34.1