[PATCH 1/2] ci: test rebuilding "hello"

[PATCH 1/2] ci: test rebuilding "hello"

[Henning Schild]

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

This patch adds the rebuilding of "hello" to one distro that does
not get rebuild from the cache. The recipe uses a feature which
currently does not work for the caching case.

Once we can cache "apt://" URIs the package should probably move to all
tests.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 scripts/ci_build.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index 1789183..acb172a 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -85,6 +85,11 @@ if [ -n "$CROSS_BUILD" ]; then
     sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?= "1"/g' conf/local.conf
 fi
 
+# "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
+echo "IMAGE_INSTALL_debian-buster += \"hello\"" >> conf/local.conf
+
 if [ -n "$FAST_BUILD" ]; then
     # Start build for the reduced set of configurations
     # Enforce cross-compilation to speed up the build
-- 
2.19.2

[PATCH 2/2] ci: move IMAGE_INSTALL from config to ci script

[Henning Schild]

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 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

Re: [PATCH 1/2] ci: test rebuilding "hello"

[Henning Schild]

That is actually the one that made the Jenkins instance at Ilbers
unhappy, but i could not find an issue with it on my system.

I guess the patch itself might be fine and the jenkins setup might be
to blame. Whatever it is, having the patch might help resolve the
issue. And since i think the patch is fine i wanted to post it anyways.

Henning

On Tue, 12 Feb 2019 19:13:53 +0100
Henning Schild <henning.schild@siemens.com> wrote:

> From: Henning Schild <henning.schild@siemens.com>
> 
> This patch adds the rebuilding of "hello" to one distro that does
> not get rebuild from the cache. The recipe uses a feature which
> currently does not work for the caching case.
> 
> Once we can cache "apt://" URIs the package should probably move to
> all tests.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  scripts/ci_build.sh | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
> index 1789183..acb172a 100755
> --- a/scripts/ci_build.sh
> +++ b/scripts/ci_build.sh
> @@ -85,6 +85,11 @@ if [ -n "$CROSS_BUILD" ]; then
>      sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?=
> "1"/g' conf/local.conf fi
>  
> +# "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 +echo "IMAGE_INSTALL_debian-buster += \"hello\"" >>
> conf/local.conf +
>  if [ -n "$FAST_BUILD" ]; then
>      # Start build for the reduced set of configurations
>      # Enforce cross-compilation to speed up the build

Re: [PATCH 1/2] ci: test rebuilding "hello"

[Maxim Yu. Osipov]

Hi Henning,

I've rebased your series (rebased series will be sent after after this 
email) to the current next but CI build fails on standard 'ci_build.sh -q':

http://isar-build.org:8080/job/isar_mosipov_next/149/console

I observe the same errors on my local PC.

Regards,
Maxim.


On 2/12/19 7:13 PM, Henning Schild wrote:
> From: Henning Schild <henning.schild@siemens.com>
> 
> This patch adds the rebuilding of "hello" to one distro that does
> not get rebuild from the cache. The recipe uses a feature which
> currently does not work for the caching case.
> 
> Once we can cache "apt://" URIs the package should probably move to all
> tests.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>   scripts/ci_build.sh | 5 +++++
>   1 file changed, 5 insertions(+)
> 
> diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
> index 1789183..acb172a 100755
> --- a/scripts/ci_build.sh
> +++ b/scripts/ci_build.sh
> @@ -85,6 +85,11 @@ if [ -n "$CROSS_BUILD" ]; then
>       sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?= "1"/g' conf/local.conf
>   fi
>   
> +# "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
> +echo "IMAGE_INSTALL_debian-buster += \"hello\"" >> conf/local.conf
> +
>   if [ -n "$FAST_BUILD" ]; then
>       # Start build for the reduced set of configurations
>       # Enforce cross-compilation to speed up the build
> 


-- 
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov