Lots of small fixes and improvements to the test infra.

Change-Id: I437d7d159ec667cf630c872ed19944f4a0d561e2
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

1 files changed, 59 insertions, 12 deletions

diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh
index b22f6a88..f3ce7400 100644
--- a/packer/provision/agl_dependencies.sh
+++ b/packer/provision/agl_dependencies.sh
@@ -55,6 +55,8 @@ git clone http://git.linaro.org/people/riku.voipio/lava-boot.git
 cd lava-boot
 sed -i '16iimport ssl' lava-boot
 sed -i '17issl._create_default_https_context = ssl._create_unverified_context' lava-boot
+sed -i -e 's#"~/.lava.yaml"#"/opt/AGL/lava-agl/lava.yaml"#' lava-boot
+
 
 # AGL specific lab integration. To be moved into git repo and cloned or the like.
 #################################################################################
@@ -132,9 +134,9 @@ cat <<EOFPORTERUPLOADYAML > /opt/AGL/lava-agl/porter_nbd_upload.yaml
 actions:
     - command: deploy_linaro_kernel
       parameters:
-          kernel: 'http://localhost/porter/upload/uImage+dtb'
-          nbdroot: 'http://localhost/porter/upload/agl-demo-platform-porter.ext4'
-          ramdisk: 'http://localhost/porter/upload/initramfs-netboot-image-porter.ext4.gz.u-boot'
+          kernel: 'http://localhost/porter/upload/\${KERNELIMAGE}'
+          nbdroot: 'http://localhost/porter/upload/\${ROOTFSTOBOOT}'
+          ramdisk: 'http://localhost/porter/upload/\${NETBOOTIMAGE}'
           login_prompt: 'porter login:'
           username: 'root'
     - command: boot_linaro_image
@@ -156,9 +158,9 @@ cat <<EOFPORTERUPLOADYAML1 > /opt/AGL/lava-agl/porter_nbd_upload_stress.yaml
 actions:
     - command: deploy_linaro_kernel
       parameters:
-          kernel: 'http://localhost/porter/upload/uImage+dtb'
-          nbdroot: 'http://localhost/porter/upload/agl-demo-platform-porter.ext4'
-          ramdisk: 'http://localhost/porter/upload/initramfs-netboot-image-porter.ext4.gz.u-boot'
+          kernel: 'http://localhost/porter/upload/\${KERNELIMAGE}'
+          nbdroot: 'http://localhost/porter/upload/\${ROOTFSTOBOOT}'
+          ramdisk: 'http://localhost/porter/upload/\${NETBOOTIMAGE}'
           login_prompt: 'porter login:'
           username: 'root'
     - command: boot_linaro_image
@@ -167,7 +169,7 @@ actions:
     - command: lava_command_run
       parameters:
           commands:
-              - "export NR=`grep processor /proc/cpuinfo | wc -l` ; stress -v -t 120 -c \$NR -m \$NR -i \$NR "
+              - "stress -v -t 120 -c 1 -m 1 -i 1 "
           timeout: 300
 device_type: 'renesas-porter'
 logging_level: INFO
@@ -176,6 +178,25 @@ timeout: 22600
 
 EOFPORTERUPLOADYAML1
 
+cat <<EOFPORTERUPLOADYAML1 > /opt/AGL/lava-agl/porter_nbd_upload_simple.yaml
+actions:
+    - command: deploy_linaro_kernel
+      parameters:
+          kernel: 'http://localhost/porter/upload/\${KERNELIMAGE}'
+          nbdroot: 'http://localhost/porter/upload/\${ROOTFSTOBOOT}'
+          ramdisk: 'http://localhost/porter/upload/\${NETBOOTIMAGE}'
+          login_prompt: 'porter login:'
+          username: 'root'
+    - command: boot_linaro_image
+      parameters:
+          test_image_prompt: 'root@porter:~#'
+device_type: 'renesas-porter'
+logging_level: INFO
+job_name: '\${JOB_NAME}'
+timeout: 22600
+
+EOFPORTERUPLOADYAML1
+
 cat <<EOFPORTERSNAPYAML > /opt/AGL/lava-agl/porter_nbd_snapshot.yaml
 actions:
     - command: deploy_linaro_kernel
@@ -211,11 +232,24 @@ actions:
     - command: boot_linaro_image
       parameters:
           test_image_prompt: 'root@porter:~#'
-    - command: lava_command_run
+device_type: 'renesas-porter'
+logging_level: INFO
+job_name: '\${JOB_NAME}'
+timeout: 22600
+EOFPORTERSNAPYAML1
+
+cat <<EOFPORTERSNAPYAML1 > /opt/AGL/lava-agl/porter_nbd_snapshot_simple.yaml
+actions:
+    - command: deploy_linaro_kernel
       parameters:
-          commands:
-              - "export NR=`grep processor /proc/cpuinfo | wc -l` ; stress -v -t 120 -c \$NR -m \$NR -i \$NR "
-          timeout: 300
+          kernel: 'https://download.automotivelinux.org/AGL/snapshots/master/latest/porter-nogfx/deploy/images/porter/uImage+dtb'
+          nbdroot: 'https://download.automotivelinux.org/AGL/snapshots/master/latest/porter-nogfx/deploy/images/porter/core-image-minimal-porter.ext4'
+          ramdisk: 'https://download.automotivelinux.org/AGL/snapshots/master/latest/porter-nogfx/deploy/images/porter/initramfs-netboot-image-porter.ext4.gz.u-boot'
+          login_prompt: 'porter login:'
+          username: 'root'
+    - command: boot_linaro_image
+      parameters:
+          test_image_prompt: 'root@porter:~#'
 device_type: 'renesas-porter'
 logging_level: INFO
 job_name: '\${JOB_NAME}'
@@ -229,13 +263,26 @@ cat <<EOFUPLOAD > /opt/AGL/lava-agl/upload4lava.sh
 
 if test x"" != x"\$1"; then
 Y=\$(echo "\$1" | sed -e "s#\.\.##g" -e "s#/##g")
-curl -T "\$Y" https://porter.automotivelinux.org/porter/upload/jta/\$Y --insecure
+curl -T "\$Y" https://porter.automotivelinux.org/porter/upload/\$Y --insecure
 else
 echo "Help: \$0 file"
 fi
 
 EOFUPLOAD
 
+cat <<EOFDELETE > /opt/AGL/lava-agl/delete4lava.sh
+#!/bin/bash
+#set -x
+
+if test x"" != x"\$1"; then
+Y=\$(echo "\$1" | sed -e "s#\.\.##g" -e "s#/##g")
+curl -X DELETE https://porter.automotivelinux.org/porter/upload/\$Y --insecure
+else
+echo "Help: \$0 file"
+fi
+
+EOFDELETE
+
 cat <<EOFDEPLOY > /opt/AGL/lava-agl/deploy.sh
 #!/bin/bash
 #set -x