From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6659597106892767232 X-Received: by 2002:a2e:85cd:: with SMTP id h13mr512864ljj.8.1550558281811; Mon, 18 Feb 2019 22:38:01 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:9146:: with SMTP id y6ls1409589lfj.10.gmail; Mon, 18 Feb 2019 22:38:01 -0800 (PST) X-Google-Smtp-Source: AHgI3Ia2iOEMnUt9ga0ju0nsGZNWnxuMlwErBE3/gOPdU+ukzKO/cWmM5FQHujR0EenIjEBjPZJC X-Received: by 2002:ac2:5593:: with SMTP id v19mr658467lfg.3.1550558281374; Mon, 18 Feb 2019 22:38:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550558281; cv=none; d=google.com; s=arc-20160816; b=IrO12t2tDkECz4idD7TirfM7+hFdNp3e9QZ0Er7opF4AoFReu/JjSXtoVD56eIyJqG cD8kvNtiH11jsb4tNY2vG5zA4MIR00MQYta8Rh6zluW4lAJNfeMDmSd+MEV2mxVWguGn CQ29mclkX9rIP1CNhnoIM03H1YrDKKrmxLLlGCSmqS3LTimfNEKsoxIBgjLfAEAVyGWV 8TjozjbC/OXJdX9kD0Oi2pSGwJbEeI64h4gyjmbsyq8PhPw7q5RuVCK+F+VtpQ84BZzg PfCmlIVI8CAaodWnArmolZ7UfoIrVDBIu5T69PcrjEC69TYGiG4WUd2ESMFlg4Zn2feo HW5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from; bh=1mHv+o2Qif9tlJcCY+N3NiSG0D63f/Nps8zG12vhpqQ=; b=rgD/7DY9r6IOQeTjvuRIGraPzedxbMk0r8D4rz6Epkhp6D6WDOXTpFLhlBxzKTWEge m4XMoMQ31+seCBOpduQPoSbU4mcLr/t+rMR69oADW7pYJQCahqlCfqJGh8mnv9Wo+0gx Mo+nElN3Y9XTgrqHGmj839uYqwys4newjEc3uKzRS0zX2dy43p//3xL8tPT0+N9O7K8o jx/IdQsw3VxRZMyO0A7RhazQjnGf3L+bDXtKuslzOPsp+vhU2+Xm8MDz2TyCklzvEd7k iGesAJtb0JlWq+YTipSroEuAhHUb/zwRTfhOhrfVCiIrYCHBNFpJhB4+cejbVk4Rdb9i nUdg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id c17si181952lff.1.2019.02.18.22.38.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Feb 2019 22:38:01 -0800 (PST) Received-SPF: pass (google.com: domain of mosipov@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 mosipov@ilbers.de designates 85.214.156.166 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 shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id x1J6bbK4017656 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 19 Feb 2019 07:38:00 +0100 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH v2 2/2] ci: move IMAGE_INSTALL from config to ci script Date: Tue, 19 Feb 2019 07:37:36 +0100 Message-Id: <20190219063736.26836-3-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190219063736.26836-1-mosipov@ilbers.de> References: <20190219063736.26836-1-mosipov@ilbers.de> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED 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: P1TGCWfwBflc 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 b896f84..83d8fc9 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -122,6 +122,9 @@ if [ -n "$REPRO_BUILD" ]; then sed -i -e 's/#ISAR_USE_CACHED_BASE_REPO ?= "1"/ISAR_USE_CACHED_BASE_REPO ?= "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.11.0