[isar-cip-core,v1,3/3] tests: Modify the replacable strings and increase timeouts in the templates

Commit Message

[e-mail] June 17, 2024, 6:21 p.m. UTC

From: sai ashrith sathujoda <[e-mail]>

Signed-off-by: sai ashrith sathujoda <[e-mail]>
---
 tests/templates/IEC_template.yml        | 16 ++++++++--------
 tests/templates/secureboot_template.yml | 14 +++++++-------
 tests/templates/swupdate_template.yml   | 18 +++++++++---------
 3 files changed, 24 insertions(+), 24 deletions(-)

Patch

diff --git a/tests/templates/IEC_template.yml b/tests/templates/IEC_template.yml
index c8bdd41..092af45 100644
--- a/tests/templates/IEC_template.yml
+++ b/tests/templates/IEC_template.yml
@@ -1,10 +1,10 @@ 
 device_type: qemu
-job_name: qemu #architecture# IEC layer testing
+job_name: #architecture# IEC layer testing
 timeouts:
   job:
-    minutes: 30
+    minutes: 50
   action:
-   minutes: 20
+   minutes: 40
   actions:
     power-off:
       seconds: 60
@@ -30,14 +30,14 @@  actions:
 # DEPLOY BLOCK
 - deploy:
     timeout:
-      minutes: 15
+      minutes: 30
     to: tmpfs
     images:
       system:
         image_arg: '-drive file={system},discard=unmap,if=none,id=disk,format=raw -m 1G -serial mon:stdio -smp 4
                     -nographic -netdev user,id=net,hostfwd=tcp:127.0.0.1:22222-:22 -chardev socket,id=chrtpm,path=/tmp/qemu-swtpm.sock
                     -tpmdev emulator,id=tpm0,chardev=chrtpm #imageargs#'
-        url: #project_url#/#branch#/qemu-#architecture#/cip-core-image-security-cip-core-#distribution#-qemu-#architecture#.wic.xz
+        url: #project_url#/#branch#/#architecture#/cip-core-image-security-cip-core-#distribution#-#architecture#.wic.xz
         compression: xz
 
       #Firmware#
@@ -47,7 +47,7 @@  actions:
 # BOOT BLOCK
 - boot:
     timeout:
-      minutes: 15
+      minutes: 25
     method: qemu
     media: tmpfs
     prompts: ["root@demo:~#"]
@@ -60,7 +60,7 @@  actions:
 # TEST_BLOCK
 - test:
      timeout:
-       minutes: 30
+       minutes: 40
      definitions:
      - repository: https://gitlab.com/cip-project/cip-testing/cip-security-tests.git
        from: git
@@ -69,6 +69,6 @@  actions:
        name: Security-Testcases
 
 context:
-  arch: #architecture#
+  arch: #context-architecture#
   guestfs_interface: virtio
   lava_test_results_dir: '/home/lava-%s'
diff --git a/tests/templates/secureboot_template.yml b/tests/templates/secureboot_template.yml
index 5996dbd..1b8e882 100644
--- a/tests/templates/secureboot_template.yml
+++ b/tests/templates/secureboot_template.yml
@@ -1,10 +1,10 @@ 
 device_type: qemu
-job_name: qemu #architecture# secure boot testing
+job_name: #architecture# secure boot testing
 timeouts:
   job:
-    minutes: 30
+    minutes: 50
   action:
-   minutes: 20
+   minutes: 40
   actions:
     power-off:
       seconds: 60
@@ -30,14 +30,14 @@  actions:
 # DEPLOY BLOCK
 - deploy:
     timeout:
-      minutes: 15
+      minutes: 30
     to: tmpfs
     images:
       system:
         image_arg: '-drive file={system},discard=unmap,if=none,id=disk,format=raw -m 1G -serial mon:stdio -smp 4
                     -nographic -netdev user,id=net,hostfwd=tcp:127.0.0.1:22222-:22 -chardev socket,id=chrtpm,path=/tmp/qemu-swtpm.sock
                     -tpmdev emulator,id=tpm0,chardev=chrtpm #imageargs#'
-        url: #project_url#/#branch#/qemu-#architecture#/cip-core-image-security-cip-core-#distribution#-qemu-#architecture#.wic.xz
+        url: #project_url#/#branch#/#architecture#/cip-core-image-security-cip-core-#distribution#-#architecture#.wic.xz
         compression: xz
 
       #Firmware#
@@ -47,7 +47,7 @@  actions:
 # BOOT BLOCK
 - boot:
     timeout:
-      minutes: 15
+      minutes: 25
     method: qemu
     media: tmpfs
     prompts: ["root@demo:~#"]
@@ -60,6 +60,6 @@  actions:
       kernel-start-message: "EFI stub: UEFI Secure Boot is enabled."
 
 context:
-  arch: #architecture#
+  arch: #context-architecture#
   guestfs_interface: virtio
   lava_test_results_dir: '/home/lava-%s'
diff --git a/tests/templates/swupdate_template.yml b/tests/templates/swupdate_template.yml
index d012ed4..bf6777c 100644
--- a/tests/templates/swupdate_template.yml
+++ b/tests/templates/swupdate_template.yml
@@ -1,10 +1,10 @@ 
 device_type: qemu
-job_name: qemu #architecture# software update testing
+job_name: #architecture# software update testing
 timeouts:
   job:
-    minutes: 30
+    minutes: 50
   action:
-   minutes: 20
+   minutes: 40
   actions:
     power-off:
       seconds: 60
@@ -30,14 +30,14 @@  actions:
 # DEPLOY BLOCK
 - deploy:
     timeout:
-      minutes: 15
+      minutes: 30
     to: tmpfs
     images:
       system:
         image_arg: '-drive file={system},discard=unmap,if=none,id=disk,format=raw -m 1G -serial mon:stdio -smp 4
                     -nographic -netdev user,id=net,hostfwd=tcp:127.0.0.1:22222-:22 -chardev socket,id=chrtpm,path=/tmp/qemu-swtpm.sock
                     -tpmdev emulator,id=tpm0,chardev=chrtpm #imageargs#'
-        url: #project_url#/#branch#/qemu-#architecture#/cip-core-image-security-cip-core-#distribution#-qemu-#architecture#.wic.xz
+        url: #project_url#/#branch#/#architecture#/cip-core-image-security-cip-core-#distribution#-#architecture#.wic.xz
         compression: xz
 
       #Firmware#
@@ -47,7 +47,7 @@  actions:
 # BOOT BLOCK
 - boot:
     timeout:
-      minutes: 15
+      minutes: 25
     method: qemu
     media: tmpfs
     prompts: ["root@demo:~#"]
@@ -61,7 +61,7 @@  actions:
 # Sleep 200s is added to make the job incomplete with a timeout if software update application failed
 - test:
     timeout:
-      minutes: 5
+      minutes: 15
     definitions:
     - repository:
         metadata:
@@ -70,7 +70,7 @@  actions:
           description: "Test software update"
         run:
           steps:
-            - if swupdate -d "-u #project_url#/#branch#/qemu-#architecture#/cip-core-image-security-cip-core-#distribution#-qemu-#architecture#.swu"; then echo software update is successful!!; else sleep 200s; fi
+            - if swupdate -d "-u #project_url#/#branch#/#architecture#/cip-core-image-security-cip-core-#distribution#-#architecture#.swu"; then echo software update is successful!!; else sleep 200s; fi
       from: inline
       name: sample-test-1
       path: inline/sample-test.yaml
@@ -120,6 +120,6 @@  actions:
       path: inline/sample-test.yaml
 
 context:
-  arch: #architecture#
+  arch: #context-architecture#
   guestfs_interface: virtio
   lava_test_results_dir: '/home/lava-%s'