Fw: [isar-cip-core] tests: put all tests into a opt layer

Commit Message

Daniel Sangorrin July 22, 2020, 12:50 a.m. UTC

Hi Jan,

Sorry, I failed to put you in the Cc when I sent this patch.
There are also 3 patches from Venkata-san on the cip-dev mailing list (sent yesterday)
Apart from that there are some merge requests on gitlab.

Thanks,
Daniel

Patch

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f1dc91..90eec1f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,17 +13,17 @@  all:
     - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
     - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY

-    - kas build kas.yml:board-simatic-ipc227e.yml:opt-rt.yml:opt-targz-img.yml
+    - kas build kas.yml:board-simatic-ipc227e.yml:opt-tests.yml:opt-rt.yml:opt-targz-img.yml
     - scripts/deploy-cip-core.sh buster simatic-ipc227e

     - sudo rm -rf build/tmp
-    - kas build kas.yml:board-bbb.yml:opt-rt.yml:opt-targz-img.yml
+    - kas build kas.yml:board-bbb.yml:opt-tests.yml:opt-rt.yml:opt-targz-img.yml
     - scripts/deploy-cip-core.sh buster bbb am335x-boneblack.dtb

     - sudo rm -rf build/tmp
-    - kas build kas.yml:board-iwg20m.yml:opt-rt.yml:opt-targz-img.yml
+    - kas build kas.yml:board-iwg20m.yml:opt-tests.yml:opt-rt.yml:opt-targz-img.yml
     - scripts/deploy-cip-core.sh buster iwg20m r8a7743-iwg20d-q7-dbcm-ca.dtb

     - sudo rm -rf build/tmp
-    - kas build kas.yml:board-rzg2m.yml:opt-rt.yml:opt-targz-img.yml
+    - kas build kas.yml:board-rzg2m.yml:opt-tests.yml:opt-rt.yml:opt-targz-img.yml
     - scripts/deploy-cip-core.sh buster hihope-rzg2m renesas/r8a774a1-hihope-rzg2m-ex.dtb
diff --git a/README.md b/README.md
index bbad1a0..7339396 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,10 @@  this:

 This image can be run using `start-qemu.sh x86`.

+If you want to include the testing layer add ':opt-tests.yml' like this
+
+    ./kas-docker --isar build kas.yml:board-qemu-amd64.yml:opt-tests.yml
+
 The BeagleBone Black target is selected by `... kas.yml:board-bbb.yml`. In
 order to build the image with the PREEMPT-RT kernel, append `:opt-rt.yml` to
 the above. Append ':opt-4.4.yml' to use the kernel version 4.4 instead of 4.19.
diff --git a/opt-tests.yml b/opt-tests.yml
new file mode 100644
index 0000000..a1f431d
--- /dev/null
+++ b/opt-tests.yml
@@ -0,0 +1,19 @@ 
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Toshiba corp., 2020
+#
+# Authors:
+#  Daniel Sangorrin <[e-mail]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 8
+
+local_conf_header:
+  tests: |
+    IMAGE_INSTALL += "ltp-full"
+    IMAGE_PREINSTALL += "rt-tests stress-ng"
+
diff --git a/recipes-core/customizations/customizations.bb b/recipes-core/customizations/customizations.bb
index 38881fb..cbd6daf 100644
--- a/recipes-core/customizations/customizations.bb
+++ b/recipes-core/customizations/customizations.bb
@@ -11,7 +11,7 @@ 

 inherit dpkg-raw

-DESCRIPTION = "CIP Core image demo & test customizations"
+DESCRIPTION = "CIP Core image demo customizations"

 SRC_URI = " \
     file://postinst \
@@ -21,8 +21,7 @@  SRC_URI = " \
 DEPENDS += "sshd-regen-keys"

 DEBIAN_DEPENDS = " \
-    ifupdown, isc-dhcp-client, net-tools, iputils-ping, ssh, sshd-regen-keys, \
-    rt-tests, stress-ng"
+    ifupdown, isc-dhcp-client, net-tools, iputils-ping, ssh, sshd-regen-keys"

 do_install() {
        install -v -d ${D}/etc/network/interfaces.d
diff --git a/recipes-core/images/cip-core-image.bb b/recipes-core/images/cip-core-image.bb
index 9ee4b25..188c714 100644
--- a/recipes-core/images/cip-core-image.bb
+++ b/recipes-core/images/cip-core-image.bb
@@ -15,5 +15,4 @@  ISAR_RELEASE_CMD = "git -C ${LAYERDIR_cip-core} describe --tags --dirty --always
 DESCRIPTION = "CIP Core image"

 IMAGE_INSTALL += "customizations"
-# for cip-testing
-IMAGE_INSTALL += "ltp-full"
+