From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6953642757724307456 X-Received: by 2002:a05:600c:2e42:: with SMTP id q2mr15366523wmf.3.1621104198173; Sat, 15 May 2021 11:43:18 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:db50:: with SMTP id f16ls3269402wrj.2.gmail; Sat, 15 May 2021 11:43:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqaFlDczdxRqQW0mKcFr54531pmGSMYzkLaeXfpAbdfnKDiybtundIiSIXkHrlSiB48lt1 X-Received: by 2002:adf:f3cc:: with SMTP id g12mr5844767wrp.300.1621104197363; Sat, 15 May 2021 11:43:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621104197; cv=none; d=google.com; s=arc-20160816; b=Ij6qlfRYKnseph9jCx19uVjnkilnQxCK8K7Wn8Uzix+vOp33oDsnB2TicmPQt6WI33 SAG9CJlQ2ys80EU4Q3AvlpuNKjYqpOj2rfiKB6Z+51Mzf3AFbexRASfQn9k98R4DQifF gWhgpc2pcdF5rrt3gGtuzU8DlCvGLPbat7wBD7SUQi7ROxRLCt+iK0UZ9lrs9g10UD0o bzDqMO6WZyUtf1SZdRIvaDGPNmAMFzgwuBno72WbYLs7YwT96Gy+WyTSbR4VpT8dbeSZ ifaWf4ahfXS+aIG5F9RKWJIrcxOe/100vOYrcz6EtEITAgT3xt5OW7MFWs6X9CR3br8L mrXQ== 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=x8T2M0xWCJi6QtegI1/dHjKFJ2yuIBt9hgxsp8U6vQY=; b=UvzBcCXMwiFuwIW0DqretCja2Qjjmsp+SgmV3+klp1zg26OLGBw5rew4/VjC76S67P jQy+i1hDePImMLJa+PSJGTWIRFENzwCQlxhJI8sFeLptBEk9JWBFWzmqnRkG/pNJYcAQ 2iDxhp42nDSAGDZkAz+PCfm2ybO1+rqTsj4OPRSVn3EZtbEx8Kbt+GtamrRxD+P4GrSw otPToBFrezkIchx2SkzX1Hw/CtIMyQaW/zWfBvnETk2e/YyNSX6wA1N0pDqK6Do3cc+Q 81qyV9mrBrKfwddsPtuYKEO+wwvxYeOcH6PCWZQJTqyh9U24b3XYcYON1HeXHqCNW4Zy BmSw== 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 b5si264435wri.2.2021.05.15.11.43.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 May 2021 11:43:17 -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-205-68-214-37.mgts.dynamic.pppoe.byfly.by [37.214.68.205] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 14FIgisq003013 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 15 May 2021 20:43:16 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v7 17/17] ci_build: Install Avocado if needed Date: Sat, 15 May 2021 21:42:35 +0300 Message-Id: <20210515184235.3048943-18-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210515184235.3048943-1-amikan@ilbers.de> References: <20210515184235.3048943-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: ZQR99+xZeyAf 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 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index eec4519..72d48ee 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -28,6 +28,23 @@ 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" + ISAR_KEY="http://deb.isar-build.org/debian-isar.key" + sudo -s < $APT_LIST/isar.list + apt-key adv --fetch-keys $ISAR_KEY + apt update + yes | apt install avocado +EOSUDO + echo "Installed Avocado-framework" + set -e +fi + show_help() { echo "This script builds the default Isar images." echo -- 2.25.1