From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7192322883099557888 X-Received: by 2002:aca:1b14:0:b0:36d:431f:b4e8 with SMTP id b20-20020aca1b14000000b0036d431fb4e8mr315375oib.256.1675399472925; Thu, 02 Feb 2023 20:44:32 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a4a:6157:0:b0:498:10f0:1c with SMTP id u23-20020a4a6157000000b0049810f0001cls147045ooe.7.-pod-prod-gmail; Thu, 02 Feb 2023 20:44:32 -0800 (PST) X-Google-Smtp-Source: AK7set9D02/+68CJxNa3NYp2dYj8a/8EmMGQc0tEzb50GUyuLUCIQ3FEMWuz85829pMQdD/9g6T6 X-Received: by 2002:a4a:b148:0:b0:517:7b89:b8d3 with SMTP id e8-20020a4ab148000000b005177b89b8d3mr5118732ooo.6.1675399472300; Thu, 02 Feb 2023 20:44:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675399472; cv=none; d=google.com; s=arc-20160816; b=OhLtYKEj6vFoiy+IixjixshJ4Ry5hQ9PeH8GVefb8EDD/ExdFcP0JevLigD9YTp4ul WiBBApVLAIdFg8/gLNEXRlLC0DR255ePidn1U1vxUhKPsh+wkd4E1rKSzmHvhPF8Ldj6 iNVCfRMm2ekxkd2634XrsQ/R2ey0H9OLi83dL4PBCVPhujkexGO9SdxdovzR8v25Glbf ys3fLFnyEE/kfYxj2zKXkOxL9YfLir6f8mxAXFzF4l0gIgeNkMOFPKiz0R3fOy6ynkLi 139wHZ3ObtM3QKUTDKkPYMEDlqj8N9L+nG6YcLAZ/b2r6Ve+5/iH8PG6aJN2MbWOmVpl VdKA== 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=O3dkgUkgaatb5hAcD/NLHE/UG5T251cOVqgdiF3MoFU=; b=lTmfuAjkVzhzjPUCov7X+69QVX01mWIwNfIUtRVCsCMPdo22EFJna97Hw2lBhUeFOT 2TbCsoZOyd/UhjdQ5gOuyFlAl99Y88jaQrCj9KiOkW4JlOS7FIiFAKmujETY1l8743TC S/WBk92hp34X1qAt8fVNXVSrYMxN9P1tR3G4EjXhXBM0ZAkZTiw9eGKjDklGLWbyv0eE PUIkGW397bjVVsa88+G4Vu2/aDsuyJO7lbtq2QIKRiBI6wXzq4bMHxsz1sEs46Z6u73E fptp5iGsh6Q9Ipq4CKYZ1No19XqWZ26JOEfUKyjn8uFBFaQfd9llywG4H/vncT/W6FIK mMCg== 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 e2-20020a4ad242000000b004f52827c8b8si85062oos.2.2023.02.02.20.44.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Feb 2023 20:44:32 -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 3134iRm3023918 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 3 Feb 2023 05:44:30 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 09/15] CI: Get rid of setting cross from outside Date: Fri, 3 Feb 2023 05:44:20 +0100 Message-Id: <20230203044427.32711-10-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230203044427.32711-1-ubely@ilbers.de> References: <20230203044427.32711-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: fupeGb1WbIGN 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 960ee94e..679e3f37 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