se: fix uboot.yaml and sync others

Changes include:
- Replace use of $? with $$? in uboot.yaml
  This is due to how python handles strings
- Transfer_overlay into home dir
  There isn't enough space in /tmp
- Repace magic numbers with variables in for soca9 TFTP
- Replace ltp-1 and ltp-2 with one ltp test yaml

Change-Id: I537edf731ae8bfc0b97855371793ad4002d64e30
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

11 files changed, 142 insertions, 314 deletions

diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/tftp-nfs.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/tftp-nfs.yaml
index 0d663772..daeaa9aa 100644
--- a/schneider-openembedded/lava-job-definitions/rzn1d/tftp-nfs.yaml
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/tftp-nfs.yaml
@@ -90,6 +90,22 @@ actions:
 - test:
     namespace: test
     timeout:
+      minutes: 10
+    interactive:
+    - name: basic-cmds
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: free -h
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+
+- test:
+    namespace: test
+    timeout:
       minutes: 5
     definitions:
     - repository: http://git.linaro.org/lava-team/lava-functional-tests.git
@@ -103,21 +119,6 @@ actions:
       from: git
       branch: master
 
-- test:
-    namespace: test
-    timeout:
-      minutes: 10
-    interactive:
-    - name: basic-cmds
-      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
-      script:
-      - command: uname -a
-      - command: cat /proc/device-tree/model ; echo ""
-      - command: ps aux --sort -rss
-      - command: free -h
-      - command: ifconfig -a
-      - command: ping -c 3 github.com
-
 metadata:
   machine: ${MACHINE}
   manifest branch: ${MANIFEST_BRANCH}
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/uboot.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/uboot.yaml
index 4ce858d5..0ec676f3 100644
--- a/schneider-openembedded/lava-job-definitions/rzn1d/uboot.yaml
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/uboot.yaml
@@ -114,10 +114,10 @@ actions:
       # crc32 - checksum calculation
       - command: mw.b 00000000 aa 400
       - command: crc32 -v 80000000 400 3c6f327d
-      - command: echo return code $?
+      - command: echo return code $$?
         name: compute-CRC32-checksum
         successes:
-        - message: return code 0
+        - message: "return code 0"
       # mw - memory write
       # md - memory display
       - command: mw 100000 aabbccdd 10
@@ -162,9 +162,9 @@ actions:
         successes:
         - message: "Bytes transferred = 6752784"
       - command: crc32 -v {KERNEL_ADDR} 670a10 ca050911
-      - command: echo return code $?
+      - command: echo return code $$?
         successes:
-        - message: return code 0
+        - message: "return code 0"
     - name: nand-commands
       prompts: ["=> ", "/ # "]
       script:
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev-ltp.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev-ltp.yaml
index bc175622..c0aa33e7 100644
--- a/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev-ltp.yaml
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev-ltp.yaml
@@ -1,5 +1,5 @@
 device_type: rzn1d
-job_name: SE ${MACHINE} TFTP/NFS LTP ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+job_name: SE ${MACHINE} WIC dev LTP ${MANIFEST_BRANCH} ${BUILD_NUMBER}
 
 timeouts:
   job:
@@ -80,7 +80,7 @@ actions:
     prompts:
     - "root@rzn1-snarc:"
     transfer_overlay:
-      download_command: udhcpc -i eth1 -n || udhcpc -i eth0 -n; cd /tmp ; wget
+      download_command: udhcpc -i eth1 -n || udhcpc -i eth0 -n; wget
       unpack_command: tar --touch -C / -xzf
 
 - test:
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev-ptest.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev-ptest.yaml
index 4c1b279f..027d6538 100644
--- a/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev-ptest.yaml
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/wic-dev-ptest.yaml
@@ -80,7 +80,7 @@ actions:
     prompts:
     - "root@rzn1-snarc:"
     transfer_overlay:
-      download_command: udhcpc -i eth1 -n || udhcpc -i eth0 -n; cd /tmp ; wget
+      download_command: udhcpc -i eth1 -n || udhcpc -i eth0 -n; wget
       unpack_command: tar --touch -C / -xzf
 
 - test:
diff --git a/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs-dev.yaml b/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs-dev.yaml
index 964edbf4..a504198e 100644
--- a/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs-dev.yaml
+++ b/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs-dev.yaml
@@ -38,7 +38,7 @@ actions:
 
 - boot:
     timeout:
-      minutes: 10
+      minutes: 20
     method: u-boot
     commands:
       - run FPGA_INIT
@@ -47,8 +47,8 @@ actions:
       - dhcp
       - env print
       - setenv serverip {SERVER_IP}
-      - tftp 0x01000000 {KERNEL}
-      - tftp 0x00000100 {DTB}
+      - tftp {KERNEL_ADDR} {KERNEL}
+      - tftp {DTB_ADDR} {DTB}
       - "setenv bootargs 'console=ttyS0,115200n8 root=/dev/nfs rw nfsroot={NFS_SERVER_IP}:{NFSROOTFS},tcp,hard,intr,vers=3 rootwait coherent_pool=2M ip=dhcp'"
       - '{BOOTX}'
     auto_login:
diff --git a/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs.yaml b/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs.yaml
index 6be4fdd2..4deeb590 100644
--- a/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs.yaml
+++ b/schneider-openembedded/lava-job-definitions/soca9/tftp-nfs.yaml
@@ -38,7 +38,7 @@ actions:
 
 - boot:
     timeout:
-      minutes: 10
+      minutes: 20
     method: u-boot
     commands:
       - run FPGA_INIT
@@ -47,8 +47,8 @@ actions:
       - dhcp
       - env print
       - setenv serverip {SERVER_IP}
-      - tftp 0x01000000 {KERNEL}
-      - tftp 0x00000100 {DTB}
+      - tftp {KERNEL_ADDR} {KERNEL}
+      - tftp {DTB_ADDR} {DTB}
       - "setenv bootargs 'console=ttyS0,115200n8 root=/dev/nfs rw nfsroot={NFS_SERVER_IP}:{NFSROOTFS},tcp,hard,intr,vers=3 rootwait coherent_pool=2M ip=dhcp'"
       - '{BOOTX}'
     auto_login:
diff --git a/schneider-openembedded/lava-job-definitions/soca9/uboot.yaml b/schneider-openembedded/lava-job-definitions/soca9/uboot.yaml
index d0890a25..573d9af6 100644
--- a/schneider-openembedded/lava-job-definitions/soca9/uboot.yaml
+++ b/schneider-openembedded/lava-job-definitions/soca9/uboot.yaml
@@ -80,10 +80,10 @@ actions:
       # crc32 - checksum calculation
       - command: mw.b 00000000 aa 400
       - command: crc32 -v 0 400 3c6f327d
-      - command: echo return code $?
+      - command: echo return code $$?
         name: compute-CRC32-checksum
         successes:
-        - message: return code 0
+        - message: "return code 0"
       # mw - memory write
       # md - memory display
       - command: mw 100000 aabbccdd 10
@@ -132,9 +132,9 @@ actions:
         successes:
         - message: "Bytes transferred = 6752784"
       - command: crc32 -v {KERNEL_ADDR} 670a10 ca050911
-      - command: echo return code $?
+      - command: echo return code $$?
         successes:
-        - message: return code 0
+        - message: "return code 0"
 
 metadata:
   machine: ${MACHINE}
