LAVA-1118 - Test shell portability

Part of this story involves moving dependency installation from
install: deps to the lava-test-shell itself.

Change-Id: I2ac880994758e8069c05e116c69fd4f05115e5b6

15 files changed, 32 insertions, 179 deletions

diff --git a/lava-test-shell/android/get-adb-serial-hikey.yaml b/lava-test-shell/android/get-adb-serial-hikey.yaml
index efa9f33..77ae524 100644
--- a/lava-test-shell/android/get-adb-serial-hikey.yaml
+++ b/lava-test-shell/android/get-adb-serial-hikey.yaml
@@ -11,13 +11,10 @@ metadata:
     scope:
         - functional
 
-install:
-    deps:
-        - android-tools-adb
-        - android-tools-fastboot
-
 run:
     steps:
+        - apt-get update -q
+        - DEBIAN_FRONTEND=noninteractive lava-test-case install-base --shell apt-get -q -y install -o Dpkg::Options::="--force-confold" android-tools-adb android-tools-fastboot
         - adb start-server
         - adb wait-for-device
         - lava-test-case adb-serial --shell "./lava-test-shell/android/scripts/get-adb-serial.sh"
diff --git a/lava-test-shell/android/get-adb-serial-jessie.yaml b/lava-test-shell/android/get-adb-serial-jessie.yaml
index b2c6a3f..57c91d3 100644
--- a/lava-test-shell/android/get-adb-serial-jessie.yaml
+++ b/lava-test-shell/android/get-adb-serial-jessie.yaml
@@ -11,11 +11,8 @@ metadata:
     scope:
         - functional
 
-install:
-    deps:
-        - android-tools-adb
-        - android-tools-fastboot
-
 run:
     steps:
+        - apt-get update -q
+        - DEBIAN_FRONTEND=noninteractive lava-test-case install-base --shell apt-get -q -y install -o Dpkg::Options::="--force-confold" android-tools-adb android-tools-fastboot
         - lava-test-case adb-serial --shell "./lava-test-shell/android/scripts/get-adb-serial.sh"
diff --git a/lava-test-shell/android/get-adb-serial.yaml b/lava-test-shell/android/get-adb-serial.yaml
index 95536c9..498b800 100644
--- a/lava-test-shell/android/get-adb-serial.yaml
+++ b/lava-test-shell/android/get-adb-serial.yaml
@@ -11,13 +11,8 @@ metadata:
     scope:
         - functional
 
-install:
-    deps:
-        - adb
-        - fastboot
-        - android-tools-adb
-        - android-tools-fastboot
-
 run:
     steps:
+        - apt-get update -q
+        - DEBIAN_FRONTEND=noninteractive lava-test-case install-base --shell apt-get -q -y install -o Dpkg::Options::="--force-confold" adb fastboot android-tools-adb android-tools-fastboot
         - lava-test-case adb-serial --shell "./lava-test-shell/android/scripts/get-adb-serial.sh"
diff --git a/lava-test-shell/multi-node/multinode03.yaml b/lava-test-shell/multi-node/multinode03.yaml
index c1d0822..d9c5db5 100644
--- a/lava-test-shell/multi-node/multinode03.yaml
+++ b/lava-test-shell/multi-node/multinode03.yaml
@@ -15,15 +15,6 @@ metadata:
         - beaglebone-black
         - beagle-xm
 
-install:
-    deps:
-        - curl
-        - realpath
-        - lsb-release
-        - usbutils
-        - wget
-        - ntpdate
-
 # Dropped 'get_ip' and 'check_ip' as these are not able to keep up with
 # changes in the output of the relevant commands. Custom scripts are
 # needed which understand the tools within the target image.
@@ -33,6 +24,8 @@ install:
 
 run:
     steps:
