From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7192322883099557888 X-Received: by 2002:a05:6102:ca:b0:3f7:8e7b:4a5e with SMTP id u10-20020a05610200ca00b003f78e7b4a5emr3150094vsp.7.1675686848026; Mon, 06 Feb 2023 04:34:08 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6102:298a:b0:3ca:96a1:f7b6 with SMTP id dl10-20020a056102298a00b003ca96a1f7b6ls3519761vsb.10.-pod-prod-gmail; Mon, 06 Feb 2023 04:34:07 -0800 (PST) X-Google-Smtp-Source: AK7set+G7dXrg1zMHYNMNXnJuQHElhwqSZr9lnYDewOPgB8kQsLOnEYNXSr1UyWuxwzxWZ8lek2h X-Received: by 2002:a05:6102:50a5:b0:3f9:ae6e:e0e6 with SMTP id bl37-20020a05610250a500b003f9ae6ee0e6mr11369140vsb.1.1675686847293; Mon, 06 Feb 2023 04:34:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675686847; cv=none; d=google.com; s=arc-20160816; b=YOez2aw2CWnoPigltmUUaiviCZMYmNQ7nGP/duAd/KNgINmEjYgUycGvq3AXCw4HLc zFLjDf8L0+l+dtSOMmOZrgLzxwyabomvYaZHhyVSSR1ejEMklKVOwIuPfl38GQ0ndSNd ndp7BNYr7eOjuF7RjeZ126uKJc/ZnATO377AP+FAralBoJZFknYtsfLxewLIGR0Qcw9V x7gf0maXhYOoIsfmuZ4nXGjZvl/E9ja85/ATU86LxkAMxe7A+NP9IrdeOl5U4Fqv+TP4 72Y3SU+PTP+N716nq2Z/XNqczFFTpkzC3oeGLvLkekZ9GU330OqNFiwqIO9y+l716z17 mMWA== 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:to:from; bh=xXBcKCokuqD9wz1aVQPLVlb8vUgY4mTJYLY7K+HO5ug=; b=0ZsQbnbynGD9X0euNfpIzbW9dyoGU58hJ/p51OUon5YxubDuSyXGKWGgWnNHoFe58e hVDev6fXGoJVSJcXg1vctBXMY0sx+BfQ6tbYEgzUm8KkNJreovMg+kRleTo25o0ZePsP mhybtaO4seOFX41kZ0DF3LzV8nJ5vH2SgE6q1UqYa743Z2ftVDJOtwRhW3Y+ddY++Wd4 8LyRes/wNLBlRPf3EAoY94Tb35GLX+KkMfJALHhlh28O9zazKMc+Jfv+wY+esQUguMJ3 GRH+QzDeLhksURj2JC8JmEVVVvWAq3ByhxArBWCH9lrMh04cjyQdNgjHa0HfmHS/xHe+ D44A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id u7-20020ab03c47000000b0054bf671c8ccsi546482uaw.0.2023.02.06.04.34.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Feb 2023 04:34:07 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@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 ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 316CY2Ch005306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 6 Feb 2023 13:34:05 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 09/15] CI: Get rid of setting cross from outside Date: Mon, 6 Feb 2023 13:33:56 +0100 Message-Id: <20230206123402.2727-10-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230206123402.2727-1-ubely@ilbers.de> References: <20230206123402.2727-1-ubely@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: JYSJiUoKDD72 From: Anton Mikanovich 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 Signed-off-by: Uladzimir Bely --- .gitlab-ci.yml | 2 +- scripts/ci_build.sh | 13 +++++-------- testsuite/cibuilder.py | 4 +--- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a49ce43..d1d22a6f 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 85b98f8f..20c6d9e9 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" @@ -112,6 +105,10 @@ do TIMEOUT=$2 shift ;; + -c|--cross) + # Just not to cause CI failures on legacy configs + echo "warning: deprecated parameter '$key'" + ;; *) echo "error: invalid parameter '$key', please try '--help' to get list of supported parameters" exit $ES_BUG @@ -150,4 +147,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 27909d29..a9d50d42 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.20.1