* [cip-dev] [linux-cip-ci][PATCH 1/3] lava_templates: Add support de0-nano-soc for deby
@ 2020-09-01 6:13 Nobuhiro Iwamatsu
2020-09-01 6:13 ` [cip-dev] [linux-cip-ci][PATCH 2/3] lava_templates: Add support zynqmp-zcu102 Nobuhiro Iwamatsu
2020-09-01 6:13 ` [cip-dev] [linux-cip-ci][PATCH 3/3] lava_templates: Add test script for generated yaml file Nobuhiro Iwamatsu
0 siblings, 2 replies; 3+ messages in thread
From: Nobuhiro Iwamatsu @ 2020-09-01 6:13 UTC (permalink / raw)
To: cip-dev; +Cc: chris.paterson2, Nobuhiro Iwamatsu
[-- Attachment #1: Type: text/plain, Size: 2760 bytes --]
Add ltp and boot/smc test YAML files for de0-nano-soc with deby.
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
.../action_deby-buster-ltp_de0-nano-soc.yaml | 15 +++++++++++++++
.../action_deby-buster_de0-nano-soc.yaml | 15 +++++++++++++++
.../boot_deby-buster-ltp_de0-nano-soc.yaml | 1 +
lava_templates/boot_deby-buster_de0-nano-soc.yaml | 12 ++++++++++++
4 files changed, 43 insertions(+)
create mode 100644 lava_templates/action_deby-buster-ltp_de0-nano-soc.yaml
create mode 100644 lava_templates/action_deby-buster_de0-nano-soc.yaml
create mode 120000 lava_templates/boot_deby-buster-ltp_de0-nano-soc.yaml
create mode 100644 lava_templates/boot_deby-buster_de0-nano-soc.yaml
diff --git a/lava_templates/action_deby-buster-ltp_de0-nano-soc.yaml b/lava_templates/action_deby-buster-ltp_de0-nano-soc.yaml
new file mode 100644
index 0000000..215750a
--- /dev/null
+++ b/lava_templates/action_deby-buster-ltp_de0-nano-soc.yaml
@@ -0,0 +1,15 @@
+# ACTION_BLOCK
+actions:
+- deploy:
+ timeout:
+ minutes: 10
+ to: tftp
+ os: oe
+ kernel:
+ url: KERNEL_URL
+ type: zimage
+ nfsrootfs:
+ url: https://s3-us-west-2.amazonaws.com/download.cip-project.org/ciptesting/cip-lava/rfs/core-image-minimal-ltp-de0-nano-soc.tar.bz2
+ compression: bz2
+ dtb:
+ url: DTB_URL
diff --git a/lava_templates/action_deby-buster_de0-nano-soc.yaml b/lava_templates/action_deby-buster_de0-nano-soc.yaml
new file mode 100644
index 0000000..215750a
--- /dev/null
+++ b/lava_templates/action_deby-buster_de0-nano-soc.yaml
@@ -0,0 +1,15 @@
+# ACTION_BLOCK
+actions:
+- deploy:
+ timeout:
+ minutes: 10
+ to: tftp
+ os: oe
+ kernel:
+ url: KERNEL_URL
+ type: zimage
+ nfsrootfs:
+ url: https://s3-us-west-2.amazonaws.com/download.cip-project.org/ciptesting/cip-lava/rfs/core-image-minimal-ltp-de0-nano-soc.tar.bz2
+ compression: bz2
+ dtb:
+ url: DTB_URL
diff --git a/lava_templates/boot_deby-buster-ltp_de0-nano-soc.yaml b/lava_templates/boot_deby-buster-ltp_de0-nano-soc.yaml
new file mode 120000
index 0000000..42fb694
--- /dev/null
+++ b/lava_templates/boot_deby-buster-ltp_de0-nano-soc.yaml
@@ -0,0 +1 @@
+boot_deby-buster_de0-nano-soc.yaml
\ No newline at end of file
diff --git a/lava_templates/boot_deby-buster_de0-nano-soc.yaml b/lava_templates/boot_deby-buster_de0-nano-soc.yaml
new file mode 100644
index 0000000..85debd4
--- /dev/null
+++ b/lava_templates/boot_deby-buster_de0-nano-soc.yaml
@@ -0,0 +1,12 @@
+# BOOT_BLOCK
+- boot:
+ auto_login:
+ login_prompt: "de0-nano-soc login:"
+ username: root
+ prompts:
+ - "# "
+ method: u-boot
+ commands: nfs
+ timeout:
+ minutes: 5
+
--
2.27.0
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5345): https://lists.cip-project.org/g/cip-dev/message/5345
Mute This Topic: https://lists.cip-project.org/mt/76551100/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [cip-dev] [linux-cip-ci][PATCH 2/3] lava_templates: Add support zynqmp-zcu102
2020-09-01 6:13 [cip-dev] [linux-cip-ci][PATCH 1/3] lava_templates: Add support de0-nano-soc for deby Nobuhiro Iwamatsu
@ 2020-09-01 6:13 ` Nobuhiro Iwamatsu
2020-09-01 6:13 ` [cip-dev] [linux-cip-ci][PATCH 3/3] lava_templates: Add test script for generated yaml file Nobuhiro Iwamatsu
1 sibling, 0 replies; 3+ messages in thread
From: Nobuhiro Iwamatsu @ 2020-09-01 6:13 UTC (permalink / raw)
To: cip-dev; +Cc: chris.paterson2, Nobuhiro Iwamatsu
[-- Attachment #1: Type: text/plain, Size: 2777 bytes --]
Add ltp and boot/smc test YAML files for zynqmp-zcu102 with deby.
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
.../action_deby-buster-ltp_zynqmp-zcu102.yaml | 16 ++++++++++++++++
.../action_deby-buster_zynqmp-zcu102.yaml | 16 ++++++++++++++++
.../boot_deby-buster-ltp_zynqmp-zcu102.yaml | 1 +
.../boot_deby-buster_zynqmp-zcu102.yaml | 12 ++++++++++++
4 files changed, 45 insertions(+)
create mode 100644 lava_templates/action_deby-buster-ltp_zynqmp-zcu102.yaml
create mode 100644 lava_templates/action_deby-buster_zynqmp-zcu102.yaml
create mode 120000 lava_templates/boot_deby-buster-ltp_zynqmp-zcu102.yaml
create mode 100644 lava_templates/boot_deby-buster_zynqmp-zcu102.yaml
diff --git a/lava_templates/action_deby-buster-ltp_zynqmp-zcu102.yaml b/lava_templates/action_deby-buster-ltp_zynqmp-zcu102.yaml
new file mode 100644
index 0000000..bca9892
--- /dev/null
+++ b/lava_templates/action_deby-buster-ltp_zynqmp-zcu102.yaml
@@ -0,0 +1,16 @@
+# ACTION_BLOCK
+actions:
+- deploy:
+ timeout:
+ minutes: 10
+ to: tftp
+ os: oe
+ kernel:
+ url: KERNEL_URL
+ type: image
+ nfsrootfs:
+ url: https://s3-us-west-2.amazonaws.com/download.cip-project.org/ciptesting/cip-lava/rfs/core-image-minimal-ltp-zcu102-zynqmp.tar.bz2
+ compression: bz2
+ dtb:
+ url: DTB_URL
+
diff --git a/lava_templates/action_deby-buster_zynqmp-zcu102.yaml b/lava_templates/action_deby-buster_zynqmp-zcu102.yaml
new file mode 100644
index 0000000..3d2cce0
--- /dev/null
+++ b/lava_templates/action_deby-buster_zynqmp-zcu102.yaml
@@ -0,0 +1,16 @@
+# ACTION_BLOCK
+actions:
+- deploy:
+ timeout:
+ minutes: 10
+ to: tftp
+ os: oe
+ kernel:
+ url: KERNEL_URL
+ type: image
+ nfsrootfs:
+ url: https://s3-us-west-2.amazonaws.com/download.cip-project.org/ciptesting/cip-lava/rfs/core-image-minimal-zcu102-zynqmp.tar.bz2
+ compression: bz2
+ dtb:
+ url: DTB_URL
+
diff --git a/lava_templates/boot_deby-buster-ltp_zynqmp-zcu102.yaml b/lava_templates/boot_deby-buster-ltp_zynqmp-zcu102.yaml
new file mode 120000
index 0000000..67c02c5
--- /dev/null
+++ b/lava_templates/boot_deby-buster-ltp_zynqmp-zcu102.yaml
@@ -0,0 +1 @@
+boot_deby-buster_zynqmp-zcu102.yaml
\ No newline at end of file
diff --git a/lava_templates/boot_deby-buster_zynqmp-zcu102.yaml b/lava_templates/boot_deby-buster_zynqmp-zcu102.yaml
new file mode 100644
index 0000000..db223b4
--- /dev/null
+++ b/lava_templates/boot_deby-buster_zynqmp-zcu102.yaml
@@ -0,0 +1,12 @@
+# BOOT_BLOCK
+- boot:
+ auto_login:
+ login_prompt: 'zcu102-zynqmp login:'
+ username: root
+ prompts:
+ - '# '
+ method: u-boot
+ commands: nfs
+ timeout:
+ minutes: 5
+
--
2.27.0
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5346): https://lists.cip-project.org/g/cip-dev/message/5346
Mute This Topic: https://lists.cip-project.org/mt/76551105/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [cip-dev] [linux-cip-ci][PATCH 3/3] lava_templates: Add test script for generated yaml file
2020-09-01 6:13 [cip-dev] [linux-cip-ci][PATCH 1/3] lava_templates: Add support de0-nano-soc for deby Nobuhiro Iwamatsu
2020-09-01 6:13 ` [cip-dev] [linux-cip-ci][PATCH 2/3] lava_templates: Add support zynqmp-zcu102 Nobuhiro Iwamatsu
@ 2020-09-01 6:13 ` Nobuhiro Iwamatsu
1 sibling, 0 replies; 3+ messages in thread
From: Nobuhiro Iwamatsu @ 2020-09-01 6:13 UTC (permalink / raw)
To: cip-dev; +Cc: chris.paterson2, Nobuhiro Iwamatsu
[-- Attachment #1: Type: text/plain, Size: 2764 bytes --]
This will add a script that will output the final YAML generated.
This is used to verify YAML.
```
$ ./lava_templates/show_generated_yaml.sh de0-nano-soc arm \
deby-buster-ltp ltp-ipc-tests true
```
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
lava_templates/show_generated_yaml.sh | 74 +++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
create mode 100755 lava_templates/show_generated_yaml.sh
diff --git a/lava_templates/show_generated_yaml.sh b/lava_templates/show_generated_yaml.sh
new file mode 100755
index 0000000..e383765
--- /dev/null
+++ b/lava_templates/show_generated_yaml.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+# Copyright (C) 2020, Renesas Electronics Europe GmbH, Chris Paterson <chris.paterson2@renesas.com>
+# Copyright (C) 2020, Toshiba Nobuhiro Iwamtasu <nobuhiro1.iwamatsu@toshibac.co.jp>
+#
+
+set -e
+
+# $1: OS type
+# $2: Test name
+create_job_definition () {
+ local base_os="$1"
+ local testname="$2"
+
+ local dtb_url="$AWS_URL_DOWN/$DTB"
+ local kernel_url="$AWS_URL_DOWN/$KERNEL"
+ local modules_url="$AWS_URL_DOWN/$MODULES"
+
+ local commit_ref=$(echo "${CI_COMMIT_REF_NAME}" | sed 's/\//-/g')
+
+ if $USE_DTB; then
+ local job_name="${commit_ref}_${VERSION}_${BUILD_ARCH}_${CONFIG}_${DTB_NAME}_${testname}"
+ else
+ local job_name="${commit_ref}_${VERSION}_${BUILD_ARCH}_${CONFIG}_${testname}"
+ fi
+
+ local job_definition="$TMP_DIR/${INDEX}_${job_name}.yaml"
+ INDEX=$((INDEX+1))
+
+ cat ${TEMPLATE_DIR}/header_base.yaml > "${job_definition}"
+ if [ "${DEVICE}" = "qemu" ] ; then
+ local device_name="${DEVICE}_${BUILD_ARCH}"
+ cat ${TEMPLATE_DIR}/context_${device_name}.yaml >> "${job_definition}"
+ else
+ local device_name="${DEVICE}"
+ fi
+
+ cat ${TEMPLATE_DIR}/timeouts_"${testname}".yaml \
+ ${TEMPLATE_DIR}/action_"${base_os}"_"${device_name}".yaml \
+ ${TEMPLATE_DIR}/boot_"${base_os}"_"${device_name}".yaml \
+ ${TEMPLATE_DIR}/test_"${testname}".yaml \
+ >> "${job_definition}"
+
+ sed -i "s|DEVICE_NAME|${DEVICE}|g" "$job_definition"
+ sed -i "s|JOB_NAME|$job_name|g" "$job_definition"
+ if $USE_MODULES; then
+ sed -i "/DTB_URL/ a \ modules:\n url: $modules_url\n compression: gz" "$job_definition"
+ fi
+ if $USE_DTB; then
+ sed -i "s|DTB_URL|$dtb_url|g" "$job_definition"
+ fi
+ sed -i "s|KERNEL_URL|$kernel_url|g" "$job_definition"
+
+ echo ${job_definition}
+ cat ${job_definition}
+}
+
+SCRIPT_DIR=$(cd $(dirname $0);pwd)
+
+TEMPLATE_DIR="${SCRIPT_DIR}"
+TMP_DIR="/tmp/"
+AWS_URL_DOWN="exmample.org"
+KERNEL="zImage"
+DTB="foo.dtb"
+MODULES="bar.tar.gz"
+VERSION="4.19.1-1"
+CI_COMMIT_REF_NAME="a/b/c/d"
+CONFIG="testconfig"
+DTB_NAME="test-dtb"
+INDEX="1"
+DEVICE=$1
+BUILD_ARCH=$2
+USE_DTB=$5
+
+create_job_definition $3 $4
--
2.27.0
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5347): https://lists.cip-project.org/g/cip-dev/message/5347
Mute This Topic: https://lists.cip-project.org/mt/76551108/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-01 6:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-01 6:13 [cip-dev] [linux-cip-ci][PATCH 1/3] lava_templates: Add support de0-nano-soc for deby Nobuhiro Iwamatsu
2020-09-01 6:13 ` [cip-dev] [linux-cip-ci][PATCH 2/3] lava_templates: Add support zynqmp-zcu102 Nobuhiro Iwamatsu
2020-09-01 6:13 ` [cip-dev] [linux-cip-ci][PATCH 3/3] lava_templates: Add test script for generated yaml file Nobuhiro Iwamatsu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).