diff options
| author |   Kevin Hilman <khilman@baylibre.com> | 2017-07-13 03:40:08 +0000 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2017-07-13 03:40:12 +0000 |
| commit | 7e38e9d5b44a5304f214df4f171ef8adf5d94796 (patch) | |
| tree | f964d0405b6629cd7fb830f61334846302fd3a88 | |
| parent | 33386624e01e460de7c69ca91e05a8c237f653d4 (diff) | |
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>
| -rw-r--r-- | jjb/common/include-agl-run-test-prepare.sh | 7 | ||||
| -rw-r--r-- | jjb/common/include-agl-run-test-short-release.sh | 9 | ||||
| -rw-r--r-- | jjb/common/include-agl-run-test-short.sh | 9 |
3 files changed, 0 insertions, 25 deletions
diff --git a/jjb/common/include-agl-run-test-prepare.sh b/jjb/common/include-agl-run-test-prepare.sh index b861a360..388fb535 100644 --- 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 f09dca8c..c1228764 100644 --- 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 6897fde5..28a40480 100644 --- 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@ |