[PATCH v4 09/15] CI: Get rid of setting cross from outside

[Uladzimir Bely <ubely@ilbers.de>]

From: Anton Mikanovich <amikan@ilbers.de>

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 <amikan@ilbers.de>
Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 .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