diff --git a/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ltp-1.yaml b/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ltp-1.yaml
deleted file mode 100644
index 5641ad77..00000000
--- a/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ltp-1.yaml
+++ /dev/null
@@ -1,277 +0,0 @@
-device_type: soca9
-job_name: SE ${MACHINE} WIC LTP (1) ${MANIFEST_BRANCH} ${BUILD_NUMBER}
-
-timeouts:
-  job:
-    minutes: 600
-  action:
-    minutes: 70
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-actions:
-
-- deploy:
-    timeout:
-      minutes: 100
-    to: flasher
-    images:
-      image:
-        url: ${WIC_DEV_IMAGE_URL}
-        compression: bz2
-- boot:
-    timeout:
-      minutes: 100
-    method: u-boot
-    commands:
-    - run linux_sd
-    auto_login:
-      login_prompt: 'login:'
-      username: root
-    prompts:
-    - "root@snarc-soca9:"
-    transfer_overlay:
-      download_command: udhcpc -i eth1 -n || udhcpc -i eth0 -n; cd /tmp ; wget
-      unpack_command: tar --touch -C / -xzf
-
-- test:
-    timeout:
-      minutes: 10
-    interactive:
-    - name: basic-cmds
-      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
-      script:
-      - command: uname -a
-      - command: cat /proc/device-tree/model ; echo ""
-      - command: mount
-      - command: ps aux --sort -rss
-      - command: cat /proc/meminfo
-      - command: free -h
-      - command: ifconfig -a
-      - command: ping -c 3 github.com
-
-- test:
-    timeout:
-      minutes: 600
-    definitions:
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: uname-test
-          description: "uname test"
-        run:
-          steps:
-            - uname -a
-      name: uname-test
-      path: inline/uname-test.yaml
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: ps-inline-test
-          description: "ps-inline test"
-        run:
-          steps:
-            - ps aux --sort -rss
-      name: ps-inline-test
-      path: inline/ps-inline-test.yaml
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: meminfo-inline-test
-          description: "meminfo-inline test"
-        run:
-          steps:
-            - cat /proc/meminfo
-      name: meminfo-inline-test
-      path: inline/meminfo-inline-test.yaml
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: free-inline-test
-          description: "free-inline test"
-        run:
-          steps:
-            - free -h
-      name: free-inline-test
-      path: inline/free-inline-test.yaml
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: ifconfig-test
-          description: "ifconfig test"
-        run:
-          steps:
-            - ifconfig -a
-      name: ifconfig-test
-      path: inline/ifconfig-test.yaml
-
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: ping-github
-          description: Ping public GitHub webserver
-        run:
-          steps:
-          - ping -c 3 github.com
-      name: ping-github
-      path: inline/ping-github.yaml
-
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: resolved-test
-          description: resolved test
-        run:
-          steps:
-          - systemctl --no-pager status systemd-resolved
-          - systemctl --no-pager restart systemd-resolved
-          - systemctl --no-pager status systemd-resolved
-      name: resolved-test
-      path: inline/resolved-test.yaml
-
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: memstat-test
-          description: "memstat test"
-        run:
-          steps:
-            - memstat
-      name: memstat-test
-      path: inline/memstat-test.yaml
-    - path: automated/linux/meminfo/meminfo.yaml
-      repository: https://git.linaro.org/qa/test-definitions.git
-      history: false
-      name: meminfo
-      from: git
-      branch: master
-    - path: automated/linux/ltp/ltp.yaml
-      repository: https://git.linaro.org/qa/test-definitions.git
-      history: false
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'syscalls'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        BOARD: rzn1d
-        TIMEOUT_MULTIPLIER: 3
-      name: ltp-syscalls-tests
-      timeout:
-        minutes: 120
-    - path: automated/linux/ltp/ltp.yaml
-      repository: https://git.linaro.org/qa/test-definitions.git
-      history: false
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'math'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        BOARD: rzn1d
-        TIMEOUT_MULTIPLIER: 3
-      name: ltp-math-tests
-      timeout:
-        minutes: 120
-    - path: automated/linux/ltp/ltp.yaml
-      repository: https://git.linaro.org/qa/test-definitions.git
-      history: false
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'timers'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        BOARD: rzn1d
-        TIMEOUT_MULTIPLIER: 3
-      name: ltp-timers-tests
-      timeout:
-        minutes: 120
-    - path: automated/linux/ltp/ltp.yaml
-      repository: https://git.linaro.org/qa/test-definitions.git
-      history: false
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'fcntl-locktests'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        BOARD: rzn1d
-        TIMEOUT_MULTIPLIER: 3
-      name: ltp-fcntl-locktests-tests
-      timeout:
-        minutes: 120
-    - path: automated/linux/ltp/ltp.yaml
-      repository: https://git.linaro.org/qa/test-definitions.git
-      history: false
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'ipc'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        BOARD: rzn1d
-        TIMEOUT_MULTIPLIER: 3
-      name: ltp-ipc-tests
-      timeout:
-        minutes: 120
-    - path: automated/linux/ltp/ltp.yaml
-      repository: https://git.linaro.org/qa/test-definitions.git
-      history: false
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'fsx'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        BOARD: rzn1d
-        TIMEOUT_MULTIPLIER: 3
-      name: ltp-fsx-tests
-      timeout:
-        minutes: 120
-    - path: automated/linux/ltp/ltp.yaml
-      repository: https://git.linaro.org/qa/test-definitions.git
-      history: false
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'fs'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        BOARD: rzn1d
-        TIMEOUT_MULTIPLIER: 3
-      name: ltp-fs-tests
-      timeout:
-        minutes: 120
-    - path: automated/linux/ltp/ltp.yaml
-      repository: https://git.linaro.org/qa/test-definitions.git
-      history: false
-      from: git
-      parameters:
-        SKIP_INSTALL: 'true'
-        TST_CMDFILES: 'hugetlb'
-        SKIPFILE: 'skipfile-lkft.yaml'
-        BOARD: rzn1d
-        TIMEOUT_MULTIPLIER: 3
-      name: ltp-hugetlb-tests
-      timeout:
-        minutes: 120
-
-metadata:
-  machine: ${MACHINE}
-  manifest branch: ${MANIFEST_BRANCH}
-  manifest commit: ${MANIFEST_COMMIT}
-  build url: ${BUILD_URL}
-  build location: ${PUBLISH_SERVER}${PUB_DEST}
-
-notify:
-    recipients:
-    - to:
-        method: email
-        email: ryan.harkin@linaro.org
-    criteria:
-        status: complete
-    verbosity: verbose
diff --git a/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ltp-2.yaml b/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ltp.yaml
index 27ef1aee..4fa20a4f 100644
--- a/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ltp-2.yaml
+++ b/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ltp.yaml
@@ -1,5 +1,5 @@
 device_type: soca9
