From 94c6dd2df2bb0915af54f64794aa4aa1260575f2 Mon Sep 17 00:00:00 2001
From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Thu, 7 Dec 2017 20:06:27 +0000
Subject: Revert "jjb/common: remove hwtest.enable files"

Issues with the jobs.

This reverts commit f28a1005057b096a95ba73bc3bf3e029b835deaa.

Change-Id: Icf75e5b462b0d4aff3c8d2c5806b8ca9270ad22b
---
 jjb/common/include-agl-run-test-short.sh | 152 ++++++++++++++++++++++++++-----
 1 file changed, 131 insertions(+), 21 deletions(-)

(limited to 'jjb/common/include-agl-run-test-short.sh')

diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh
index 58273b99..deeaf3c5 100644
--- a/jjb/common/include-agl-run-test-short.sh
+++ b/jjb/common/include-agl-run-test-short.sh
@@ -10,27 +10,137 @@ set -x
 echo "## ${MACHINE} ##"
 cd $REPODIR
 
+# WIP: use $RELENG for subset of boards
 __MACHINE=${MACHINE%-nogfx} # releng doesn't care
-echo "# LAVA lab target: ${LAVA_LAB} #"
-# releng-scripts depends on jinja2 >= 2.9
-echo "## Check version of python-jinja2: "
-pip show jinja2
-CREATE_ARGS=""
-CREATE_ARGS+="--machine ${releng_device} "
-CREATE_ARGS+="--url ci "
-[[ ! -z $GERRIT_CHANGE_NUMBER ]] && CREATE_ARGS+="--changeid $GERRIT_CHANGE_NUMBER "
-[[ ! -z $GERRIT_PATCHSET_NUMBER ]] && CREATE_ARGS+="--patchset $GERRIT_PATCHSET_NUMBER "
-BUILD_VERSION="AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER"
-[[ -e output/repo-manifest-r.txt.sha1 ]] && BUILD_VERSION+="-$(cat output/repo-manifest-r.txt.sha1)"
-CREATE_ARGS+="--name AGL-gerrit "
-CREATE_ARGS+="--build-version $BUILD_VERSION "
-CREATE_ARGS+="--callback-from ${LAVA_LAB} "
-CREATE_ARGS+="--test all"
-$RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml
-
-if [ $? != 0 ]; then
-    echo "ERROR: Machine ${$__MACHINE}: LAVA job creation failed."
-    exit 0
-else
+if [ ! -z $RELENG ]; then
+    echo "# LAVA lab target: ${LAVA_LAB} #"
+    # releng-scripts depends on jinja2 >= 2.9
+    echo "## Check version of python-jinja2: "
+    pip show jinja2
+    CREATE_ARGS=""
+    CREATE_ARGS+="--machine ${releng_device} "
+    CREATE_ARGS+="--url ci "
+    [[ ! -z $GERRIT_CHANGE_NUMBER ]] && CREATE_ARGS+="--changeid $GERRIT_CHANGE_NUMBER "
+    [[ ! -z $GERRIT_PATCHSET_NUMBER ]] && CREATE_ARGS+="--patchset $GERRIT_PATCHSET_NUMBER "
+    BUILD_VERSION="AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER"
+    [[ -e output/repo-manifest-r.txt.sha1 ]] && BUILD_VERSION+="-$(cat output/repo-manifest-r.txt.sha1)"
+    CREATE_ARGS+="--name AGL-gerrit "
+    CREATE_ARGS+="--build-version $BUILD_VERSION "
+    CREATE_ARGS+="--callback-from ${LAVA_LAB} "
+    CREATE_ARGS+="--test all"
+    $RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml
     cat testjob.yaml
