Change fallback template and test for jobfile

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

diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh
index 0e38272..cfe2515 100644 (file)
--- a/jjb/common/include-agl-run-test-short.sh
+++ b/jjb/common/include-agl-run-test-short.sh
@@ -27,10 +27,11 @@ rm ~/.local/token
 
 echo "## $TESTJOBFILE ##"
 
-if [ -n $TESTJOBFILE -a -e $TESTJOBFILE ] ; then
-   cp $TESTJOBFILE testjob.yaml
+if [ -e $TESTJOBFILE ] ; then
+    echo "Using $TESTJOBFILE ..."
+    cp $TESTJOBFILE testjob.yaml
 else
-echo "!! NO TESTJOBFILE - trying to continue with a default !!"
+    echo "!! NO TESTJOBFILE - trying to continue with a default !!"
 fi
 
 cat <<EOF > testjob.yaml
@@ -62,7 +63,7 @@ actions:
       url: '@REPLACE_URL_PREFIX@/@REPLACE_DTB@'
     kernel:
       url: '@REPLACE_URL_PREFIX@/@REPLACE_KERNEL@'
-    initramfs:
+    initrd:
       url: '@REPLACE_URL_PREFIX@/@REPLACE_INITRAMFS@'
       allow_modify: false
     nbdroot: