Add cip-core-image-kernelci building and uploading system

This image is currently used by KernelCI production for testing purpose. The purpose of this image is that KernelCI need to be able to autologin without password and to detect the login shell using special characters. Currently added are the default settings used by KernelCI images.

Signed-off-by Alice Ferrazzi <[email protected]>

---
 kas/opt/kernelci.yml                          | 16 +++++++++
 .../images/cip-core-image-kernelci.bb         | 16 +++++++++
 .../files/99-silent-printk.conf               |  1 +
 .../kernelci-customizations/files/ethernet    | 23 +++++++++++++
 .../kernelci-customizations/files/postinst    | 34 +++++++++++++++++++
 .../kernelci-customizations.bb                | 34 +++++++++++++++++++
 6 files changed, 124 insertions(+)
 create mode 100644 kas/opt/kernelci.yml
 create mode 100644 recipes-core/images/cip-core-image-kernelci.bb
 create mode 100644 recipes-core/kernelci-customizations/files/99-silent-printk.conf
 create mode 100644 recipes-core/kernelci-customizations/files/ethernet
 create mode 100644 recipes-core/kernelci-customizations/files/postinst
 create mode 100644 recipes-core/kernelci-customizations/kernelci-customizations.bb

kas/opt/kernelci.yml new file +16 -0

new file mode 100644
index 0000000..9c67864
@@ -0,0 +1,16 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Toshiba Corporation, 2020
+# Copyright (c) Cybertrust Japan Co., Ltd., 2021
+#
+# Authors:
+#  Venkata Pyla <[email protected]>
+#  Alice Ferrazzi <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+header:
+  version: 10
+
+target: cip-core-image-kernelci

recipes-core/images/cip-core-image-kernelci.bb new file +16 -0

new file mode 100644
index 0000000..479c14c
@@ -0,0 +1,16 @@
+#
+# A reference image for KernelCI
+#
+# Copyright (c) Cybertrust Japan Co., Ltd., 2021
+#
+# Authors:
+#  Alice Ferrazzi <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+inherit image
+
+DESCRIPTION = "CIP Core image for KernelCI"
+
+IMAGE_INSTALL += "kernelci-customizations"

recipes-core/kernelci-customizations/files/99-silent-printk.conf new file +1 -0

new file mode 100644
index 0000000..ad24d3a
@@ -0,0 +1 @@
+kernel.printk = 3 4 1 3

recipes-core/kernelci-customizations/files/ethernet new file +23 -0

new file mode 100644
index 0000000..fa47d1a
@@ -0,0 +1,23 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2019
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+allow-hotplug eth0
+allow-hotplug enp0s2
+allow-hotplug enp2s0
+
+# used on BBB
+iface eth0 inet dhcp
+
+# used on qemu-amd64
+iface enp0s2 inet dhcp
+
+# used on simatic-ipc227e
+iface enp2s0 inet dhcp

recipes-core/kernelci-customizations/files/postinst new file +34 -0

new file mode 100644
index 0000000..7ae30e8
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2019
+# Copyright (c) Cybertrust Japan Co., Ltd., 2021
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#  Alice Ferrazzi <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+echo "CIP Core Demo & Test Image" > /etc/issue
+
+# permit root login without password
+echo "PermitRootLogin yes" >> /etc/ssh/sshd_config
+echo "PermitEmptyPasswords yes" >> /etc/ssh/sshd_config
+passwd root -d
+
+# serial getty service for autologin
+mkdir -p /etc/systemd/system/[email protected]/
+echo "[Service]" > /etc/systemd/system/[email protected]/override.conf
+echo "ExecStart=" >> /etc/systemd/system/[email protected]/override.conf
+echo "ExecStart=-/sbin/agetty --autologin root --keep-baud 115200,38400,9600 %I $TERM" >> /etc/systemd/system/[email protected]/override.conf
+
+# set the profile for KernelCI
+echo "PS1='\$(pwd) # '" > /root/.profile
+echo "cd /" >> /root/.profile
+
+HOSTNAME=demo
+echo "$HOSTNAME" > /etc/hostname
+echo "127.0.0.1 $HOSTNAME" >> /etc/hosts