+else
+
+cat <<EOF > testjob.yaml
+# Your first LAVA JOB definition for a $MACHINE board
+device_type: @REPLACE_DEVICE_TYPE@
+job_name: AGL-short-smoke
+
+timeouts:
+  job:
+    minutes: 30
+  action:
+    minutes: 15
+  connection:
+    minutes: 5
+priority: medium
+visibility: public
+EOF
+
+if [ ${DEVICE_BOOT_METHOD} = "u-boot" ]; then
+cat <<EOF >> testjob.yaml
+
+protocols:
+  lava-xnbd:
+    port: auto
+
+# ACTION_BLOCK
+actions:
+- deploy:
+    timeout:
+      minutes: 15
+    to: nbd
+    dtb:
+      url: '@REPLACE_URL_PREFIX@/@REPLACE_DTB@'
+    kernel:
+      url: '@REPLACE_URL_PREFIX@/@REPLACE_KERNEL@'
+    initrd:
+      url: '@REPLACE_URL_PREFIX@/@REPLACE_INITRAMFS@'
+      allow_modify: false
+    nbdroot:
+      url: '@REPLACE_URL_PREFIX@/@REPLACE_NBDROOT@'
+      compression: @REPLACE_NBDROOT_COMPRESSION@
+    os: debian
+    failure_retry: 2
+
+# BOOT_BLOCK
+- boot:
+    timeout:
+      minutes: 10
+    method: @REPLACE_BOOT_METHOD@
+    commands: nbd
+    type: @REPLACE_BOOT_TYPE@
+    prompts: ["root@@REPLACE_MACHINE@:~"]
+    auto_login:
+      login_prompt: "login:"
+      username: root
+
+EOF
+fi
+
+if [ ${DEVICE_BOOT_METHOD} = "qemu" ]; then
+cat <<EOF >>testjob.yaml
+context:
+  no_kvm: false
+  arch: @REPLACE_DEVICE_ARCH@
+  extra_options: [@REPLACE_QEMU_ARGS@]
+ 
+actions:
+- deploy:
+    timeout:
+      minutes: 15
+    to: tmpfs
+    os: oe
+    images:
+        kernel:
+          image_arg: '-kernel {kernel} -append @REPLACE_KERNEL_CMDLINE@'
+          url: '@REPLACE_URL_PREFIX@/@REPLACE_KERNEL@'
+        ramdisk:
+          image_arg: '-drive format=raw,file={ramdisk}'
+          url: '@REPLACE_URL_PREFIX@/@REPLACE_INITRAMFS@'
+          compression: @REPLACE_INITRAMFS_COMPRESSION@
+
+- boot:
+    timeout:
+      minutes: 10
+    method: @REPLACE_BOOT_METHOD@
+    media: tmpfs
+    prompts: ["root@@REPLACE_MACHINE@:~"]
+    auto_login:
+      login_prompt: "login:"
+      username: root
+
+EOF
+fi
+
+CHID=${GERRIT_CHANGE_NUMBER}/${GERRIT_PATCHSET_NUMBER}/${MACHINE}
+# REPLACE_DEVICE_TYPE
+sed -i -e "s#@REPLACE_DEVICE_ARCH@#${DEVICE_ARCH}#g" testjob.yaml
+sed -i -e "s#@REPLACE_DEVICE_TYPE@#${DEVICE_TYPE}#g" testjob.yaml
+sed -i -e "s#@REPLACE_DTB@#${CHID}/${DEVICE_DTB}#g" testjob.yaml
+sed -i -e "s#@REPLACE_KERNEL@#${CHID}/${DEVICE_KERNEL}#g" testjob.yaml
+sed -i -e "s#@REPLACE_INITRAMFS@#${CHID}/${DEVICE_INITRAMFS}#g" testjob.yaml
+sed -i -e "s#@REPLACE_INITRAMFS_COMPRESSION@#${DEVICE_INITRAMFS_COMPRESSION}#g" testjob.yaml
+sed -i -e "s#@REPLACE_NBDROOT@#${CHID}/${DEVICE_NBDROOT}#g" testjob.yaml
+sed -i -e "s#@REPLACE_NBDROOT_COMPRESSION@#${DEVICE_NBDROOT_COMPRESSION}#g" testjob.yaml
+sed -i -e "s#@REPLACE_BOOT_METHOD@#${DEVICE_BOOT_METHOD}#g" testjob.yaml
+sed -i -e "s#@REPLACE_BOOT_TYPE@#${DEVICE_BOOT_TYPE}#g" testjob.yaml
+sed -i -e "s#@REPLACE_MACHINE@#${DEVICE_NAME}#g" testjob.yaml
+sed -i -e "s#@REPLACE_URL_PREFIX@#${DEVICE_URL_PREFIX}#g" testjob.yaml
+sed -i -e "s#@REPLACE_QEMU_ARGS@#${DEVICE_QEMU_ARGS}#g" testjob.yaml
+sed -i -e "s#@REPLACE_KERNEL_CMDLINE@#${DEVICE_KERNEL_CMDLINE}#g" testjob.yaml
+
+cat testjob.yaml
+
 fi
-- 
cgit 1.2.3-korg