[cip-dev] [PATCH 1/3] Change templagte directory name

[cip-dev] [PATCH 1/3] Change templagte directory name

[Nobuhiro Iwamatsu]

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 .../r8a7743-iwg20d-q7.yaml                                    | 0
 .../r8a7745-iwg22d-sodimm.yaml                                | 0
 {healthcheck_templates => lava_templates}/r8a774c0-ek874.yaml | 0
 submit_tests.sh                                               | 2 +-
 test.Dockerfile                                               | 4 ++--
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename {healthcheck_templates => lava_templates}/r8a7743-iwg20d-q7.yaml (100%)
 rename {healthcheck_templates => lava_templates}/r8a7745-iwg22d-sodimm.yaml (100%)
 rename {healthcheck_templates => lava_templates}/r8a774c0-ek874.yaml (100%)

diff --git a/healthcheck_templates/r8a7743-iwg20d-q7.yaml b/lava_templates/r8a7743-iwg20d-q7.yaml
similarity index 100%
rename from healthcheck_templates/r8a7743-iwg20d-q7.yaml
rename to lava_templates/r8a7743-iwg20d-q7.yaml
diff --git a/healthcheck_templates/r8a7745-iwg22d-sodimm.yaml b/lava_templates/r8a7745-iwg22d-sodimm.yaml
similarity index 100%
rename from healthcheck_templates/r8a7745-iwg22d-sodimm.yaml
rename to lava_templates/r8a7745-iwg22d-sodimm.yaml
diff --git a/healthcheck_templates/r8a774c0-ek874.yaml b/lava_templates/r8a774c0-ek874.yaml
similarity index 100%
rename from healthcheck_templates/r8a774c0-ek874.yaml
rename to lava_templates/r8a774c0-ek874.yaml
diff --git a/submit_tests.sh b/submit_tests.sh
index 2911af1..7dff7a2 100755
--- a/submit_tests.sh
+++ b/submit_tests.sh
@@ -29,7 +29,7 @@ set -e
 ################################################################################
 WORK_DIR=`pwd`
 OUTPUT_DIR="$WORK_DIR/output"
-TEMPLATE_DIR="/opt/healthcheck_templates"
+TEMPLATE_DIR="/opt/lava_templates"
 ################################################################################
 AWS_URL_UP="s3://download.cip-project.org/ciptesting/ci"
 AWS_URL_DOWN="https://s3-us-west-2.amazonaws.com/download.cip-project.org/ciptesting/ci"
diff --git a/test.Dockerfile b/test.Dockerfile
index 04e2ad9..d15f7a3 100644
--- a/test.Dockerfile
+++ b/test.Dockerfile
@@ -11,8 +11,8 @@ RUN apt-get update \
 # Install AWS CLI
 RUN pip3 install awscli
 
-# Copy healthcheck templates
-COPY healthcheck_templates /opt/healthcheck_templates
+# Copy lava templates
+COPY lava_templates /opt/lava_templates
 
 # Copy test script
 COPY submit_tests.sh /opt/
-- 
2.20.1

[cip-dev] [PATCH 2/3] Change to specify test name as argument to create_job

[Nobuhiro Iwamatsu]

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 ...20d-q7.yaml => r8a7743-iwg20d-q7_healthcheck.yaml} |  0
 ...mm.yaml => r8a7745-iwg22d-sodimm_healthcheck.yaml} |  0
 ...4c0-ek874.yaml => r8a774c0-ek874_healthcheck.yaml} |  0
 submit_tests.sh                                       | 11 ++++++-----
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename lava_templates/{r8a7743-iwg20d-q7.yaml => r8a7743-iwg20d-q7_healthcheck.yaml} (100%)
 rename lava_templates/{r8a7745-iwg22d-sodimm.yaml => r8a7745-iwg22d-sodimm_healthcheck.yaml} (100%)
 rename lava_templates/{r8a774c0-ek874.yaml => r8a774c0-ek874_healthcheck.yaml} (100%)