recipes-core/kernelci-customizations/kernelci-customizations.bb new file +24 -0

new file mode 100644
index 0000000..dca0891
@@ -0,0 +1,34 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2019
+# Copyright (c) Cybertrust Japan Co., Ltd., 2021
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#  Alice Ferrazzi <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+inherit dpkg-raw
+
+DESCRIPTION = "CIP Core image demo & customizations"
+
+SRC_URI = " \
+    file://postinst \
+    file://ethernet \
+    file://99-silent-printk.conf"
+
+DEPENDS += "sshd-regen-keys"
+

Quoted 171 lines · Alice Ferrazzi

This image is currently used by KernelCI production for testing purpose. The purpose of this image is that KernelCI need to be able to autologin without password and to detect the login shell using special characters. Currently added are the default settings used by KernelCI images.

Signed-off-by Alice Ferrazzi <[email protected]>

---
 kas/opt/kernelci.yml                          | 16 +++++++++
 .../images/cip-core-image-kernelci.bb         | 16 +++++++++
 .../files/99-silent-printk.conf               |  1 +
 .../kernelci-customizations/files/ethernet    | 23 +++++++++++++
 .../kernelci-customizations/files/postinst    | 34 +++++++++++++++++++
 .../kernelci-customizations.bb                | 34 +++++++++++++++++++
 6 files changed, 124 insertions(+)
 create mode 100644 kas/opt/kernelci.yml
 create mode 100644 recipes-core/images/cip-core-image-kernelci.bb
 create mode 100644 recipes-core/kernelci-customizations/files/99-silent-printk.conf
 create mode 100644 recipes-core/kernelci-customizations/files/ethernet
 create mode 100644 recipes-core/kernelci-customizations/files/postinst
 create mode 100644 recipes-core/kernelci-customizations/kernelci-customizations.bb

kas/opt/kernelci.yml new file +16 -0

new file mode 100644
index 0000000..9c67864
@@ -0,0 +1,16 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Toshiba Corporation, 2020
+# Copyright (c) Cybertrust Japan Co., Ltd., 2021
+#
+# Authors:
+#  Venkata Pyla <[email protected]>
+#  Alice Ferrazzi <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+header:
+  version: 10
+
+target: cip-core-image-kernelci

recipes-core/images/cip-core-image-kernelci.bb new file +16 -0

new file mode 100644
index 0000000..479c14c
@@ -0,0 +1,16 @@
+#
+# A reference image for KernelCI
+#
+# Copyright (c) Cybertrust Japan Co., Ltd., 2021
+#
+# Authors:
+#  Alice Ferrazzi <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+inherit image
+
+DESCRIPTION = "CIP Core image for KernelCI"
+
+IMAGE_INSTALL += "kernelci-customizations"

recipes-core/kernelci-customizations/files/99-silent-printk.conf new file +1 -0

new file mode 100644
index 0000000..ad24d3a
@@ -0,0 +1 @@
+kernel.printk = 3 4 1 3

recipes-core/kernelci-customizations/files/ethernet new file +23 -0

new file mode 100644
index 0000000..fa47d1a
@@ -0,0 +1,23 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2019
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+allow-hotplug eth0
+allow-hotplug enp0s2
+allow-hotplug enp2s0
+
+# used on BBB
+iface eth0 inet dhcp
+
+# used on qemu-amd64
+iface enp0s2 inet dhcp
+
+# used on simatic-ipc227e
+iface enp2s0 inet dhcp

recipes-core/kernelci-customizations/files/postinst new file +34 -0