+        - apt-get update -q
+        - DEBIAN_FRONTEND=noninteractive lava-test-case install-base --shell apt-get -q -y install -o Dpkg::Options::="--force-confold" curl realpath lsb-release usbutils wget ntpdate
         - lava-test-case multinode-role-output --shell lava-role
         - lava-sync running
         - lava-send sending source=$(lava-self) role=$(lava-role) hostname=$(hostname -f) kernver=$(uname -r) kernhost=$(uname -n)
diff --git a/lava-test-shell/params/skip_install.yaml b/lava-test-shell/params/skip_install.yaml
index c2673a7..70bf01e 100644
--- a/lava-test-shell/params/skip_install.yaml
+++ b/lava-test-shell/params/skip_install.yaml
@@ -11,8 +11,6 @@ metadata:
         - kvm
 
 install:
-    deps:
-        - wget
     git-repos:
         - git://git.linaro.org/tools/pm-qa.git
     steps:
@@ -23,4 +21,6 @@ params:
 
 run:
     steps:
+        - apt-get update -q
+        - DEBIAN_FRONTEND=noninteractive lava-test-case install-base --shell apt-get -q -y install -o Dpkg::Options::="--force-confold" wget
         - lava-test-case skip_install_$SKIPNAME-test --result pass
diff --git a/lava-test-shell/single-node/singlenode02.yaml b/lava-test-shell/single-node/singlenode02.yaml
index 711ef68..41f619c 100644
--- a/lava-test-shell/single-node/singlenode02.yaml
+++ b/lava-test-shell/single-node/singlenode02.yaml
@@ -14,14 +14,10 @@ metadata:
         - panda
         - beaglebone-black
 
-install:
-    deps:
-       - net-tools
-       - iputils-ping
-       - lsb-release
-
 run:
     steps:
+        - apt-get update -q
+        - DEBIAN_FRONTEND=noninteractive lava-test-case install-base --shell apt-get -q -y install -o Dpkg::Options::="--force-confold" lsb-release net-tools iputils-ping
         - lava-test-case linux-linaro-ubuntu-netstat --shell netstat -an
         - lava-test-case linux-linaro-ubuntu-ifconfig-dump --shell ifconfig -a
         - lava-test-case linux-linaro-ubuntu-route-dump-a --shell route
diff --git a/lava-test-shell/single-node/singlenode03.yaml b/lava-test-shell/single-node/singlenode03.yaml
index 1a9766a..39cc37a 100644
--- a/lava-test-shell/single-node/singlenode03.yaml
+++ b/lava-test-shell/single-node/singlenode03.yaml
@@ -14,15 +14,10 @@ metadata:
         - panda
         - beaglebone-black
 
-install:
-    deps:
-        - curl
-        - lsb-release
-        - usbutils
-        - net-tools
-        - iputils-ping
 run:
     steps:
+        - apt-get update -q
+        - DEBIAN_FRONTEND=noninteractive lava-test-case install-base --shell apt-get -q -y install -o Dpkg::Options::="--force-confold" curl lsb-release usbutils net-tools iputils-ping
         - lava-test-case linux-linaro-ubuntu-netstat --shell netstat -an
         - lava-test-case linux-linaro-ubuntu-ifconfig-dump --shell ifconfig -a
         - lava-test-case linux-linaro-ubuntu-route-dump-a --shell route
diff --git a/unit-tests/lava/dispatcher-branch-unit-tests.yaml b/unit-tests/lava/dispatcher-branch-unit-tests.yaml
index 62ce2df..64d194c 100644
--- a/unit-tests/lava/dispatcher-branch-unit-tests.yaml
+++ b/unit-tests/lava/dispatcher-branch-unit-tests.yaml
@@ -17,23 +17,6 @@ metadata:
 # Check the mem_cpu option in the kvm.conf device_type.
 
 install:
-    deps:
-        - git
-        - bc
-        - pep8
-        - python-lzma
-        - python-serial
-        - python-configglue
-        - python-pexpect
-        - lava-tool
-        - telnet
-        - python-netifaces
-        - python-requests
-        - python-testscenarios
-        - pylint
-        - u-boot-tools
-        - nfs-kernel-server
-        - tftpd-hpa
     git-repos:
         - git://git.linaro.org/lava/lava-dispatcher.git
 
