Move the nfs-dns support to dedicated definition

Files needed to use nfs-dns only exist on NFS.

Change-Id: I82a0a5a5a402623ccc60f0d120aac1d4a5916648

4 files changed, 29 insertions, 18 deletions

diff --git a/lava-test-shell/params/nfs.yaml b/lava-test-shell/params/nfs.yaml
new file mode 100644
index 0000000..ca61ab2
--- /dev/null
+++ b/lava-test-shell/params/nfs.yaml
@@ -0,0 +1,29 @@
+metadata:
+    format: Lava-Test Test Definition 1.0
+    name: configure-nfs-dns
+    description: "Additional support for NFS to use DNS"
+    maintainer:
+        - neil.williams@linaro.org
+    os:
+        - debian
+    scope:
+        - functional
+    devices:
+        - qemu
+        - arndale
+        - panda
+        - beaglebone-black
+
+params:
+    INTERFACE: eth0
+
+install:
+    deps:
+      - net-tools
+
+run:
+    steps:
+        - lava-test-case clean-resolv --shell rm -f /etc/resolv.conf
+        - lava-test-case nfs-dns --shell ./scripts/nfs-dns.sh $INTERFACE
+        - lava-test-case resolv --shell cat /etc/resolv.conf
+        - ifconfig -a
diff --git a/lava-test-shell/single-node/singlenode01.yaml b/lava-test-shell/single-node/singlenode01.yaml
index 3d12ab7..1af456a 100644
--- a/lava-test-shell/single-node/singlenode01.yaml
+++ b/lava-test-shell/single-node/singlenode01.yaml
@@ -14,17 +14,11 @@ metadata:
         - panda
         - beaglebone-black
 
-params:
-    INTERFACE: eth0
-
 run:
     steps:
-        - lava-test-case clean-resolv --shell rm -f /etc/resolv.conf
-        - lava-test-case nfs-dns --shell ./scripts/nfs-dns.sh $INTERFACE
         - 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
         - lava-test-case linux-linaro-ubuntu-route-ifconfig-up-lo --shell ifconfig lo up
         - lava-test-case linux-linaro-ubuntu-route-dump-b --shell route
-        - lava-test-case linux-linaro-ubuntu-route-ifconfig-up --shell ifconfig $INTERFACE up
         - lava-test-case ping-test --shell ping -W1 -c1 www.linaro.org
diff --git a/lava-test-shell/single-node/singlenode02.yaml b/lava-test-shell/single-node/singlenode02.yaml
index c9a7d47..711ef68 100644
--- a/lava-test-shell/single-node/singlenode02.yaml
+++ b/lava-test-shell/single-node/singlenode02.yaml
@@ -14,9 +14,6 @@ metadata:
         - panda
         - beaglebone-black
 
-params:
-    INTERFACE: eth0
-
 install:
     deps:
        - net-tools
@@ -25,14 +22,11 @@ install:
 
 run:
     steps:
-        - lava-test-case clean-resolv --shell rm -f /etc/resolv.conf
-        - lava-test-case nfs-dns --shell ./scripts/nfs-dns.sh $INTERFACE
         - 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
         - lava-test-case linux-linaro-ubuntu-route-ifconfig-up-lo --shell ifconfig lo up
         - lava-test-case linux-linaro-ubuntu-route-dump-b --shell route
-        - lava-test-case linux-linaro-ubuntu-route-ifconfig-up --shell ifconfig $INTERFACE up
         - cat /etc/resolv.conf
         - lava-test-case ping-test --shell ping -W1 -c1 www.linaro.org
         - lava-test-case direct-update --shell apt-get -q -y update
diff --git a/lava-test-shell/single-node/singlenode03.yaml b/lava-test-shell/single-node/singlenode03.yaml
index e1346dc..f0e96b7 100644
--- a/lava-test-shell/single-node/singlenode03.yaml
+++ b/lava-test-shell/single-node/singlenode03.yaml
@@ -14,9 +14,6 @@ metadata:
         - panda
         - beaglebone-black
 
-params:
-    INTERFACE: eth0
-
 install:
     deps:
         - curl
@@ -28,14 +25,11 @@ install:
         - iputils-ping
 run:
     steps:
-        - lava-test-case clean-resolv --shell rm -f /etc/resolv.conf
-        - lava-test-case nfs-dns --shell ./scripts/nfs-dns.sh $INTERFACE
         - 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
         - lava-test-case linux-linaro-ubuntu-route-ifconfig-up-lo --shell ifconfig lo up
         - lava-test-case linux-linaro-ubuntu-route-dump-b --shell route
-        - lava-test-case linux-linaro-ubuntu-route-ifconfig-up --shell ifconfig $INTERFACE up
         - lava-test-case ping-test --shell ping -W1 -c1 www.linaro.org
         - lava-test-case realpath-check --shell realpath ./lava-test-shell/multi-node/check_ip.sh
         - lava-test-case ntpdate-check --shell ntpdate-debian