new file mode 100644
index 0000000..7ae30e8
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2019
+# Copyright (c) Cybertrust Japan Co., Ltd., 2021
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#  Alice Ferrazzi <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+echo "CIP Core Demo & Test Image" > /etc/issue
+
+# permit root login without password
+echo "PermitRootLogin yes" >> /etc/ssh/sshd_config
+echo "PermitEmptyPasswords yes" >> /etc/ssh/sshd_config
+passwd root -d
+
+# serial getty service for autologin
+mkdir -p /etc/systemd/system/[email protected]/
+echo "[Service]" > /etc/systemd/system/[email protected]/override.conf
+echo "ExecStart=" >> /etc/systemd/system/[email protected]/override.conf
+echo "ExecStart=-/sbin/agetty --autologin root --keep-baud 115200,38400,9600 %I $TERM" >> /etc/systemd/system/[email protected]/override.conf
+
+# set the profile for KernelCI
+echo "PS1='\$(pwd) # '" > /root/.profile
+echo "cd /" >> /root/.profile
+
+HOSTNAME=demo
+echo "$HOSTNAME" > /etc/hostname
+echo "127.0.0.1 $HOSTNAME" >> /etc/hosts

recipes-core/kernelci-customizations/kernelci-customizations.bb new file +24 -0

new file mode 100644
index 0000000..dca0891
@@ -0,0 +1,34 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2019
+# Copyright (c) Cybertrust Japan Co., Ltd., 2021
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#  Alice Ferrazzi <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+inherit dpkg-raw
+
+DESCRIPTION = "CIP Core image demo & customizations"
+
+SRC_URI = " \
+    file://postinst \
+    file://ethernet \
+    file://99-silent-printk.conf"
+
+DEPENDS += "sshd-regen-keys"
+

recipes-core/kernelci-customizations/kernelci-customizations.bb line 34

Quoted 10 lines

recipes-core/kernelci-customizations/kernelci-customizations.bb new file +10 -0

+DEBIAN_DEPENDS = " \
+    ifupdown, isc-dhcp-client, net-tools, iputils-ping, ssh, sshd-regen-keys"
+
+do_install() {
+  install -v -d ${D}/etc/network/interfaces.d
+  install -v -m 644 ${WORKDIR}/ethernet ${D}/etc/network/interfaces.d/
+
+  install -v -d ${D}/etc/sysctl.d
+  install -v -m 644 ${WORKDIR}/99-silent-printk.conf ${D}/etc/sysctl.d/
+}

This is duplicating the default customization package, IIUC, for the purpose of adding further things. And you already miss some things due to this (WIRELESS_FIRMWARE_PACKAGE, INSTALL_WIRELESS_TOOLS).

How about installing both and carrying in kernelci-customization only the delta? Or at least reuse artifacts from customizations package, e.g. via symlinks?

enable CIP core image KernelCI to be built with gitlab pipeline and uploaded to the KernelCI storage using KernelCI API. enable cip-core-image-kernelci to be built for amd64, arm and arm64.

Signed-off-by Alice Ferrazzi <[email protected]>

---
 .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

.gitlab-ci.yml +1 -0

index e7db8c1..784343b 100644
@@ -9,6 +9,7 @@ variables:
   targz: disable
   dtb: none
   deploy: enable
+  deploy_kernelci: disable
 
 stages:
   - build

Quoted 19 lines · Alice Ferrazzi

enable CIP core image KernelCI to be built with gitlab pipeline and uploaded to the KernelCI storage using KernelCI API. enable cip-core-image-kernelci to be built for amd64, arm and arm64.

Signed-off-by Alice Ferrazzi <[email protected]>

---
 .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

.gitlab-ci.yml +1 -0

index e7db8c1..784343b 100644
@@ -9,6 +9,7 @@ variables:
   targz: disable
   dtb: none
   deploy: enable
+  deploy_kernelci: disable
 

.gitlab-ci.yml default: · line 42

Quoted 9 lines

.gitlab-ci.yml +2 -1

 stages:
   - build

@@ -37,7 +38,8 @@ default:
     - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi;
     - echo "Building ${base_yaml}"
     - kas build ${base_yaml}
-    - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi
+    - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi;
+    - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi

Does gitlab-ci forces us to add that closing ; to the last-but-one command? If so, better add it to the new from the beginning.

Quoted 21 lines · Jan Kiszka

Quoted 19 lines · Alice Ferrazzi

enable CIP core image KernelCI to be built with gitlab pipeline and uploaded to the KernelCI storage using KernelCI API. enable cip-core-image-kernelci to be built for amd64, arm and arm64.

Signed-off-by Alice Ferrazzi <[email protected]>

---
 .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

.gitlab-ci.yml +1 -0

index e7db8c1..784343b 100644
@@ -9,6 +9,7 @@ variables:
   targz: disable
   dtb: none
   deploy: enable
+  deploy_kernelci: disable
 

Quoted 13 lines

.gitlab-ci.yml default: · line 42

Quoted 9 lines

.gitlab-ci.yml +2 -1

 stages:
   - build

@@ -37,7 +38,8 @@ default:
     - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi;
     - echo "Building ${base_yaml}"
     - kas build ${base_yaml}
-    - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi
+    - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi;
+    - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi

Does gitlab-ci forces us to add that closing ; to the last-but-one command? If so, better add it to the new from the beginning.

I'm just following the syntax that is already there.
The gitlab-ci.yml file syntax preceding my commit is also doing same thing of adding that closing ; to the last-but-one command. You can check it here
https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/.gitlab-ci.yml#L40

Quoted 36 lines · Alice Ferrazzi

Quoted 21 lines · Jan Kiszka

Quoted 19 lines · Alice Ferrazzi

enable CIP core image KernelCI to be built with gitlab pipeline and uploaded to the KernelCI storage using KernelCI API. enable cip-core-image-kernelci to be built for amd64, arm and arm64.

Signed-off-by Alice Ferrazzi <[email protected]>

---
 .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

.gitlab-ci.yml +1 -0

index e7db8c1..784343b 100644
@@ -9,6 +9,7 @@ variables:
   targz: disable
   dtb: none
   deploy: enable
+  deploy_kernelci: disable
 

Quoted 13 lines

.gitlab-ci.yml default: · line 42

Quoted 9 lines

.gitlab-ci.yml +2 -1

 stages:
   - build

@@ -37,7 +38,8 @@ default:
     - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi;
     - echo "Building ${base_yaml}"
     - kas build ${base_yaml}
-    - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi
+    - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi;
+    - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi

Does gitlab-ci forces us to add that closing ; to the last-but-one command? If so, better add it to the new from the beginning.

Quoted 6 lines

I'm just following the syntax that is already there.
The gitlab-ci.yml file syntax preceding my commit is also doing same thing of adding that closing ; to the last-but-one command. You can check it here
https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/.gitlab-ci.yml#L40

Then, if the closing semicolon is needed, add it to the new line as well to avoid having to touch that when adding the next one.

Quoted 45 lines · Jan Kiszka

Quoted 42 lines · Alice Ferrazzi

Quoted 21 lines · Jan Kiszka

Quoted 19 lines · Alice Ferrazzi

enable CIP core image KernelCI to be built with gitlab pipeline and uploaded to the KernelCI storage using KernelCI API. enable cip-core-image-kernelci to be built for amd64, arm and arm64.

Signed-off-by Alice Ferrazzi <[email protected]>

---
 .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

.gitlab-ci.yml +1 -0

index e7db8c1..784343b 100644
@@ -9,6 +9,7 @@ variables:
   targz: disable
   dtb: none
   deploy: enable
+  deploy_kernelci: disable
 

Quoted 13 lines

.gitlab-ci.yml default: · line 42

Quoted 9 lines

.gitlab-ci.yml +2 -1

 stages:
   - build

@@ -37,7 +38,8 @@ default:
     - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi;
     - echo "Building ${base_yaml}"
     - kas build ${base_yaml}
-    - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi
+    - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi;
+    - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi

Does gitlab-ci forces us to add that closing ; to the last-but-one command? If so, better add it to the new from the beginning.