diff --git a/lava_templates/r8a7743-iwg20d-q7.yaml b/lava_templates/r8a7743-iwg20d-q7_healthcheck.yaml
similarity index 100%
rename from lava_templates/r8a7743-iwg20d-q7.yaml
rename to lava_templates/r8a7743-iwg20d-q7_healthcheck.yaml
diff --git a/lava_templates/r8a7745-iwg22d-sodimm.yaml b/lava_templates/r8a7745-iwg22d-sodimm_healthcheck.yaml
similarity index 100%
rename from lava_templates/r8a7745-iwg22d-sodimm.yaml
rename to lava_templates/r8a7745-iwg22d-sodimm_healthcheck.yaml
diff --git a/lava_templates/r8a774c0-ek874.yaml b/lava_templates/r8a774c0-ek874_healthcheck.yaml
similarity index 100%
rename from lava_templates/r8a774c0-ek874.yaml
rename to lava_templates/r8a774c0-ek874_healthcheck.yaml
diff --git a/submit_tests.sh b/submit_tests.sh
index 7dff7a2..5f83182 100755
--- a/submit_tests.sh
+++ b/submit_tests.sh
@@ -47,11 +47,12 @@ clean_up () {
 }
 
 get_template () {
-	TEMPLATE="$TEMPLATE_DIR/$DEVICE.yaml"
+	TEMPLATE="${TEMPLATE_DIR}/${DEVICE}_${1}.yaml"
 }
 
 create_job () {
-	get_template
+	local testname="$1"
+	get_template $testname
 
 	local dtb_url="$AWS_URL_DOWN/$DTB"
 	local kernel_url="$AWS_URL_DOWN/$KERNEL"
@@ -59,9 +60,9 @@ create_job () {
 
 	INDEX="0"
 	if $USE_DTB; then
-		local job_name="${VERSION}_${ARCH}_${CONFIG}_${DTB_NAME}"
+		local job_name="${VERSION}_${ARCH}_${CONFIG}_${DTB_NAME}_${testname}"
 	else
-		local job_name="${VERSION}_${ARCH}_${CONFIG}"
+		local job_name="${VERSION}_${ARCH}_${CONFIG}_${testname}"
 	fi
 
 	local job_definition="$TMP_DIR/${INDEX}_${job_name}.yaml"
@@ -148,7 +149,7 @@ find_jobs () {
 			fi
 
 			print_kernel_info
-			create_job
+			create_job healthcheck
 		done < $jobfile
 	done
 }
-- 
2.20.1

[cip-dev] [PATCH 3/3] Add spectre-meltdown-checker test

[Nobuhiro Iwamatsu]

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 lava_templates/r8a7743-iwg20d-q7_smc.yaml     | 69 +++++++++++++++++++
 lava_templates/r8a7745-iwg22d-sodimm_smc.yaml | 69 +++++++++++++++++++
 lava_templates/r8a774c0-ek874_smc.yaml        | 69 +++++++++++++++++++
 submit_tests.sh                               |  1 +
 4 files changed, 208 insertions(+)
 create mode 100644 lava_templates/r8a7743-iwg20d-q7_smc.yaml
 create mode 100644 lava_templates/r8a7745-iwg22d-sodimm_smc.yaml
 create mode 100644 lava_templates/r8a774c0-ek874_smc.yaml

diff --git a/lava_templates/r8a7743-iwg20d-q7_smc.yaml b/lava_templates/r8a7743-iwg20d-q7_smc.yaml
new file mode 100644
index 0000000..0e10584
--- /dev/null
+++ b/lava_templates/r8a7743-iwg20d-q7_smc.yaml
@@ -0,0 +1,69 @@
+# Copyright (C) 2019, Renesas Electronics Europe GmbH, Chris Paterson <chris.paterson2@renesas.com>
+# SPDX-License-Identifier:	AGPL-3.0
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, version 3.
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
+# You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+device_type: r8a7743-iwg20d-q7
+job_name: JOB_NAME
+
+timeouts:
+  job:
+    minutes: 15
+  action:
+    minutes: 10
+  connection:
+    minutes: 5
+priority: medium
+visibility: public
+
+notify:
+  criteria:
+    status: finished
+  verbosity: verbose
+  recipients:
+  - to:
+     method: email
+     email: cip-testing-results at lists.cip-project.org
+
+# ACTION_BLOCK
+actions:
+- deploy:
+    timeout:
+      minutes: 10
+    to: tftp
+    os: oe
+    kernel:
+      url: KERNEL_URL
+      type: uimage
+    nfsrootfs:
+      url: https://s3-us-west-2.amazonaws.com/download.cip-project.org/cip-core/iwg20m/core-image-minimal-iwg20m.tar.gz
+      compression: gz
+    dtb:
+      url: DTB_URL
+
+# BOOT_BLOCK
+- boot:
+    auto_login:
+      login_prompt: 'ciphost login:'
+      username: root
+    prompts:
+      - 'cip-project#'
+    method: u-boot
+    commands: nfs
+    timeout:
+      minutes: 5
+
+# Spectre meltdown checker
+# TEST_BLOCK
+- test:
+   timeout:
+     minutes: 10
+   definitions:
+   - repository: https://github.com/Linaro/test-definitions.git
+     from: git
+     path: automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.yaml
+     name: spectre-meltdown-checker-test
+     timeout:
+       minutes: 10
+
diff --git a/lava_templates/r8a7745-iwg22d-sodimm_smc.yaml b/lava_templates/r8a7745-iwg22d-sodimm_smc.yaml
new file mode 100644
index 0000000..180d94a
--- /dev/null
+++ b/lava_templates/r8a7745-iwg22d-sodimm_smc.yaml
@@ -0,0 +1,69 @@
+# Copyright (C) 2019, Renesas Electronics Europe GmbH, Chris Paterson <chris.paterson2@renesas.com>
+# SPDX-License-Identifier:	AGPL-3.0
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, version 3.
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
+# You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+device_type: r8a7745-iwg22d-sodimm
+job_name: JOB_NAME
+
+timeouts:
+  job:
+    minutes: 15
+  action:
+    minutes: 10
+  connection:
+    minutes: 5
+priority: medium
+visibility: public
+
+notify:
+  criteria:
+    status: finished
+  verbosity: verbose
+  recipients:
+  - to:
+     method: email
+     email: cip-testing-results at lists.cip-project.org
+
+# ACTION_BLOCK
+actions:
+- deploy:
+    timeout:
+      minutes: 10
+    to: tftp
+    os: oe
+    kernel:
+      url: KERNEL_URL
+      type: uimage
+    nfsrootfs:
+      url: https://s3-us-west-2.amazonaws.com/download.cip-project.org/ciptesting/cip-lava/rfs/core-image-minimal-iwg22m-20181126155628.rootfs.tar.gz
+      compression: gz
+    dtb:
+      url: DTB_URL
+
+# BOOT_BLOCK
+- boot:
+    auto_login:
+      login_prompt: 'iwg22m login: '
+      username: root
+    prompts:
+      - 'root at iwg22m'
+    method: u-boot
+    commands: nfs
+    timeout:
+      minutes: 5
+
+# Spectre meltdown checker
+# TEST_BLOCK
+- test:
+   timeout:
+     minutes: 10
+   definitions:
+   - repository: https://github.com/Linaro/test-definitions.git
+     from: git
+     path: automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.yaml
+     name: spectre-meltdown-checker-test
+     timeout:
+       minutes: 10
+
diff --git a/lava_templates/r8a774c0-ek874_smc.yaml b/lava_templates/r8a774c0-ek874_smc.yaml
new file mode 100644
index 0000000..e244a0e
--- /dev/null
+++ b/lava_templates/r8a774c0-ek874_smc.yaml
@@ -0,0 +1,69 @@
+# Copyright (C) 2019, Renesas Electronics Europe GmbH, Chris Paterson <chris.paterson2@renesas.com>
+# SPDX-License-Identifier:	AGPL-3.0
+# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, version 3.
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
+# You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+device_type: r8a774c0-ek874
+job_name: JOB_NAME
+
+timeouts:
+  job:
+    minutes: 15
+  action:
+    minutes: 10
+  connection:
+    minutes: 5
+priority: medium
+visibility: public
+
+notify:
+  criteria:
+    status: finished
+  verbosity: verbose
+  recipients:
+  - to:
+     method: email
+     email: cip-testing-results at lists.cip-project.org
+
+# 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-bsp-ek874.tar.gz
+      compression: gz
+    dtb:
+      url: DTB_URL
+
+# BOOT_BLOCK
+- boot:
+    auto_login:
+      login_prompt: 'ek874 login:'
+      username: root
+    prompts:
+      - 'root at ek874'
+    method: u-boot
+    commands: nfs
+    timeout:
+      minutes: 5
+
+# Spectre meltdown checker
+# TEST_BLOCK
+- test:
+   timeout:
+     minutes: 10
+   definitions:
+   - repository: https://github.com/Linaro/test-definitions.git
+     from: git
+     path: automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.yaml
+     name: spectre-meltdown-checker-test
+     timeout:
+       minutes: 10
+
diff --git a/submit_tests.sh b/submit_tests.sh
index 5f83182..b1a275e 100755
--- a/submit_tests.sh
+++ b/submit_tests.sh
@@ -150,6 +150,7 @@ find_jobs () {
 
 			print_kernel_info
 			create_job healthcheck
+			create_job smc
 		done < $jobfile
 	done
 }
-- 
2.20.1

[cip-dev] [PATCH 1/3] Change templagte directory name

[Chris Paterson]

Hello Iwamatsu-san,

> From: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> Sent: 28 August 2019 03:26
> 
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> ---
>  .../r8a7743-iwg20d-q7.yaml                                    | 0
>  .../r8a7745-iwg22d-sodimm.yaml                                | 0
>  {healthcheck_templates => lava_templates}/r8a774c0-ek874.yaml | 0
>  submit_tests.sh                                               | 2 +-
>  test.Dockerfile                                               | 4 ++--
>  5 files changed, 3 insertions(+), 3 deletions(-)
>  rename {healthcheck_templates => lava_templates}/r8a7743-iwg20d-
> q7.yaml (100%)
>  rename {healthcheck_templates => lava_templates}/r8a7745-iwg22d-
> sodimm.yaml (100%)
>  rename {healthcheck_templates => lava_templates}/r8a774c0-ek874.yaml
> (100%)

Thank you for this patch. Do you think you could create a merge request in gitlab[0] so we can do the review there?
For this patch and the other two in the series.

[0] https://gitlab.com/cip-project/cip-testing/linux-cip-ci/merge_requests

Kind regards, Chris

> 
> diff --git a/healthcheck_templates/r8a7743-iwg20d-q7.yaml
> b/lava_templates/r8a7743-iwg20d-q7.yaml
> similarity index 100%
> rename from healthcheck_templates/r8a7743-iwg20d-q7.yaml
> rename to lava_templates/r8a7743-iwg20d-q7.yaml
> diff --git a/healthcheck_templates/r8a7745-iwg22d-sodimm.yaml
> b/lava_templates/r8a7745-iwg22d-sodimm.yaml
> similarity index 100%
> rename from healthcheck_templates/r8a7745-iwg22d-sodimm.yaml
> rename to lava_templates/r8a7745-iwg22d-sodimm.yaml
> diff --git a/healthcheck_templates/r8a774c0-ek874.yaml
> b/lava_templates/r8a774c0-ek874.yaml
> similarity index 100%
> rename from healthcheck_templates/r8a774c0-ek874.yaml
> rename to lava_templates/r8a774c0-ek874.yaml
> diff --git a/submit_tests.sh b/submit_tests.sh
> index 2911af1..7dff7a2 100755
> --- a/submit_tests.sh
> +++ b/submit_tests.sh
> @@ -29,7 +29,7 @@ set -e
> 
> ##########################################################
> ######################
>  WORK_DIR=`pwd`
>  OUTPUT_DIR="$WORK_DIR/output"
> -TEMPLATE_DIR="/opt/healthcheck_templates"
> +TEMPLATE_DIR="/opt/lava_templates"
> 
> ##########################################################
> ######################
>  AWS_URL_UP="s3://download.cip-project.org/ciptesting/ci"
>  AWS_URL_DOWN="https://s3-us-west-2.amazonaws.com/download.cip-
> project.org/ciptesting/ci"
> diff --git a/test.Dockerfile b/test.Dockerfile
> index 04e2ad9..d15f7a3 100644
> --- a/test.Dockerfile
> +++ b/test.Dockerfile
> @@ -11,8 +11,8 @@ RUN apt-get update \
>  # Install AWS CLI
>  RUN pip3 install awscli
> 
> -# Copy healthcheck templates
> -COPY healthcheck_templates /opt/healthcheck_templates
> +# Copy lava templates
> +COPY lava_templates /opt/lava_templates
> 
>  # Copy test script
>  COPY submit_tests.sh /opt/
> --
> 2.20.1

[cip-dev] [PATCH 1/3] Change templagte directory name

[nobuhiro1.iwamatsu at toshiba.co.jp]

Hi Chris,

> -----Original Message-----
> From: Chris Paterson [mailto:Chris.Paterson2 at renesas.com]
> Sent: Wednesday, August 28, 2019 7:05 PM
> To: iwamatsu nobuhiro(?? ?? ????????)
> <nobuhiro1.iwamatsu@toshiba.co.jp>
> Cc: cip-dev at lists.cip-project.org
> Subject: RE: [PATCH 1/3] Change templagte directory name
> 
> Hello Iwamatsu-san,
> 
> > From: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> > Sent: 28 August 2019 03:26
> >
> > Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> > ---
> >  .../r8a7743-iwg20d-q7.yaml                                    | 0
> >  .../r8a7745-iwg22d-sodimm.yaml                                | 0
> >  {healthcheck_templates => lava_templates}/r8a774c0-ek874.yaml | 0
> >  submit_tests.sh                                               | 2
> +-
> >  test.Dockerfile                                               | 4
> ++--
> >  5 files changed, 3 insertions(+), 3 deletions(-)  rename
> > {healthcheck_templates => lava_templates}/r8a7743-iwg20d- q7.yaml
> > (100%)  rename {healthcheck_templates =>
> > lava_templates}/r8a7745-iwg22d- sodimm.yaml (100%)  rename
> > {healthcheck_templates => lava_templates}/r8a774c0-ek874.yaml
> > (100%)
> 
> Thank you for this patch. Do you think you could create a merge request
> in gitlab[0] so we can do the review there?
> For this patch and the other two in the series.
> 
> [0]
> https://gitlab.com/cip-project/cip-testing/linux-cip-ci/merge_reques
> ts

Ok, I just sent MR via gitlab.

> 
> Kind regards, Chris
> 

Best regards,
  Nobuhiro

[cip-dev] [PATCH 1/3] Change templagte directory name

[Chris Paterson]

> >
> > Thank you for this patch. Do you think you could create a merge request
> > in gitlab[0] so we can do the review there?
> > For this patch and the other two in the series.
> >
> > [0]
> > https://gitlab.com/cip-project/cip-testing/linux-cip-ci/merge_reques
> > ts
> 
> Ok, I just sent MR via gitlab.

Thanks!

Chris

> 
> >
> > Kind regards, Chris
> >
> 
> Best regards,
>   Nobuhiro