From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6953642757724307456 X-Received: by 2002:ac2:5f0a:: with SMTP id 10mr21434377lfq.415.1619021150817; Wed, 21 Apr 2021 09:05:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:c92:: with SMTP id 140ls970468lfm.2.gmail; Wed, 21 Apr 2021 09:05:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQqoApZLdz+6jXTK6ikDashYHcAopgSiOk2bJqqF43l01EU4OlH3hOb+PqMBNpjSmd8eT1 X-Received: by 2002:a19:700a:: with SMTP id h10mr12304207lfc.178.1619021149783; Wed, 21 Apr 2021 09:05:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619021149; cv=none; d=google.com; s=arc-20160816; b=M51L8ApNulzz6Z/VgIjzxkrnonuoC6h70LLJepEfmH4tAauJdvo9CUZwxfsrHaLEdY toFdU4QpWq7uR5NsVzQJ1czaPz7+D22T99781fuXqLGp/PZHGvOkw8zFAcCGscvgI8Td Erb6ugAKXB2XnsjXBPbRbZnEYiBhwu9gPxJjoglbRuKugPUuuwTZvMiOBdlWeIn/s3vb 8ZMD672xbaniSAsCOFAFKBwE2vjsgNSZNSQRJZmE+Hb25K3fyhN39ZaEHjiICU+ieyO0 8SgI0wqEu6G3zN45yJgxvl1AO0P+OHLxgZOXl9p6FJVPuqb5dy+sbpso/gfhqsr7H0oR JYpg== 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=d5cQ3uWryXQ0RVtS78ZIZSc/ThKOX4zkHsHhgecYSrc=; b=RA+z/Wj44sN/YlFS2sQJopmVxzpeOCe59m4uo9weiRffN7S+rYBdIhesGk9MqltRzj P6Pb5z9u9X/qs9WtjDvTdC5hUXRvy+CquNuWQ3g93FVK4aZIJsdWIwMMvwi6E8D+YZJP MIVopSZ4b/qp4twYYkCZfaxfbOZSRO47wbg0OP6u3Htm44gF1ZO0ocV2gKZ5cIhr2uNM k98HqXjpQUMWUWHzCOYvNdIZqx+VKxPrt3cl+Hj6dRz9lkzDnY58B2bcRbIrky/flw37 CShU9DVb/owsO0NR5TgBLS/qxuUdhrb1hknNds1O7MBIkXIZNV4m3nKWjTcAF9jgp2uC 8e8A== 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 b17si200689lfo.9.2021.04.21.09.05.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Apr 2021 09:05:49 -0700 (PDT) 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 localhost.localdomain (mm-153-39-214-37.mgts.dynamic.pppoe.byfly.by [37.214.39.153] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 13LG5C7E027472 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Apr 2021 18:05:47 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 14/14] ci_build: Install Avocado if needed Date: Wed, 21 Apr 2021 19:05:05 +0300 Message-Id: <20210421160505.67194-15-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210421160505.67194-1-amikan@ilbers.de> References: <20210421160505.67194-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: n0ebSL8wTZCK To keep compatibility will the build systems without avocado-framework preinstalled add the code to install it from debian-isar repo. Signed-off-by: Anton Mikanovich --- scripts/ci_build.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index bfea720..c65ed4b 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -29,6 +29,21 @@ for prog in ${DEPENDENCIES} ; do fi done +# Install Avocado if needed +if [ ! -x "$(which avocado)" ] ; then + set +e + APT_LIST="/etc/apt/sources.list.d" + ISAR_REPO="deb http://deb.isar-build.org/debian-isar buster-isar main" + sudo -s < $APT_LIST/isar.list + apt update + yes | apt install avocado +EOSUDO + echo "Installed $(avocado --version)" + set -e +fi + show_help() { echo "This script builds the default Isar images." echo -- 2.25.1