I'm just following the syntax that is already there.
The gitlab-ci.yml file syntax preceding my commit is also doing same thing of adding that closing ; to the last-but-one command. You can check it here
https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/.gitlab-ci.yml#L40

Quoted 2 lines

Then, if the closing semicolon is needed, add it to the new line as well to avoid having to touch that when adding the next one.

sorry I'm not understanding what you want me to do. The closing semicolon is needed to the last-but-one command. Adding it to the last command break the script.

Quoted 46 lines · Alice Ferrazzi

Quoted 45 lines · Jan Kiszka

Quoted 42 lines · Alice Ferrazzi

Quoted 21 lines · Jan Kiszka

Quoted 19 lines · Alice Ferrazzi

enable CIP core image KernelCI to be built with gitlab pipeline and uploaded to the KernelCI storage using KernelCI API. enable cip-core-image-kernelci to be built for amd64, arm and arm64.

Signed-off-by Alice Ferrazzi <[email protected]>

---
 .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

.gitlab-ci.yml +1 -0

index e7db8c1..784343b 100644
@@ -9,6 +9,7 @@ variables:
   targz: disable
   dtb: none
   deploy: enable
+  deploy_kernelci: disable
 

Quoted 13 lines

.gitlab-ci.yml default: · line 42

Quoted 9 lines

.gitlab-ci.yml +2 -1

 stages:
   - build

@@ -37,7 +38,8 @@ default:
     - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi;
     - echo "Building ${base_yaml}"
     - kas build ${base_yaml}
-    - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi
+    - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi;
+    - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi

Does gitlab-ci forces us to add that closing ; to the last-but-one command? If so, better add it to the new from the beginning.

I'm just following the syntax that is already there.
The gitlab-ci.yml file syntax preceding my commit is also doing same thing of adding that closing ; to the last-but-one command. You can check it here
https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/.gitlab-ci.yml#L40

Quoted 7 lines

Quoted 2 lines

Then, if the closing semicolon is needed, add it to the new line as well to avoid having to touch that when adding the next one.

sorry I'm not understanding what you want me to do. The closing semicolon is needed to the last-but-one command. Adding it to the last command break the script.

Are you really sure about the closing semicolon?

https://gitlab.com/jan-kiszka/ci-test/-/jobs/1951623081
https://gitlab.com/jan-kiszka/ci-test/-/blob/semicolon/.gitlab-ci.yml

Quoted 58 lines · Jan Kiszka

Quoted 46 lines · Alice Ferrazzi

Quoted 45 lines · Jan Kiszka

Quoted 42 lines · Alice Ferrazzi

Quoted 21 lines · Jan Kiszka

Quoted 19 lines · Alice Ferrazzi

enable CIP core image KernelCI to be built with gitlab pipeline and uploaded to the KernelCI storage using KernelCI API. enable cip-core-image-kernelci to be built for amd64, arm and arm64.

Signed-off-by Alice Ferrazzi <[email protected]>

---
 .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

.gitlab-ci.yml +1 -0

index e7db8c1..784343b 100644
@@ -9,6 +9,7 @@ variables:
   targz: disable
   dtb: none
   deploy: enable
+  deploy_kernelci: disable
 

Quoted 13 lines

.gitlab-ci.yml default: · line 42

Quoted 9 lines

.gitlab-ci.yml +2 -1

 stages:
   - build

@@ -37,7 +38,8 @@ default:
     - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi;
     - echo "Building ${base_yaml}"
     - kas build ${base_yaml}
-    - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi
+    - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi;
+    - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi

Does gitlab-ci forces us to add that closing ; to the last-but-one command? If so, better add it to the new from the beginning.

I'm just following the syntax that is already there.
The gitlab-ci.yml file syntax preceding my commit is also doing same thing of adding that closing ; to the last-but-one command. You can check it here
https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/.gitlab-ci.yml#L40

Quoted 7 lines

Quoted 2 lines

Then, if the closing semicolon is needed, add it to the new line as well to avoid having to touch that when adding the next one.

sorry I'm not understanding what you want me to do. The closing semicolon is needed to the last-but-one command. Adding it to the last command break the script.

Are you really sure about the closing semicolon?

Quoted 2 lines

https://gitlab.com/jan-kiszka/ci-test/-/jobs/1951623081
https://gitlab.com/jan-kiszka/ci-test/-/blob/semicolon/.gitlab-ci.yml

you are right. I just checked my pipeline backlog and found that some months ago,
I just checked for both without ; and not the case of both having it. Still we are changing the syntax already present and used. is it ok to use a new syntax? if is ok I can send a revision.

This patch series add a new image with settings for KernelCI.

This new image is called cip-core-image-kernelci and is based on isar-cip-core general image with some changes needed for make it work with KernelCI and taken from KernelCI image base settings.
The cip-core-image-kernelci images are built by GitlabCI and uploaded to KernelCI production fileserver.
https://storage.kernelci.org/images/rootfs/cip/

These patches are already integrated in the isar-cip-core:alicef/kernelci_master_refactor repository branch and are generating the images that are currently
used by KernelCI.

cip-core-image-kernelci as been tested and are already used in KernelCI production with good results.
https://linux.kernelci.org/test/job/stable-rc/branch/queue%2F5.14/kernel/v5.14.17-9-g9f7eecaa70b3/plan/baseline-cip-nfs/

Alice Ferrazzi (4):
Add cip-core-image-kernelci
Add dmesg filter needed for lava test result
Add script deploy-kernelci.py for upload the cip-core-image-kernelci enable cip-core-image-kernelci

 .gitlab-ci.yml                                | 40 +++++++++++++-
 kas/opt/kernelci.yml                          | 16 ++++++
 .../images/cip-core-image-kernelci.bb         | 16 ++++++
 .../files/99-silent-printk.conf               |  1 +
 .../kernelci-customizations/files/dmesg.sh    | 23 ++++++++
 .../kernelci-customizations/files/ethernet    | 23 ++++++++
 .../kernelci-customizations/files/postinst    | 34 ++++++++++++
 .../kernelci-customizations.bb                | 35 ++++++++++++
 scripts/deploy-kernelci.py                    | 55 +++++++++++++++++++
 9 files changed, 242 insertions(+), 1 deletion(-)

 create mode 100644 kas/opt/kernelci.yml
 create mode 100644 recipes-core/images/cip-core-image-kernelci.bb
 create mode 100644 recipes-core/kernelci-customizations/files/99-silent-printk.conf
 create mode 100644 recipes-core/kernelci-customizations/files/dmesg.sh
 create mode 100644 recipes-core/kernelci-customizations/files/ethernet
 create mode 100644 recipes-core/kernelci-customizations/files/postinst
 create mode 100644 recipes-core/kernelci-customizations/kernelci-customizations.bb
 create mode 100755 scripts/deploy-kernelci.py

This patch series add a new image with settings for KernelCI.

This new image is called cip-core-image-kernelci and is based on isar-cip-core general image with some changes needed for make it work with KernelCI and taken from KernelCI image base settings.
The cip-core-image-kernelci images are built by GitlabCI and uploaded to KernelCI production fileserver.
https://storage.kernelci.org/images/rootfs/cip/

These patches are already integrated in the isar-cip-core:alicef/kernelci_master_refactor repository branch and are generating the images that are currently
used by KernelCI.

cip-core-image-kernelci as been tested and are already used in KernelCI production with good results.
https://linux.kernelci.org/test/job/stable-rc/branch/queue%2F5.14/kernel/v5.14.17-9-g9f7eecaa70b3/plan/baseline-cip-nfs/

Quoted 11 lines · Alice Ferrazzi

This patch series add a new image with settings for KernelCI.

This new image is called cip-core-image-kernelci and is based on isar-cip-core general image with some changes needed for make it work with KernelCI and taken from KernelCI image base settings.
The cip-core-image-kernelci images are built by GitlabCI and uploaded to KernelCI production fileserver.
https://storage.kernelci.org/images/rootfs/cip/