@@ -42,6 +25,8 @@ params:
 
 run:
     steps:
+        - apt-get update -q
+        - DEBIAN_FRONTEND=noninteractive lava-test-case install-base --shell apt-get -q -y install -o Dpkg::Options::="--force-confold" git bc pep8 python-lzma python-serial python-configglue python-pexpect lava-tool telnet python-netifaces python-testscenarios pylint u-boot-tools nfs-kernel-server tftpd-hpa
         - modprobe loop || true
         - cd lava-dispatcher
         - git log -n1
diff --git a/unit-tests/lava/dispatcher-master-coverage.yaml b/unit-tests/lava/dispatcher-master-coverage.yaml
index 42ad44b..bd0ce7a 100644
--- a/unit-tests/lava/dispatcher-master-coverage.yaml
+++ b/unit-tests/lava/dispatcher-master-coverage.yaml
@@ -16,26 +16,13 @@ metadata:
 # Check the mem_cpu option in the kvm.conf device_type.
 
 install:
-    deps:
-        - git
-        - pep8
-        - python-lzma
-        - python-serial
-        - python-configglue
-        - python-pexpect
-        - lava-tool
-        - python-requests
-        - python-testscenarios
-        - python-setuptools
-        - python-coverage
-        - pylint
-        - u-boot-tools
-        - nfs-kernel-server
     git-repos:
         - git://git.linaro.org/lava/lava-dispatcher.git
 
 run:
     steps:
+        - apt-get update -q
+        - DEBIAN_FRONTEND=noninteractive lava-test-case install-base --shell apt-get -q -y install -o Dpkg::Options::="--force-confold" git pep8 python-lzma python-serial python-configglue python-pexpect lava-tool python-requests python-testscenarios python-setuptools python-coverage pylint u-boot-tools nfs-kernel-server
         - cd lava-dispatcher
         - git log -n1
         - ../lava/version-wrapper.py
diff --git a/unit-tests/lava/dispatcher-master-unit-tests.yaml b/unit-tests/lava/dispatcher-master-unit-tests.yaml
index a635cee..4c31d97 100644
--- a/unit-tests/lava/dispatcher-master-unit-tests.yaml
+++ b/unit-tests/lava/dispatcher-master-unit-tests.yaml
@@ -17,35 +17,14 @@ metadata:
 # Check the mem_cpu option in the kvm.conf device_type.
 
 install:
-    deps:
-        - git
-        - bc
-        - pep8
-        - python-lzma
-        - python-serial
-        - python-configglue
-        - python-pexpect
-        - lava-tool
-        - telnet
-        - python-netifaces
-        - python-requests
-        - python-testscenarios
-        - pylint
-        - u-boot-tools
-        - nfs-kernel-server
-        - tftpd-hpa
-        - qemu-system-x86
-        - python-nose
-        - python-zmq
-        - python-configobj
-        - android-tools-adb
-        - android-tools-fastboot
     git-repos:
         - git://git.linaro.org/lava/lava-dispatcher.git
 
 
 run:
     steps:
+        - apt-get update -q
+        - DEBIAN_FRONTEND=noninteractive lava-test-case install-base --shell apt-get -q -y install -o Dpkg::Options::="--force-confold" git bc pep8 python-lzma python-serial python-configglue python-pexpect lava-tool telnet python-netifaces python-requests python-testscenarios pylint u-boot-tools nfs-kernel-server tftpd-hpa qemu-system-x86 python-nose python-zmq python-configobj android-tools-adb android-tools-fastboot
         - modprobe loop || true
         - cd lava-dispatcher
         - git log -n1
diff --git a/unit-tests/lava/dispatcher-release-unit-tests.yaml b/unit-tests/lava/dispatcher-release-unit-tests.yaml
index 4ae0c94..bfc9039 100644
--- a/unit-tests/lava/dispatcher-release-unit-tests.yaml
+++ b/unit-tests/lava/dispatcher-release-unit-tests.yaml
@@ -17,34 +17,14 @@ metadata:
 # Check the mem_cpu option in the kvm.conf device_type.
 
 install:
-    deps:
-        - git
-        - bc
-        - pep8
-        - python-lzma
-        - python-serial
-        - python-configglue
-        - python-pexpect
-        - lava-tool
-        - telnet
-        - python-netifaces
-        - python-requests
-        - python-testscenarios
-        - pylint
-        - u-boot-tools
-        - nfs-kernel-server
-        - tftpd-hpa
-        - qemu-system-x86
-        - python-nose
-        - python-zmq
-        - android-tools-adb
-        - android-tools-fastboot
     git-repos:
         - git://git.linaro.org/lava/lava-dispatcher.git
 
 
 run:
     steps:
+        - apt-get update -q
+        - DEBIAN_FRONTEND=noninteractive lava-test-case install-base --shell apt-get -q -y install -o Dpkg::Options::="--force-confold" git bc pep8 python-lzma python-serial python-configglue python-pexpect lava-tool telnet python-netifaces python-testscenarios pylint u-boot-tools nfs-kernel-server tftpd-hpa qemu-system-x86 python-nose python-zmq android-tools-adb android-tools-fastboot
         - modprobe loop || true
         - cd lava-dispatcher
         - git checkout release
diff --git a/unit-tests/lava/dispatcher-review-test.yaml b/unit-tests/lava/dispatcher-review-test.yaml
index a0da78c..ab72ad5 100644
--- a/unit-tests/lava/dispatcher-review-test.yaml
+++ b/unit-tests/lava/dispatcher-review-test.yaml
@@ -16,22 +16,13 @@ metadata:
 # Check the mem_cpu option in the kvm.conf device_type.
 
 install:
-    deps:
-        - git
-        - pep8
-        - python-lzma
-        - python-serial
-        - python-configglue
-        - python-pexpect
-        - lava-tool
-        - python-requests
-        - python-testscenarios
     git-repos:
         - git://git.linaro.org/lava/lava-dispatcher.git
 
-
 run:
     steps:
+        - apt-get update -q
+        - DEBIAN_FRONTEND=noninteractive lava-test-case install-base --shell apt-get -q -y install -o Dpkg::Options::="--force-confold" git pep8 python-lzma python-serial python-configglue python-pexpect lava-tool python-requests python-testscenarios
         - apt-get -y install -o Dpkg::Options::="--force-confold" lava-dispatcher
         - cd lava-dispatcher
         - git log -n1
diff --git a/unit-tests/lava/server-master-coverage.yaml b/unit-tests/lava/server-master-coverage.yaml
index 15d04fb..dff2089 100644
--- a/unit-tests/lava/server-master-coverage.yaml
+++ b/unit-tests/lava/server-master-coverage.yaml
@@ -15,8 +15,6 @@ metadata:
 # dependencies must be installed by the unit-tests definition
 
 install:
-    deps:
-        - python-coverage
     git-repos:
         - git://git.linaro.org/lava/lava-server.git
 
@@ -24,6 +22,8 @@ install:
 # each test name unique and produce a valid result.
 run:
     steps:
+        - apt-get update -q
+        - DEBIAN_FRONTEND=noninteractive lava-test-case install-base --shell apt-get -q -y install -o Dpkg::Options::="--force-confold" git python-coverage
         - cd lava-server
         - git log -n1
         - ../lava/version-wrapper.py
diff --git a/unit-tests/lava/server-master-unit-tests.yaml b/unit-tests/lava/server-master-unit-tests.yaml
index a38761f..58072f6 100644
--- a/unit-tests/lava/server-master-unit-tests.yaml
+++ b/unit-tests/lava/server-master-unit-tests.yaml
@@ -18,34 +18,13 @@ metadata:
 # Check the mem_cpu option in the kvm.conf device_type.
 
 install:
