public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: "Maxim Yu. Osipov" <mosipov@ilbers.de>
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	[thread overview]
Message-ID: <20190219063736.26836-3-mosipov@ilbers.de> (raw)
In-Reply-To: <20190219063736.26836-1-mosipov@ilbers.de>

From: Henning Schild <henning.schild@siemens.com>

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 <henning.schild@siemens.com>
---
 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


  parent reply	other threads:[~2019-02-19  6:38 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-19  6:37 [PATCH v2 0/2] test rebuilding hello series Maxim Yu. Osipov
2019-02-19  6:37 ` [PATCH v2 1/2] ci: test rebuilding "hello" Maxim Yu. Osipov
2019-02-19  6:37 ` Maxim Yu. Osipov [this message]
2019-02-19 15:20 ` [PATCH v2 0/2] test rebuilding hello series Henning Schild
2019-02-20 13:53   ` Maxim Yu. Osipov
2019-02-25 18:28     ` Henning Schild

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190219063736.26836-3-mosipov@ilbers.de \
    --to=mosipov@ilbers.de \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox