jjb/common: remove unused TESTJOBFILE

Individual machines are allowed to have their own LAVA templates, but
they are not used, and completely overwritten by a default template.

Since they are unused, remove them for clarity.

Change-Id: Ib9196ac52dca7ef1891625a98399c70e3027abbb
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

diff --git a/jjb/common/include-agl-run-test-prepare.sh b/jjb/common/include-agl-run-test-prepare.sh
index b861a36..388fb53 100644 (file)
--- a/jjb/common/include-agl-run-test-prepare.sh
+++ b/jjb/common/include-agl-run-test-prepare.sh
@@ -33,7 +33,6 @@ if [ ! -f meta-agl/templates/machine/${MACHINE}/test/hwtest.short.enable ] ; the
   echo "Add meta-agl/templates/machine/${MACHINE}/test/hwtest.enable.short to enable"
 else
   eval export ENVFILE=meta-agl/templates/machine/${MACHINE}/test/hwtest.short.environment
-  eval export TESTJOBFILE=meta-agl/templates/machine/${MACHINE}/test/testjob_short.yaml
 fi
 
 if [ ! -f $ENVFILE ] ; then
@@ -42,12 +41,6 @@ if [ ! -f $ENVFILE ] ; then
   exit 1
 fi
 
-if [ ! -e $TESTJOBFILE ] ; then
-  echo "No short HW test environment file available for ${MACHINE}."
-  echo "Add ${TESTJOBFILE} to enable."
-  exit 1
-fi
-
 # some defaults
 export DEVICE_TYPE=raspberrypi3-uboot
 export DEVICE_NAME=raspberrypi3

diff --git a/jjb/common/include-agl-run-test-short-release.sh b/jjb/common/include-agl-run-test-short-release.sh
index f09dca8..c122876 100644 (file)
--- a/jjb/common/include-agl-run-test-short-release.sh
+++ b/jjb/common/include-agl-run-test-short-release.sh
@@ -11,15 +11,6 @@
 echo "## ${MACHINE} ##"
 cd $REPODIR
 
-echo "## $TESTJOBFILE ##"
-
-if [ -e $TESTJOBFILE ] ; then
-    echo "Using $TESTJOBFILE ..."
-    cp $TESTJOBFILE testjob.yaml
-else
-    echo "!! NO TESTJOBFILE - trying to continue with a default !!"
-fi
-
 cat <<EOF > testjob.yaml
 # Your first LAVA JOB definition for a $MACHINE board
 device_type: @REPLACE_DEVICE_TYPE@

diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh
index 6897fde..28a4048 100644 (file)
--- a/jjb/common/include-agl-run-test-short.sh
+++ b/jjb/common/include-agl-run-test-short.sh
@@ -11,15 +11,6 @@ set -x
 echo "## ${MACHINE} ##"
 cd $REPODIR
 
-echo "## $TESTJOBFILE ##"
-
-if [ -e $TESTJOBFILE ] ; then
-    echo "Using $TESTJOBFILE ..."
-    cp $TESTJOBFILE testjob.yaml
-else
-    echo "!! NO TESTJOBFILE - trying to continue with a default !!"
-fi
-
 cat <<EOF > testjob.yaml
 # Your first LAVA JOB definition for a $MACHINE board
 device_type: @REPLACE_DEVICE_TYPE@