From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6625507181340917760 X-Received: by 2002:a2e:7f12:: with SMTP id a18-v6mr381562ljd.2.1542621101859; Mon, 19 Nov 2018 01:51:41 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:1259:: with SMTP id t86-v6ls3843682lje.13.gmail; Mon, 19 Nov 2018 01:51:41 -0800 (PST) X-Google-Smtp-Source: AFSGD/VvkT9TI6Ed/zIV+gX4tPGHeUhKPcxQuVqnuYhInCsibFC3AdCdzj9f+H6TI9p+N+s+vAMg X-Received: by 2002:a2e:7402:: with SMTP id p2-v6mr1242433ljc.18.1542621101335; Mon, 19 Nov 2018 01:51:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542621101; cv=none; d=google.com; s=arc-20160816; b=CdJf8J62IN57kGUJKflakkA3AvvS8Qn/tK498ryOALg+X/5Tq5o3YRHGq3PDBE1qSw GFLVs6ZakIS7+Lsajfs4wiKBSIVG3b6ciBt4WN37EtwjjJGvH352OPabaMw6uvXs5Un5 eUY74LhRRCMbGJaKcXSa7sYx+b8RxufdxSvQkrxgPOpZ5Fk56jF+iSYtuq8VuY2S5vqK tIRUdf2rGozCJqS/qRj8pEDNMaubEq8MmWjo/LAP+XqtkNSM/xoaDTaaYf8CrtN8IeCz 0kpDt7rRldsgDMl38+KDZHDGS0NlBImypMbYPJ48IYICJ30qc8DYchUbSRkOnNYDH17X vsgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from; bh=xhNgUeu+gaNfZqhLRNxn/BnU+66zP8qFjVQ1oYU7gsE=; b=CSkgszL1bxixNt+iePVuV2oxYWeFyOmTGFIuf/uVb5jOpT6VLlPYLLq0D4GfnqNGF7 cIcJ/OGSm3cfnHzfpDxVuPZzyYQ7xRQvSnL6WBKHXcTHcexQ+xY+C1iCr5qhE33bn6hO a4hgM3R7hmjiQ0SuYgJgMUyjo8TSn2e9zUHX0cya4M4mSQ5e3y/X8xgJgae75m4wqcpG +tMUTW/x31hI35xRYp3hLoeocoWiZqnI9kdpohdGWP7dnSEJQxpkwaDP8HUznGWzUcLu q74dKACdytFLzat2cGGcbawgb0BdD5uvJ6T+9CW/NcJkaEh3vXCuZzC0D9U7JRs9/vyH rc4Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id h17-v6si33624ljj.0.2018.11.19.01.51.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Nov 2018 01:51:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id wAJ9pN9C013994 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Mon, 19 Nov 2018 10:51:39 +0100 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH] ci: Add option to build/test a reduced set of configurations Date: Mon, 19 Nov 2018 10:51:22 +0100 Message-Id: <20181119095122.7010-1-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 X-TUID: VH8lzs3pd/KS Signed-off-by: Maxim Yu. Osipov --- scripts/ci_build.sh | 18 ++++++++++++------ scripts/vm_smoke_test | 26 ++++++++++++++++++-------- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index d2ed6fe..d5e4d41 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -19,7 +19,7 @@ BUILD_DIR=./build BB_ARGS="-v" show_help() { - echo "This script builds all the default Isar images." + echo "This script builds the default Isar images." echo echo "Usage:" echo " $0 [params]" @@ -29,6 +29,7 @@ show_help() { echo " the build will be started in current path." echo " -c, --cross enable cross-compilation." echo " -d, --debug enable debug bitbake output." + echo " -f, --fast build reduced set of configurations." echo " -q, --quiet suppress verbose bitbake output." echo " --help display this message and exit." echo @@ -57,6 +58,9 @@ do -d|--debug) BB_ARGS="$BB_ARGS -d" ;; + -f|--fast) + FAST_BUILD="1" + ;; -q|--quiet) BB_ARGS="" ;; @@ -77,14 +81,16 @@ source isar-init-build-env $BUILD_DIR if [ -n "$CROSS_BUILD" ]; then sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?= "1"/g' conf/local.conf +fi + +if [ -n "$FAST_BUILD" ]; then + # Start build for the reduced set of configurations + # Enforce cross-compilation to speed up the build + sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?= "1"/g' conf/local.conf bitbake $BB_ARGS \ - multiconfig:qemuarm-jessie:isar-image-base \ multiconfig:qemuarm-stretch:isar-image-base \ - multiconfig:qemuarm-buster:isar-image-base \ multiconfig:qemuarm64-stretch:isar-image-base \ - multiconfig:qemuamd64-jessie:isar-image-base \ - multiconfig:qemuamd64-stretch:isar-image-base \ - multiconfig:qemuamd64-buster:isar-image-base + multiconfig:qemuamd64-stretch:isar-image-base else # Start build for all possible configurations bitbake $BB_ARGS \ diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test index 76c2e16..d497653 100755 --- a/scripts/vm_smoke_test +++ b/scripts/vm_smoke_test @@ -84,12 +84,13 @@ run_test () { } show_help() { - echo "This script tests all the default Isar images in QEMU." + echo "This script tests the Isar images for default targets in QEMU." echo echo "Usage:" echo " $0 [params]" echo echo "Parameters:" + echo " -f,--fast test reduced set of supported targets." echo " -o,--output FILE specify file to store console output." echo " The default is: /tmp/isar_console" echo " -p,--pid-file FILE specify file to store QEMU process PID." @@ -125,6 +126,9 @@ do PID_FILE=$2 shift ;; + -f|--fast) + FAST_BUILD="1" + ;; -q|--quiet) VERBOSE=0 ;; @@ -142,19 +146,25 @@ do done # ARM machine -run_test arm jessie +if [ -z "$FAST_BUILD" ]; then + run_test arm jessie + run_test arm buster +fi run_test arm stretch -run_test arm buster # AMD64 machine -run_test amd64 jessie +if [ -z "$FAST_BUILD" ]; then + run_test amd64 jessie + run_test amd64 buster +fi run_test amd64 stretch -run_test amd64 buster # i386 machine -run_test i386 jessie -run_test i386 stretch -run_test i386 buster +if [ -z "$FAST_BUILD" ]; then + run_test i386 jessie + run_test i386 stretch + run_test i386 buster +fi # ARM64 machine run_test arm64 stretch -- 2.11.0