Quoted 9 lines

These patches are already integrated in the isar-cip-core:alicef/kernelci_master_refactor repository branch and are generating the images that are currently
used by KernelCI.

cip-core-image-kernelci as been tested and are already used in KernelCI production with good results.
https://linux.kernelci.org/test/job/stable-rc/branch/queue%2F5.14/kernel/v5.14.17-9-g9f7eecaa70b3/plan/baseline-cip-nfs/

Thanks a lot for enabling this!

One meta-question: How does this image relate to what happens to a standard image when adding kas/opt/test.yml? Does kas/opt/kernelci.yml:kas/opt/test.yml make sense? Or should the former actually include the latter?

These things you may ask yourself when try to add the image also to our Kconfig menu ("kas-container menu"). That would be nice to have for a v3 as well, but more important is sorting out the option relationships.

Quoted 23 lines · Jan Kiszka

Quoted 11 lines · Alice Ferrazzi

This patch series add a new image with settings for KernelCI.

This new image is called cip-core-image-kernelci and is based on isar-cip-core general image with some changes needed for make it work with KernelCI and taken from KernelCI image base settings.
The cip-core-image-kernelci images are built by GitlabCI and uploaded to KernelCI production fileserver.
https://storage.kernelci.org/images/rootfs/cip/

Quoted 9 lines

These patches are already integrated in the isar-cip-core:alicef/kernelci_master_refactor repository branch and are generating the images that are currently
used by KernelCI.

cip-core-image-kernelci as been tested and are already used in KernelCI production with good results.
https://linux.kernelci.org/test/job/stable-rc/branch/queue%2F5.14/kernel/v5.14.17-9-g9f7eecaa70b3/plan/baseline-cip-nfs/

Quoted 6 lines

Thanks a lot for enabling this!

One meta-question: How does this image relate to what happens to a standard image when adding kas/opt/test.yml? Does kas/opt/kernelci.yml:kas/opt/test.yml make sense? Or should the former actually include the latter?

Currently it doesn't make too much sense to add such testing packages. CIP kernel image testing is done using ad-hoc images with a KernelCI built version of the
testing packages for having a common base and better compare results with other kernels.
cip-core-image-kernelci is currently tested as booting image with dmesg checks for each kernel (but still using specific KernelCI configurations and scripts).
We are currently trying to implement the iec-security test as user space test that will use cip-core-image-kernelci,
I sent a pull request for implementing the user space test iec-security but is still in progress.
Because KernelCI testings and test environments differs from CIP gitlab pipeline test environment,
we have to use a different file and merging both would currently make such different environments unstable.

I hope that this answer your question.

Quoted 4 lines

These things you may ask yourself when try to add the image also to our Kconfig menu ("kas-container menu"). That would be nice to have for a v3 as well, but more important is sorting out the option relationships.

cip-core-image-kernelci are build using gitlab pipeline and there is currently no benefit to have such
images manual build.

Quoted 48 lines · Alice Ferrazzi

Quoted 23 lines · Jan Kiszka

Quoted 11 lines · Alice Ferrazzi

This patch series add a new image with settings for KernelCI.

This new image is called cip-core-image-kernelci and is based on isar-cip-core general image with some changes needed for make it work with KernelCI and taken from KernelCI image base settings.
The cip-core-image-kernelci images are built by GitlabCI and uploaded to KernelCI production fileserver.
https://storage.kernelci.org/images/rootfs/cip/

Quoted 9 lines

These patches are already integrated in the isar-cip-core:alicef/kernelci_master_refactor repository branch and are generating the images that are currently
used by KernelCI.

cip-core-image-kernelci as been tested and are already used in KernelCI production with good results.
https://linux.kernelci.org/test/job/stable-rc/branch/queue%2F5.14/kernel/v5.14.17-9-g9f7eecaa70b3/plan/baseline-cip-nfs/

Quoted 6 lines

Thanks a lot for enabling this!

