From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6657178856110161920 X-Received: by 2002:ac2:4150:: with SMTP id c16mr375661lfi.2.1549995239612; Tue, 12 Feb 2019 10:13:59 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4254:: with SMTP id m20ls1313914lfl.6.gmail; Tue, 12 Feb 2019 10:13:59 -0800 (PST) X-Google-Smtp-Source: AHgI3Iah2/jzAM/YTiPwdd/UiM4c8kDKZmAvK4anCGgalMOR7nSVPHGzD6av7Z0H6NteWYH6aOtC X-Received: by 2002:a19:dc05:: with SMTP id t5mr374270lfg.0.1549995239051; Tue, 12 Feb 2019 10:13:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549995239; cv=none; d=google.com; s=arc-20160816; b=iUOZhChH6DtSW67v9GytxV3d6AiMge+8zVyog4oodhKIDeA1n6iY/lT/PgVsUd8MpY prbRjyOakNu2U6oRmUXsgsh2FdeR++XgDCpkLsNZopv7WbH9h1U/tAJcvf75cdZ2TFuL 5IMfEZIjNWcvOE9/Y94qdh4dtj+phBoNIjtMyW0jkt1bTuAV+lms/LiqEwDgk20HbyV1 22kvOfepRDSqtYvJq9c1vwZo1L1Ca3XAlVEEMX0gH2C8jQTbNczJtVnCTADBNRMMDWA4 E5wymEiXhX0LWyDjKkDKteh3v6t5qvl/7d2Q8ZKUy5PN3UhKXQeM0vzeQCNp0QVHfQP5 KWYA== 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=wgfUFNo4YOwK6akCuZ+Pg50gfB0JQ2eTErJrPYkIwvo=; b=dZ9tYbBCSL4mihPeoj6QJPNRdtrOADkeS8r07DngBVr0ZVi9ooRpNya3NWVJVbsKkQ +Sn9BXjwGaPwd8cEjaxlarx96O3vpTVS7hIaRgXyZnhrucVIbwouIgyCA353OY86A2Jo MpdbmPtl1lJcT2074YPD0JN6kejDoFgI+e+23Wm4u2X/OUoaITNIq3RuO/ZYJBDXiyzd n3dKpv5s2FwgQjYgO3d2mNccLZaM1X0JGMDko7Q4UR6leVpAePT74KWsDRJ3aYK9Krpw bi+O+wYPzCIvV1iFdXP0f7EVWMvH4IshjCrvikqiGXI2eOT3JtACJhCgXO4ohe395hFR UY6Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id m4si705378lfh.1.2019.02.12.10.13.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Feb 2019 10:13:59 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x1CIDvrU014338 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 12 Feb 2019 19:13:57 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.0.9]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x1CIDv1E001101; Tue, 12 Feb 2019 19:13:57 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 2/2] ci: move IMAGE_INSTALL from config to ci script Date: Tue, 12 Feb 2019 19:13:54 +0100 Message-Id: <20190212181354.24272-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190212181354.24272-1-henning.schild@siemens.com> References: <20190212181354.24272-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: YYRa9QB2NJfb From: Henning Schild The intention was to create test coverage, not to include that package into the default qemu target. So move the code around to keep coverage but clean up the target. Signed-off-by: Henning Schild --- meta-isar/conf/multiconfig/qemuamd64-buster.conf | 2 -- scripts/ci_build.sh | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf index 63df75c..394d76b 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf @@ -11,8 +11,6 @@ IMAGE_TYPE ?= "wic-img" WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" -IMAGE_INSTALL += "sshd-regen-keys" - QEMU_ARCH ?= "x86_64" QEMU_MACHINE ?= "q35" QEMU_CPU ?= "" diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index acb172a..9826626 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -85,6 +85,9 @@ if [ -n "$CROSS_BUILD" ]; then sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?= "1"/g' conf/local.conf fi +# test some packages on just a few targets, for faster CI +echo "IMAGE_INSTALL_debian-buster += \"sshd-regen-keys\"" >> conf/local.conf + # "debian-buster" is currently not rebuild from the cache and the package # "hello" currently does not support being rebuild from the cache # so this distro is a good place to at least test the regular build -- 2.19.2