-    deps:
-        - git
-        - pep8
-        - lava-tool
-        - python-psycopg2
-        - postgresql-9.4
-        - postgresql-client-9.4
-        - python-dateutil
-        - python-django
-        - python-django-south
-        - python-django-tables2
-        - python-django-auth-openid
-        - python-django-auth-ldap
-        - python-django-restricted-resource
-        - python-pygments
-        - python-simplejson
-        - python-twisted
-        - django-testscenarios
-        - python-mocker
-        - python-markdown
-        - python-markupsafe
-        - python-netifaces
-        - node-uglify
     git-repos:
         - git://git.linaro.org/lava/lava-server.git
 
 run:
     steps:
+        - apt-get update -q
+        - DEBIAN_FRONTEND=noninteractive lava-test-case install-base --shell apt-get -q -y install -o Dpkg::Options::="--force-confold" git pep8 lava-tool python-psycopg2 postgresql-9.4 postgresql-client-9.4 python-dateutil python-django python-django-south python-django-tables2 python-django-auth-openid python-django-auth-ldap python-django-restricted-resource python-pygments python-simplejson python-twisted django-testscenarios python-mocker python-markdown python-markupsafe python-netifaces node-uglify
         # fix up the hosts file before installing apache
         - echo 127.0.0.1   localhost `hostname` >> /etc/hosts
         - lava-test-case uwsgi --shell apt -y install apache2 libapache2-mod-wsgi libapache2-mod-uwsgi
diff --git a/unit-tests/lava/server-release-unit-tests.yaml b/unit-tests/lava/server-release-unit-tests.yaml
index c655e31..3b123b0 100644
--- a/unit-tests/lava/server-release-unit-tests.yaml
+++ b/unit-tests/lava/server-release-unit-tests.yaml
@@ -18,39 +18,18 @@ metadata:
 # Check the mem_cpu option in the kvm.conf device_type.
 
 install:
-    deps:
-        - git
-        - pep8
-        - lava-tool
-        - python-psycopg2
-        - postgresql-9.4
-        - postgresql-client-9.4
-        - python-dateutil
-        - python-django
-        - python-django-south
-        - python-django-tables2
-        - python-django-auth-openid
-        - python-django-auth-ldap
-        - python-django-restricted-resource
-        - python-pygments
-        - python-simplejson
-        - python-twisted
-        - django-testscenarios
-        - python-mocker
-        - python-markdown
-        - python-markupsafe
-        - python-netifaces
-        - node-uglify
     git-repos:
         - git://git.linaro.org/lava/lava-server.git
 
 run:
     steps:
+        - apt-get update -q
+        - DEBIAN_FRONTEND=noninteractive lava-test-case install-base --shell apt-get -q -y install -o Dpkg::Options::="--force-confold" git pep8 lava-tool python-psycopg2 postgresql-9.6 postgresql-client-9.6 python-dateutil python-django python-django-tables2 python-twisted python-twisted-core python-django-auth-ldap python-django-restricted-resource python-pygments python-simplejson django-testscenarios python-mocker python-markdown python-markupsafe python-netifaces node-uglify
         # fix up the hosts file before installing apache
         - echo 127.0.0.1   localhost `hostname` >> /etc/hosts
-        - lava-test-case uwsgi --shell apt -y install apache2 libapache2-mod-wsgi libapache2-mod-uwsgi
+        - lava-test-case uwsgi --shell apt-get -y install -o Dpkg::Options::="--force-confold" apache2 libapache2-mod-wsgi libapache2-mod-uwsgi
         # devscripts needs to be installed without recommended packages.
-        - lava-test-case devscripts --shell apt --no-install-recommends -y install devscripts
+        - lava-test-case devscripts --shell apt-get --no-install-recommends -y install -o Dpkg::Options::="--force-confold" devscripts
         - DEBIAN_FRONTEND=noninteractive apt-get -y install -o Dpkg::Options::="--force-confold" lava-dispatcher lava-server
         - cd lava-server
         - git checkout release