One meta-question: How does this image relate to what happens to a standard image when adding kas/opt/test.yml? Does kas/opt/kernelci.yml:kas/opt/test.yml make sense? Or should the former actually include the latter?

Currently it doesn't make too much sense to add such testing packages. CIP kernel image testing is done using ad-hoc images with a KernelCI built version of the
testing packages for having a common base and better compare results with other kernels.
cip-core-image-kernelci is currently tested as booting image with dmesg checks for each kernel (but still using specific KernelCI configurations and scripts).
We are currently trying to implement the iec-security test as user space test that will use cip-core-image-kernelci,
I sent a pull request for implementing the user space test iec-security but is still in progress.
Because KernelCI testings and test environments differs from CIP gitlab pipeline test environment,
we have to use a different file and merging both would currently make such different environments unstable.

Quoted 1 line

I hope that this answer your question.

Ok, we just need to keep an eye on target configs and options that deal with "testing" so that things are consistent and intuitive.

Quoted 5 lines

Quoted 4 lines

These things you may ask yourself when try to add the image also to our Kconfig menu ("kas-container menu"). That would be nice to have for a v3 as well, but more important is sorting out the option relationships.

Quoted 4 lines

cip-core-image-kernelci are build using gitlab pipeline and there is currently no benefit to have such
images manual build.

So, the case that a test fails on kernel CI and someone want to reproduce the image that triggered this does not exist? One would rather build a regular image for the target then?

Quoted 65 lines · Jan Kiszka

Quoted 48 lines · Alice Ferrazzi

Quoted 23 lines · Jan Kiszka

Quoted 11 lines · Alice Ferrazzi

This patch series add a new image with settings for KernelCI.

This new image is called cip-core-image-kernelci and is based on isar-cip-core general image with some changes needed for make it work with KernelCI and taken from KernelCI image base settings.
The cip-core-image-kernelci images are built by GitlabCI and uploaded to KernelCI production fileserver.
https://storage.kernelci.org/images/rootfs/cip/

Quoted 9 lines

These patches are already integrated in the isar-cip-core:alicef/kernelci_master_refactor repository branch and are generating the images that are currently
used by KernelCI.

cip-core-image-kernelci as been tested and are already used in KernelCI production with good results.
https://linux.kernelci.org/test/job/stable-rc/branch/queue%2F5.14/kernel/v5.14.17-9-g9f7eecaa70b3/plan/baseline-cip-nfs/

Quoted 6 lines

Thanks a lot for enabling this!

One meta-question: How does this image relate to what happens to a standard image when adding kas/opt/test.yml? Does kas/opt/kernelci.yml:kas/opt/test.yml make sense? Or should the former actually include the latter?

Currently it doesn't make too much sense to add such testing packages. CIP kernel image testing is done using ad-hoc images with a KernelCI built version of the
testing packages for having a common base and better compare results with other kernels.
cip-core-image-kernelci is currently tested as booting image with dmesg checks for each kernel (but still using specific KernelCI configurations and scripts).
We are currently trying to implement the iec-security test as user space test that will use cip-core-image-kernelci,
I sent a pull request for implementing the user space test iec-security but is still in progress.
Because KernelCI testings and test environments differs from CIP gitlab pipeline test environment,
we have to use a different file and merging both would currently make such different environments unstable.

Quoted 1 line

I hope that this answer your question.

Ok, we just need to keep an eye on target configs and options that deal with "testing" so that things are consistent and intuitive.

Quoted 9 lines

Quoted 4 lines

These things you may ask yourself when try to add the image also to our Kconfig menu ("kas-container menu"). That would be nice to have for a v3 as well, but more important is sorting out the option relationships.

cip-core-image-kernelci are build using gitlab pipeline and there is currently no benefit to have such
images manual build.

Quoted 4 lines

So, the case that a test fails on kernel CI and someone want to reproduce the image that triggered this does not exist? One would rather build a regular image for the target then?

Why not just using the pre made image from
https://storage.kernelci.org/images/rootfs/cip/
for reproducing errors ?