-job_name: SE ${MACHINE} WIC LTP (2) ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+job_name: SE ${MACHINE} WIC dev LTP ${MANIFEST_BRANCH} ${BUILD_NUMBER}
 
 timeouts:
   job:
@@ -33,7 +33,7 @@ actions:
     prompts:
     - "root@snarc-soca9:"
     transfer_overlay:
-      download_command: udhcpc -i eth1 -n || udhcpc -i eth0 -n; cd /tmp ; wget
+      download_command: udhcpc -i eth1 -n || udhcpc -i eth0 -n; wget
       unpack_command: tar --touch -C / -xzf
 
 - test:
@@ -161,6 +161,110 @@ actions:
       from: git
       parameters:
         SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'syscalls'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: rzn1d
+        TIMEOUT_MULTIPLIER: 3
+      name: ltp-syscalls-tests
+      timeout:
+        minutes: 120
+    - path: automated/linux/ltp/ltp.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      from: git
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'math'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: rzn1d
+        TIMEOUT_MULTIPLIER: 3
+      name: ltp-math-tests
+      timeout:
+        minutes: 120
+    - path: automated/linux/ltp/ltp.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      from: git
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'timers'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: rzn1d
+        TIMEOUT_MULTIPLIER: 3
+      name: ltp-timers-tests
+      timeout:
+        minutes: 120
+    - path: automated/linux/ltp/ltp.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      from: git
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'fcntl-locktests'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: rzn1d
+        TIMEOUT_MULTIPLIER: 3
+      name: ltp-fcntl-locktests-tests
+      timeout:
+        minutes: 120
+    - path: automated/linux/ltp/ltp.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      from: git
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'ipc'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: rzn1d
+        TIMEOUT_MULTIPLIER: 3
+      name: ltp-ipc-tests
+      timeout:
+        minutes: 120
+    - path: automated/linux/ltp/ltp.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      from: git
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'fsx'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: rzn1d
+        TIMEOUT_MULTIPLIER: 3
+      name: ltp-fsx-tests
+      timeout:
+        minutes: 120
+    - path: automated/linux/ltp/ltp.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      from: git
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'fs'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: rzn1d
+        TIMEOUT_MULTIPLIER: 3
+      name: ltp-fs-tests
+      timeout:
+        minutes: 120
+    - path: automated/linux/ltp/ltp.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      from: git
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'hugetlb'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: rzn1d
+        TIMEOUT_MULTIPLIER: 3
+      name: ltp-hugetlb-tests
+      timeout:
+        minutes: 120
+    - path: automated/linux/ltp/ltp.yaml
+      repository: https://git.linaro.org/qa/test-definitions.git
+      history: false
+      from: git
+      parameters:
+        SKIP_INSTALL: 'true'
         TST_CMDFILES: 'io'
         SKIPFILE: 'skipfile-lkft.yaml'
         BOARD: rzn1d
diff --git a/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ptest.yaml b/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ptest.yaml
index 744ce9a9..850590f4 100644
--- a/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ptest.yaml
+++ b/schneider-openembedded/lava-job-definitions/soca9/wic-dev-ptest.yaml
@@ -1,5 +1,5 @@
 device_type: soca9
-job_name: SE ${MACHINE} WIC ptest ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+job_name: SE ${MACHINE} WIC dev ptest ${MANIFEST_BRANCH} ${BUILD_NUMBER}
 
 timeouts:
   job:
@@ -33,7 +33,7 @@ actions:
     prompts:
     - "root@snarc-soca9:"
     transfer_overlay:
-      download_command: udhcpc -i eth1 -n || udhcpc -i eth0 -n; cd /tmp ; wget
+      download_command: udhcpc -i eth1 -n || udhcpc -i eth0 -n; wget
       unpack_command: tar --touch -C / -xzf
 
 - test:
diff --git a/schneider-openembedded/lava-job-definitions/soca9/wic-dev.yaml b/schneider-openembedded/lava-job-definitions/soca9/wic-dev.yaml
index 974904da..921cfbeb 100644
--- a/schneider-openembedded/lava-job-definitions/soca9/wic-dev.yaml
+++ b/schneider-openembedded/lava-job-definitions/soca9/wic-dev.yaml
@@ -33,7 +33,7 @@ actions:
     prompts:
     - "root@snarc-soca9:"
     transfer_overlay:
-      download_command: udhcpc -i eth1 -n || udhcpc -i eth0 -n; cd /tmp ; wget
+      download_command: udhcpc -i eth1 -n || udhcpc -i eth0 -n; wget
       unpack_command: tar --touch -C / -xzf
 
 - test: