Remove 'os' from functional tests

Retain for os: android and os: *-installer

Change-Id: I15bf371dfd0a5be9164731d897850fe044079720

78 files changed, 0 insertions, 119 deletions

diff --git a/bbb-lxc-ssh-guest.yaml b/bbb-lxc-ssh-guest.yaml
index bd889ea..1410c9e 100644
--- a/bbb-lxc-ssh-guest.yaml
+++ b/bbb-lxc-ssh-guest.yaml
@@ -65,7 +65,6 @@ actions:
     - procps
     - lsb-release
     - util-linux
-    os: debian
 
 - boot:
     role:
@@ -101,7 +100,6 @@ actions:
     nfsrootfs:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/jessie-armhf-nfs.tar.gz
       compression: gz
-    os: debian
     dtb:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/dtbs/am335x-boneblack.dtb
 
@@ -113,7 +111,6 @@ actions:
       seconds: 30
     to: ssh
     connection: ssh
-    os: debian
     protocols:
       lava-multinode:
       - action: prepare-scp-overlay
diff --git a/bbb-lxc.yaml b/bbb-lxc.yaml
index 98f6572..4a7b9b0 100644
--- a/bbb-lxc.yaml
+++ b/bbb-lxc.yaml
@@ -37,7 +37,6 @@ actions:
     - procps
     - lsb-release
     - util-linux
-    os: debian
 
 - deploy:
     namespace: testdevice
@@ -58,7 +57,6 @@ actions:
     nfsrootfs:
       url: http://images.validation.linaro.org/debian-jessie-rootfs.tar.gz
       compression: gz
-    os: debian
     dtb:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/dtbs/am335x-boneblack.dtb
 
diff --git a/bbb-nfs.yaml b/bbb-nfs.yaml
index a933aaa..4ac33de 100644
--- a/bbb-nfs.yaml
+++ b/bbb-nfs.yaml
@@ -27,7 +27,6 @@ actions:
       # this rootfs doesn't pick up DNS correctly.
       url: http://images.validation.linaro.org/debian-jessie-rootfs.tar.gz
       compression: gz
-    os: debian
     dtb:
       url: http://images.validation.linaro.org/functional-test-images/bbb/am335x-bone.dtb
 
diff --git a/bbb-panda-multinode.yaml b/bbb-panda-multinode.yaml
index a566796..a508509 100644
--- a/bbb-panda-multinode.yaml
+++ b/bbb-panda-multinode.yaml
@@ -45,7 +45,6 @@ actions:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/modules.tar.gz
       compression: gz
     # despite this being a Debian initramfs, it is not a complete Debian rootfs, so use oe compatibility
-    os: oe
     dtb:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/dtbs/omap4-panda.dtb
 
@@ -69,7 +68,6 @@ actions:
     nfsrootfs:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/jessie-armhf-nfs.tar.gz
       compression: gz
-    os: debian
     dtb:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/dtbs/am335x-boneblack.dtb
 
diff --git a/bbb-qemu-multinode.yaml b/bbb-qemu-multinode.yaml
index 0a3f6d4..8dcaf1d 100644
--- a/bbb-qemu-multinode.yaml
+++ b/bbb-qemu-multinode.yaml
@@ -40,7 +40,6 @@ actions:
           image_arg: -drive format=raw,file={rootfs}
           url: http://images.validation.linaro.org/kvm/standard/stretch-2.img.gz
           compression: gz
-    os: debian
     root_partition: 1
 
 - deploy:
@@ -62,7 +61,6 @@ actions:
     nfsrootfs:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/jessie-armhf-nfs.tar.gz
       compression: gz
-    os: debian
     dtb:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/dtbs/am335x-boneblack.dtb
 
diff --git a/buster-armmp-nfs-cubietruck.yaml b/buster-armmp-nfs-cubietruck.yaml
index 5a41024..062c920 100644
--- a/buster-armmp-nfs-cubietruck.yaml
+++ b/buster-armmp-nfs-cubietruck.yaml
@@ -66,7 +66,6 @@ actions:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/buster/armhf/1/buster-armhf-nfs.tar.gz
       sha256sum: 816cdd7acbc50244afbb897e28b1c0e5f57872b1b8416fa2798d25407a686d09
       compression: gz
-    os: debian
     dtb:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/buster/armhf/1/dtbs/sun7i-a20-cubietruck.dtb
 
diff --git a/cubietruck-lxc.yaml b/cubietruck-lxc.yaml
index 48849a0..03a3d38 100644
--- a/cubietruck-lxc.yaml
+++ b/cubietruck-lxc.yaml
@@ -36,7 +36,6 @@ actions:
     - procps
     - lsb-release
     - util-linux
-    os: debian
 
 - deploy:
     namespace: testdevice
@@ -56,7 +55,6 @@ actions:
     nfsrootfs:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/jessie-armhf-nfs.tar.gz
       compression: gz
-    os: debian
     dtb:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/dtbs/sun7i-a20-cubietruck.dtb
 
diff --git a/db820c-debian-buster.yaml b/db820c-debian-buster.yaml
index 0faa01e..08487e1 100644
--- a/db820c-debian-buster.yaml
+++ b/db820c-debian-buster.yaml
@@ -31,7 +31,6 @@ actions:
     packages:
     - adb
     - fastboot
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -54,7 +53,6 @@ actions:
       boot:
         url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard820c/linaro/debian/185/boot-linaro-buster-dragonboard-820c-185.img.gz
         compression: gz
-    os: debian
     protocols:
       lava-lxc:
       - action: fastboot-deploy
diff --git a/dragonboard-410c.yaml b/dragonboard-410c.yaml
index 3cddc07..ef67aa9 100644
--- a/dragonboard-410c.yaml
+++ b/dragonboard-410c.yaml
@@ -33,7 +33,6 @@ actions:
     - android-tools-fastboot
     - systemd
     - systemd-sysv
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -73,7 +72,6 @@ actions:
         url: http://images.validation.linaro.org/builds.96boards.org/releases/dragonboard410c/linaro/debian/16.06/linaro-jessie-developer-qcom-snapdragon-arm64-20160630-110.img.gz
         compression: gz
         apply-overlay: true
-    os: debian
     protocols:
         lava-lxc:
         - action: fastboot-deploy
diff --git a/functional/lxc-dispatcher-stretch.yaml b/functional/lxc-dispatcher-stretch.yaml
index 9b28188..8f8a549 100644
--- a/functional/lxc-dispatcher-stretch.yaml
+++ b/functional/lxc-dispatcher-stretch.yaml
@@ -28,7 +28,6 @@ actions:
     timeout:
       minutes: 20
     to: lxc
-    os: debian
 
 - boot:
     method: lxc
diff --git a/functional/lxc-server-stretch.yaml b/functional/lxc-server-stretch.yaml
index 95da1e2..413cf66 100644
--- a/functional/lxc-server-stretch.yaml
+++ b/functional/lxc-server-stretch.yaml
@@ -28,7 +28,6 @@ actions:
     timeout:
       minutes: 20
     to: lxc
-    os: debian
 
 - boot:
     method: lxc
diff --git a/functional/server-jessie-stretch-debian.yaml b/functional/server-jessie-stretch-debian.yaml
index fc032d7..0a1fe60 100644
--- a/functional/server-jessie-stretch-debian.yaml
+++ b/functional/server-jessie-stretch-debian.yaml
@@ -29,7 +29,6 @@ actions:
     timeout:
       minutes: 20
     to: lxc
-    os: debian
 
 - boot:
     method: lxc
diff --git a/functional/server-staging-install-stretch.yaml b/functional/server-staging-install-stretch.yaml
index 211cd88..9c90a32 100644
--- a/functional/server-staging-install-stretch.yaml
+++ b/functional/server-staging-install-stretch.yaml
@@ -28,7 +28,6 @@ actions:
     timeout:
       minutes: 20
     to: lxc
-    os: debian
 
 - boot:
     method: lxc
diff --git a/functional/server-stretch-staging-upgrade.yaml b/functional/server-stretch-staging-upgrade.yaml
index f0fd7b0..48da296 100644
--- a/functional/server-stretch-staging-upgrade.yaml
+++ b/functional/server-stretch-staging-upgrade.yaml
@@ -29,7 +29,6 @@ actions:
     timeout:
       minutes: 20
     to: lxc
-    os: debian
 
 - boot:
     method: lxc
diff --git a/hacking/bbb-hacking-nfs.yaml b/hacking/bbb-hacking-nfs.yaml
index 9eb4270..9b77c02 100644
--- a/hacking/bbb-hacking-nfs.yaml
+++ b/hacking/bbb-hacking-nfs.yaml
@@ -23,7 +23,6 @@ actions:
     nfsrootfs:
       url: http://images.validation.linaro.org/debian-jessie-rootfs.tar.gz
       compression: gz
-    os: debian
     dtb:
       url: http://images.validation.linaro.org/functional-test-images/bbb/am335x-bone.dtb
 
diff --git a/health-checks/adb-nuc.yaml b/health-checks/adb-nuc.yaml
index 291aac2..31e1749 100644
--- a/health-checks/adb-nuc.yaml
+++ b/health-checks/adb-nuc.yaml
@@ -29,7 +29,6 @@ actions:
     packages:
     - android-tools-adb
     - iputils-ping
-    os: debian
 
 - boot:
     prompts:
diff --git a/health-checks/beaglebone-black.yaml b/health-checks/beaglebone-black.yaml
index 8605e15..f7a29d2 100644
--- a/health-checks/beaglebone-black.yaml
+++ b/health-checks/beaglebone-black.yaml
@@ -38,7 +38,6 @@ actions:
     nfsrootfs:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/jessie-armhf-nfs.tar.gz
       compression: gz
-    os: debian
     dtb:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/dtbs/am335x-boneblack.dtb
 
diff --git a/health-checks/cubietruck-health.yaml b/health-checks/cubietruck-health.yaml
index a7483a6..42f3cb3 100644
--- a/health-checks/cubietruck-health.yaml
+++ b/health-checks/cubietruck-health.yaml
@@ -36,7 +36,6 @@ actions:
     nfsrootfs:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/jessie-armhf-nfs.tar.gz
       compression: gz
-    os: debian
     dtb:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/dtbs/sun7i-a20-cubietruck.dtb
 
diff --git a/health-checks/cubietruck.yaml b/health-checks/cubietruck.yaml
index a7483a6..42f3cb3 100644
--- a/health-checks/cubietruck.yaml
+++ b/health-checks/cubietruck.yaml
@@ -36,7 +36,6 @@ actions:
     nfsrootfs:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/jessie-armhf-nfs.tar.gz
       compression: gz
-    os: debian
     dtb:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/dtbs/sun7i-a20-cubietruck.dtb
 
diff --git a/health-checks/dragonboard-410c.yaml b/health-checks/dragonboard-410c.yaml
index 9a81f0e..f3931aa 100644
--- a/health-checks/dragonboard-410c.yaml
+++ b/health-checks/dragonboard-410c.yaml
@@ -30,7 +30,6 @@ actions:
     packages:
     - adb
     - fastboot
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -54,7 +53,6 @@ actions:
         url: http://images.validation.linaro.org/builds.96boards.org/releases/dragonboard410c/linaro/debian/16.06/linaro-jessie-developer-qcom-snapdragon-arm64-20160630-110.img.gz
         compression: gz
         apply-overlay: true
-    os: debian
     protocols:
       lava-lxc:
       - action: fastboot-deploy
diff --git a/health-checks/dragonboard-820c.yaml b/health-checks/dragonboard-820c.yaml
index 7c7645e..cc18ed4 100644
--- a/health-checks/dragonboard-820c.yaml
+++ b/health-checks/dragonboard-820c.yaml
@@ -31,7 +31,6 @@ actions:
     packages:
     - wget
     - unzip
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -77,7 +76,6 @@ actions:
       boot:
         url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard820c/linaro/debian/180/boot-linaro-buster-dragonboard-820c-180.img.gz
         compression: gz
-    os: debian
 
 - boot:
     namespace: db820c
@@ -129,7 +127,6 @@ actions:
       userdata:
         url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard820c/linaro/aosp-master/80/userdata.img.xz
         compression: xz
-    os: debian
     protocols:
       lava-lxc:
       - action: fastboot-deploy
diff --git a/health-checks/hi6220-hikey.yaml b/health-checks/hi6220-hikey.yaml
index 88d7ff8..dfc5e6c 100644
--- a/health-checks/hi6220-hikey.yaml
+++ b/health-checks/hi6220-hikey.yaml
@@ -31,7 +31,6 @@ actions:
     packages:
     - android-tools-adb
     - android-tools-fastboot
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -64,7 +63,6 @@ actions:
       system:
         url: http://images.validation.linaro.org/builds.96boards.org/snapshots/hikey/linaro/aosp-master/357/system.img.xz
         compression: xz
-    os: debian
     protocols:
       lava-lxc:
       - action: fastboot-deploy
diff --git a/health-checks/lxc.yaml b/health-checks/lxc.yaml
index 8a13fc8..3ad2f08 100644
--- a/health-checks/lxc.yaml
+++ b/health-checks/lxc.yaml
@@ -26,7 +26,6 @@ actions:
     timeout:
       minutes: 30
     to: lxc
-    os: debian
 
 - boot:
     prompts:
diff --git a/health-checks/mustang-grub-efi.yaml b/health-checks/mustang-grub-efi.yaml
index c8eda4c..c3d8ed2 100644
--- a/health-checks/mustang-grub-efi.yaml
+++ b/health-checks/mustang-grub-efi.yaml
@@ -33,7 +33,6 @@ actions:
       url: http://snapshots.linaro.org/components/lava/standard/debian/stretch/arm64/3/stretch-arm64-nfs.tar.gz
       sha256sum: be163cf08119f8f1b8cb44fa4bf1b4a6e10873ac92df6872645535751ad92154
       compression: gz
-    os: debian
     timeout:
       minutes: 5
     to: tftp
diff --git a/health-checks/nexus4.yaml b/health-checks/nexus4.yaml
index 2ce8a30..4f47344 100644
--- a/health-checks/nexus4.yaml
+++ b/health-checks/nexus4.yaml
@@ -31,7 +31,6 @@ actions:
     packages:
     - adb
     - fastboot
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -53,7 +52,6 @@ actions:
         url: http://images.validation.linaro.org/people.linaro.org/~senthil.kumaran/nexus4-userdebug/userdata.img
       system:
         url: http://images.validation.linaro.org/people.linaro.org/~senthil.kumaran/nexus4-userdebug/system.img
-    os: debian
 
 - boot:
     namespace: droid
diff --git a/health-checks/nexus5x.yaml b/health-checks/nexus5x.yaml
index 35fbfef..7614f9c 100644
--- a/health-checks/nexus5x.yaml
+++ b/health-checks/nexus5x.yaml
@@ -33,7 +33,6 @@ actions:
     packages:
     - android-tools-adb
     - android-tools-fastboot
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -59,7 +58,6 @@ actions:
         url: http://images.validation.linaro.org/snapshots.linaro.org/android/android-generic-build/4/aosp_bullhead-userdebug/system.img
       vendor:
         url: http://images.validation.linaro.org/snapshots.linaro.org/android/android-generic-build/4/aosp_bullhead-userdebug/vendor.img
-    os: debian
 
 - boot:
     namespace: droid
diff --git a/health-checks/pixel.yaml b/health-checks/pixel.yaml
index 2223f31..299944f 100644
--- a/health-checks/pixel.yaml
+++ b/health-checks/pixel.yaml
@@ -33,7 +33,6 @@ actions:
     packages:
     - android-tools-adb
     - android-tools-fastboot
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -59,7 +58,6 @@ actions:
         url: http://snapshots.linaro.org/android/android-generic-build/10/aosp_sailfish-userdebug/system_other.img
       vendor:
         url: http://snapshots.linaro.org/android/android-generic-build/10/aosp_sailfish-userdebug/vendor.img
-    os: debian
 
 - boot:
     namespace: droid
diff --git a/health-checks/qemu.yaml b/health-checks/qemu.yaml
index 93a1841..f29fa92 100644
--- a/health-checks/qemu.yaml
+++ b/health-checks/qemu.yaml
@@ -21,7 +21,6 @@ actions:
           image_arg: -drive format=raw,file={rootfs}
           url: http://images.validation.linaro.org/kvm-debian-wheezy.img.gz
           compression: gz
-    os: debian
     root_partition: 1
 
 - boot:
diff --git a/health-checks/x15.yaml b/health-checks/x15.yaml
index 79c0b37..fd8a600 100644
--- a/health-checks/x15.yaml
+++ b/health-checks/x15.yaml
@@ -32,7 +32,6 @@ actions:
     - android-tools-fastboot

     - systemd

     - systemd-sysv

-    os: debian

 

 - boot:

     namespace: tlxc

@@ -57,7 +56,6 @@ actions:
         url: http://images.validation.linaro.org/snapshots.linaro.org/android/android-lcr-reference-x15-n/23/system.img

       cache:

         url: http://images.validation.linaro.org/snapshots.linaro.org/android/android-lcr-reference-x15-n/23/cache.img

-    os: debian

 

 - boot:

     namespace: droid

diff --git a/health-checks/x86.yaml b/health-checks/x86.yaml
index 56cf9fa..6d1bd13 100644
--- a/health-checks/x86.yaml
+++ b/health-checks/x86.yaml
@@ -23,7 +23,6 @@ actions:
     ramdisk:
       url: http://images.validation.linaro.org/x86/ubuntu/ubuntu-precise-3.10-networking.gz
       compression: gz
-    os: ubuntu
 
 - boot:
     timeout:
diff --git a/hi6220-hikey-aosp.yaml b/hi6220-hikey-aosp.yaml
index b9a7881..0c90ec0 100644
--- a/hi6220-hikey-aosp.yaml
+++ b/hi6220-hikey-aosp.yaml
@@ -31,7 +31,6 @@ actions:
     packages:
     - adb
     - fastboot
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -64,7 +63,6 @@ actions:
       system:
         url: http://images.validation.linaro.org/builds.96boards.org/snapshots/hikey/linaro/aosp-master/357/system.img.xz
         compression: xz
-    os: debian
     protocols:
         lava-lxc:
         - action: fastboot-deploy
diff --git a/hi6220-hikey-oe.yaml b/hi6220-hikey-oe.yaml
index 10cbbdd..534786f 100644
--- a/hi6220-hikey-oe.yaml
+++ b/hi6220-hikey-oe.yaml
@@ -31,7 +31,6 @@ actions:
     packages:
     - adb
     - fastboot
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -59,7 +58,6 @@ actions:
         url: http://images.validation.linaro.org/snapshots.linaro.org/openembedded/lkft/morty/hikey/rpb/4.9/83/rpb-console-image-hikey-20170808001820-83.rootfs.img.gz
         compression: gz
         apply-overlay: true
-    os: oe
     protocols:
       lava-lxc:
       - action: fastboot-deploy
diff --git a/hikey-antutu6.0-lxc.yaml b/hikey-antutu6.0-lxc.yaml
index 1d4f137..828acf2 100644
--- a/hikey-antutu6.0-lxc.yaml
+++ b/hikey-antutu6.0-lxc.yaml
@@ -39,7 +39,6 @@ actions:
     - python-setuptools
     - bc
     - zip
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -71,7 +70,6 @@ actions:
       system:
         url: http://images.validation.linaro.org/functional-test-images/hikey/system.img.xz
         compression: xz
-    os: debian
     protocols:
       lava-lxc:
       - action: fastboot-deploy
diff --git a/hikey-oe-grub.yaml b/hikey-oe-grub.yaml
index e471c40..49e1703 100644
--- a/hikey-oe-grub.yaml
+++ b/hikey-oe-grub.yaml
@@ -36,7 +36,6 @@ actions:
     - android-tools-fastboot
     - systemd  # needed for sid LXC
     - systemd-sysv  # needed for sid LXC
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -62,7 +61,6 @@ actions:
       system:
         url: http://images.validation.linaro.org/snapshots.linaro.org/openembedded/lkft/morty/hikey/rpb/4.9/30/rpb-console-image-hikey-20170411131448-30.rootfs.img.gz
         compression: gz
-    os: ubuntu
     protocols:
       lava-lxc:
       - action: fastboot-deploy
diff --git a/kvm-simple.yaml b/kvm-simple.yaml
index 7fc8f76..6936562 100644
--- a/kvm-simple.yaml
+++ b/kvm-simple.yaml
@@ -27,7 +27,6 @@ actions:
           image_arg: -drive format=raw,file={rootfs}
           url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/stretch/amd64/2/stretch.img.gz
           compression: gz
-    os: debian
     root_partition: 1
 
 - boot:
diff --git a/lxc-debian-mirror.yaml b/lxc-debian-mirror.yaml
index 93e0495..735d69d 100644
--- a/lxc-debian-mirror.yaml
+++ b/lxc-debian-mirror.yaml
@@ -29,7 +29,6 @@ actions:
     packages:
     - systemd
     - systemd-sysv
-    os: debian
 
 - boot:
     prompts:
diff --git a/lxc-dispatcher-buster.yaml b/lxc-dispatcher-buster.yaml
index a2443a5..0bda617 100644
--- a/lxc-dispatcher-buster.yaml
+++ b/lxc-dispatcher-buster.yaml
@@ -27,7 +27,6 @@ actions:
     timeout:
       minutes: 20
     to: lxc
-    os: debian
 
 - boot:
     method: lxc
diff --git a/lxc-multinode.yaml b/lxc-multinode.yaml
index c122ac7..59ad069 100644
--- a/lxc-multinode.yaml
+++ b/lxc-multinode.yaml
@@ -46,7 +46,6 @@ actions:
     packages:
     - systemd
     - systemd-sysv
-    os: debian
 
 - deploy:
     role:
@@ -57,7 +56,6 @@ actions:
     packages:
     - systemd
     - systemd-sysv
-    os: debian
 
 - boot:
     role:
diff --git a/lxc-server-buster.yaml b/lxc-server-buster.yaml
index 9b0cd55..7bff032 100644
--- a/lxc-server-buster.yaml
+++ b/lxc-server-buster.yaml
@@ -27,7 +27,6 @@ actions:
     timeout:
       minutes: 20
     to: lxc
-    os: debian
 
 - boot:
     method: lxc
diff --git a/lxc-ubuntu.yaml b/lxc-ubuntu.yaml
index 9cb07da..43661a2 100644
--- a/lxc-ubuntu.yaml
+++ b/lxc-ubuntu.yaml
@@ -24,7 +24,6 @@ actions:
     timeout:
       minutes: 30
     to: lxc
-    os: ubuntu
 
 - boot:
     prompts:
diff --git a/minus-lxc/dragonboard-410c.yaml b/minus-lxc/dragonboard-410c.yaml
index 17e6e51..1f2b378 100644
--- a/minus-lxc/dragonboard-410c.yaml
+++ b/minus-lxc/dragonboard-410c.yaml
@@ -27,7 +27,6 @@ actions:
         url: http://images.validation.linaro.org/builds.96boards.org/releases/dragonboard410c/linaro/debian/16.06/linaro-jessie-developer-qcom-snapdragon-arm64-20160630-110.img.gz
         compression: gz
         apply-overlay: true
-    os: debian
 
 - boot:
     prompts:
diff --git a/mustang-nfs.yaml b/mustang-nfs.yaml
index 94f87d4..3f68f26 100644
--- a/mustang-nfs.yaml
+++ b/mustang-nfs.yaml
@@ -25,7 +25,6 @@ actions:
     nfsrootfs:
       url: http://people.linaro.org/~neil.williams/arm64/debian-jessie-arm64-rootfs.tar.gz
       compression: gz
-    os: debian
     timeout:
       minutes: 5
     to: tftp
diff --git a/mustang-secondary-media.yaml b/mustang-secondary-media.yaml
index 4027f34..05cec28 100644
--- a/mustang-secondary-media.yaml
+++ b/mustang-secondary-media.yaml
@@ -33,7 +33,6 @@ actions:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/stretch/arm64/3/stretch-arm64-nfs.tar.gz
       sha256sum: be163cf08119f8f1b8cb44fa4bf1b4a6e10873ac92df6872645535751ad92154
       compression: gz
-    os: debian
     timeout:
       minutes: 5
     to: tftp
@@ -88,7 +87,6 @@ actions:
     timeout:
       minutes: 30
     to: sata
-    os: debian
     device: ST500DM002 # needs to be exposed in the device-specific UI
 
 - boot:
diff --git a/nexus10-simple.yaml b/nexus10-simple.yaml
index e9d0070..7ce5d4a 100644
--- a/nexus10-simple.yaml
+++ b/nexus10-simple.yaml
@@ -27,7 +27,6 @@ actions:
     - android-tools-fastboot
     - systemd
     - systemd-sysv
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -49,7 +48,6 @@ actions:
         url: http://images.validation.linaro.org/nexus10/userdata.img
       userdata:
         url: http://images.validation.linaro.org/nexus10/userdata.img
-    os: debian
 
 - boot:
     namespace: droid
diff --git a/nexus5x-simple.yaml b/nexus5x-simple.yaml
index 614c940..86a6ab2 100644
--- a/nexus5x-simple.yaml
+++ b/nexus5x-simple.yaml
@@ -32,7 +32,6 @@ actions:
     - android-tools-fastboot
     - systemd
     - systemd-sysv
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -58,7 +57,6 @@ actions:
         url: http://images.validation.linaro.org/snapshots.linaro.org/android/android-generic-build/4/aosp_bullhead-userdebug/system.img
       vendor:
         url: http://images.validation.linaro.org/snapshots.linaro.org/android/android-generic-build/4/aosp_bullhead-userdebug/vendor.img
-    os: debian
 
 - boot:
     namespace: droid
diff --git a/nexus9-simple.yaml b/nexus9-simple.yaml
index 98e9669..58310eb 100644
--- a/nexus9-simple.yaml
+++ b/nexus9-simple.yaml
@@ -27,7 +27,6 @@ actions:
     - android-tools-fastboot
     - systemd
     - systemd-sysv
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -51,7 +50,6 @@ actions:
         url: http://snapshots.linaro.org/android/linaro-art-tip-build-nexus9-MicroBenchmarks-Baseline/663/userdata.img
       vendor:
         url: http://testdata.validation.linaro.org/apks/binaries/nexus9/master/vendor.img
-    os: debian
 
 - boot:
     namespace: droid
diff --git a/overdrive-nfs.yaml b/overdrive-nfs.yaml
index c3eb584..ac9b18a 100644
--- a/overdrive-nfs.yaml
+++ b/overdrive-nfs.yaml
@@ -24,7 +24,6 @@ actions:
       prefix: binary/
     dtb:
       url: http://images.validation.linaro.org/overdrive/amd-overdrive.dtb
-    os: debian
 
 - boot:
     method: grub
diff --git a/panda-lxc-aep.yaml b/panda-lxc-aep.yaml
index 1d76425..0e87d6e 100644
--- a/panda-lxc-aep.yaml
+++ b/panda-lxc-aep.yaml
@@ -42,7 +42,6 @@ actions:
     - procps
     - lsb-release
     - util-linux
-    os: debian
 
 - boot:
     namespace: probe
diff --git a/pixel.yaml b/pixel.yaml
index 9c3521b..920fc61 100644
--- a/pixel.yaml
+++ b/pixel.yaml
@@ -32,7 +32,6 @@ actions:
     - android-tools-fastboot
     - systemd
     - systemd-sysv
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -58,7 +57,6 @@ actions:
         url: http://snapshots.linaro.org/android/android-generic-build/10/aosp_sailfish-userdebug/system_other.img
       vendor:
         url: http://snapshots.linaro.org/android/android-generic-build/10/aosp_sailfish-userdebug/vendor.img
-    os: debian
 
 - boot:
     namespace: droid
diff --git a/qemu-aarch64.yaml b/qemu-aarch64.yaml
index 8c37ee4..bd15047 100644
--- a/qemu-aarch64.yaml
+++ b/qemu-aarch64.yaml
@@ -35,7 +35,6 @@ actions:
       initrd:
         image_arg: -initrd {initrd}
         url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/sid/arm64/2/initrd.img-4.6.0-1-arm64
-    os: debian
     root_partition: 1
 
 - boot:
diff --git a/qemu-server-buster.yaml b/qemu-server-buster.yaml
index dccba91..62f89a2 100644
--- a/qemu-server-buster.yaml
+++ b/qemu-server-buster.yaml
@@ -36,7 +36,6 @@ actions:
               url: http://snapshots.linaro.org/components/lava/standard/debian/buster/amd64/1/large-buster.img.gz
               # sha256sum: 42f4a314a6e5748edf42a46afe2bb519584d9d00942614992c670bce61e9b21f
               compression: gz
-        os: debian
         root_partition: 1
 
     - boot:
diff --git a/qemu-stretch-params.yaml b/qemu-stretch-params.yaml
index 4b4e77e..b4195d7 100644
--- a/qemu-stretch-params.yaml
+++ b/qemu-stretch-params.yaml
@@ -27,7 +27,6 @@ actions:
           image_arg: -drive format=raw,file={rootfs}
           url: http://images.validation.linaro.org/kvm/standard/stretch-2.img.gz
           compression: gz
-    os: debian
     root_partition: 1
 
 - boot:
diff --git a/release/artifact-conversion-db410c.yaml b/release/artifact-conversion-db410c.yaml
index 08958ee..b99a801 100644
--- a/release/artifact-conversion-db410c.yaml
+++ b/release/artifact-conversion-db410c.yaml
@@ -56,7 +56,6 @@ actions:
     packages:
     - android-tools-adb
     - android-tools-fastboot
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -78,7 +77,6 @@ actions:
       rootfs:
         url: http://images.validation.linaro.org/builds.96boards.org/releases/dragonboard410c/linaro/debian/16.06/linaro-jessie-developer-qcom-snapdragon-arm64-20160630-110.img.gz
         compression: gz
-    os: debian
 
 - test:
     namespace: tlxc
@@ -108,7 +106,6 @@ actions:
       rootfs:
         url: lxc:///linaro-jessie-developer-qcom-snapdragon-arm64-20160630-110.img
         apply-overlay: true
-    os: debian
     protocols:
       lava-lxc:
       - action: fastboot-deploy
diff --git a/release/b2660-uboot-ramdisk.yaml b/release/b2660-uboot-ramdisk.yaml
index cd990f8..cea0e54 100644
--- a/release/b2660-uboot-ramdisk.yaml
+++ b/release/b2660-uboot-ramdisk.yaml
@@ -22,7 +22,6 @@ actions:
     ramdisk:
       url: http://images.validation.linaro.org/storage.kernelci.org/images/rootfs/buildroot/armel/rootfs.cpio.gz
       compression: gz
-    os: debian
     dtb:
       url: https://images.validation.linaro.org/builds.96boards.org/snapshots/b2260/linaro/debian/21/stih410-b2260.dtb
 - boot:
diff --git a/release/bbb-ssh-guest.yaml b/release/bbb-ssh-guest.yaml
index 78bbbcd..f853c32 100644
--- a/release/bbb-ssh-guest.yaml
+++ b/release/bbb-ssh-guest.yaml
@@ -94,7 +94,6 @@ actions:
     nfsrootfs:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/jessie-armhf-nfs.tar.gz
       compression: gz
-    os: debian
     dtb:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/dtbs/am335x-boneblack.dtb
 
@@ -105,7 +104,6 @@ actions:
       minutes: 2
     to: ssh
     connection: ssh
-    os: debian
     protocols:
       lava-multinode:
       - action: prepare-scp-overlay
diff --git a/release/bbb-tcwg.yaml b/release/bbb-tcwg.yaml
index d3d7ca1..0ed242f 100644
--- a/release/bbb-tcwg.yaml
+++ b/release/bbb-tcwg.yaml
@@ -29,7 +29,6 @@ actions:
     nfsrootfs:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/jessie-armhf-nfs.tar.gz
       compression: gz
-    os: debian
     dtb:
       url: http://images.validation.linaro.org/archive.validation.linaro.org/artifacts/team/toolchain/2018/06/26/02/40/am335x-boneblack.dtb
 
diff --git a/release/cubietruck-ssh-guest.yaml b/release/cubietruck-ssh-guest.yaml
index e7706c3..90904df 100644
--- a/release/cubietruck-ssh-guest.yaml
+++ b/release/cubietruck-ssh-guest.yaml
@@ -95,7 +95,6 @@ actions:
     nfsrootfs:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/jessie-armhf-nfs.tar.gz
       compression: gz
-    os: debian
     dtb:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/jessie/armhf/4/dtbs/sun7i-a20-cubietruck.dtb
 
@@ -103,7 +102,6 @@ actions:
     role:
     - guest
     connection: ssh
-    os: debian
     protocols:
       lava-multinode:
       - action: prepare-scp-overlay
diff --git a/release/hi6220-lxc-aosp.yaml b/release/hi6220-lxc-aosp.yaml
index a0fce19..03fb014 100644
--- a/release/hi6220-lxc-aosp.yaml
+++ b/release/hi6220-lxc-aosp.yaml
@@ -31,7 +31,6 @@ actions:
     packages:
     - adb
     - fastboot
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -64,7 +63,6 @@ actions:
       system:
         url: http://images.validation.linaro.org/builds.96boards.org/snapshots/hikey/linaro/aosp-master/357/system.img.xz
         compression: xz
-    os: debian
     protocols:
         lava-lxc:
         - action: fastboot-deploy
diff --git a/release/hi6220-r2-hikey-aosp-oe-aep.yaml b/release/hi6220-r2-hikey-aosp-oe-aep.yaml
index 228abf5..c81add2 100644
--- a/release/hi6220-r2-hikey-aosp-oe-aep.yaml
+++ b/release/hi6220-r2-hikey-aosp-oe-aep.yaml
@@ -64,7 +64,6 @@ actions:
     packages:
     - adb
     - fastboot
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -97,7 +96,6 @@ actions:
       system:
         url: http://images.validation.linaro.org/builds.96boards.org/snapshots/hikey/linaro/aosp-master/357/system.img.xz
         compression: xz
-    os: debian
     protocols:
         lava-lxc:
         - action: fastboot-deploy
@@ -146,7 +144,6 @@ actions:
         url: http://images.validation.linaro.org/snapshots.linaro.org/openembedded/lkft/morty/hikey/rpb/linux-mainline/588/rpb-console-image-hikey-20180128213254-588.rootfs.img.gz
         compression: gz
         apply-overlay: true
-    os: oe
     protocols:
       lava-lxc:
       - action: fastboot-deploy
diff --git a/release/hi960-hikey-aosp.yaml b/release/hi960-hikey-aosp.yaml
index c6499a8..de429a3 100644
--- a/release/hi960-hikey-aosp.yaml
+++ b/release/hi960-hikey-aosp.yaml
@@ -60,7 +60,6 @@ actions:
     packages:
     - adb
     - fastboot
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -89,7 +88,6 @@ actions:
       system:
         url: http://images.validation.linaro.org/testdata.validation.linaro.org/hikey960-pmwg/system.img.gz
         compression: gz
-    os: debian
     protocols:
         lava-lxc:
         - action: fastboot-deploy
diff --git a/release/hi960-hikey-oe-aep.yaml b/release/hi960-hikey-oe-aep.yaml
index 37b2e30..9491c0a 100644
--- a/release/hi960-hikey-oe-aep.yaml
+++ b/release/hi960-hikey-oe-aep.yaml
@@ -62,7 +62,6 @@ actions:
     to: lxc
     packages:
     - fastboot
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -90,7 +89,6 @@ actions:
         compression: gz
         apply-overlay: true
         # ensure that this job raises a network interface with DHCP before relying on internet access
-    os: oe
     protocols:
       lava-lxc:
       - action: fastboot-deploy
diff --git a/release/hi960-hikey-oe.yaml b/release/hi960-hikey-oe.yaml
index 8e44468..4d3fd29 100644
--- a/release/hi960-hikey-oe.yaml
+++ b/release/hi960-hikey-oe.yaml
@@ -59,7 +59,6 @@ actions:
     to: lxc
     packages:
     - fastboot
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -87,7 +86,6 @@ actions:
         compression: gz
         apply-overlay: true
         # ensure that this job raises a network interface with DHCP before relying on internet access
-    os: oe
     protocols:
       lava-lxc:
       - action: fastboot-deploy
diff --git a/release/hikey-oe.yaml b/release/hikey-oe.yaml
index 62352a9..75cc4e5 100644
--- a/release/hikey-oe.yaml
+++ b/release/hikey-oe.yaml
@@ -58,7 +58,6 @@ actions:
     to: lxc
     packages:
     - fastboot
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -87,7 +86,6 @@ actions:
         compression: gz
         apply-overlay: true
         # ensure that this job raises a network interface with DHCP before relying on internet access
-    os: oe
     protocols:
       lava-lxc:
       - action: fastboot-deploy
diff --git a/release/juno-r2-uboot-nfs.yaml b/release/juno-r2-uboot-nfs.yaml
index 0428f1a..0c0e09b 100644
--- a/release/juno-r2-uboot-nfs.yaml
+++ b/release/juno-r2-uboot-nfs.yaml
@@ -73,7 +73,6 @@ actions:
     timeout:
       minutes: 10
     to: nfs
-    os: debian
     nfsrootfs:
       url: http://people.linaro.org/~neil.williams/arm64/debian-jessie-arm64-rootfs.tar.gz
       compression: gz
diff --git a/release/juno-r2-uefi-nfs.yaml b/release/juno-r2-uefi-nfs.yaml
index 1b1ac57..ad87013 100644
--- a/release/juno-r2-uefi-nfs.yaml
+++ b/release/juno-r2-uefi-nfs.yaml
@@ -59,7 +59,6 @@ actions:
      timeout:
        minutes: 10
      to: nfs
-     os: debian
      nfsrootfs:
        url: http://people.linaro.org/~neil.williams/arm64/debian-jessie-arm64-rootfs.tar.gz
        compression: gz
diff --git a/release/juno-uboot-nfs.yaml b/release/juno-uboot-nfs.yaml
index cdab46b..c7601ef 100644
--- a/release/juno-uboot-nfs.yaml
+++ b/release/juno-uboot-nfs.yaml
@@ -73,7 +73,6 @@ actions:
     timeout:
       minutes: 10
     to: nfs
-    os: debian
     nfsrootfs:
       url: http://people.linaro.org/~neil.williams/arm64/debian-jessie-arm64-rootfs.tar.gz
       compression: gz
diff --git a/release/juno-uefi-nfs.yaml b/release/juno-uefi-nfs.yaml
index bcbf1af..7243281 100644
--- a/release/juno-uefi-nfs.yaml
+++ b/release/juno-uefi-nfs.yaml
@@ -59,7 +59,6 @@ actions:
      timeout:
        minutes: 10
      to: nfs
-     os: debian
      nfsrootfs:
        url: http://people.linaro.org/~neil.williams/arm64/debian-jessie-arm64-rootfs.tar.gz
        compression: gz
diff --git a/release/lxc.yaml b/release/lxc.yaml
index f6f9d5e..4f4c067 100644
--- a/release/lxc.yaml
+++ b/release/lxc.yaml
@@ -50,7 +50,6 @@ actions:
     timeout:
       minutes: 30
     to: lxc
-    os: debian
 
 - boot:
     prompts:
diff --git a/release/x15-extended.yaml b/release/x15-extended.yaml
index 7bfbf51..b6f04ec 100644
--- a/release/x15-extended.yaml
+++ b/release/x15-extended.yaml
@@ -33,7 +33,6 @@ actions:
     - android-tools-fastboot
     - systemd
     - systemd-sysv
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -58,7 +57,6 @@ actions:
         url: http://images.validation.linaro.org/snapshots.linaro.org/android/android-lcr-reference-x15-n/112/system.img
       cache:
         url: http://images.validation.linaro.org/snapshots.linaro.org/android/android-lcr-reference-x15-n/112/cache.img
-    os: debian
 
 - boot:
     namespace: droid
@@ -94,7 +92,6 @@ actions:
         url: http://images.validation.linaro.org/snapshots.linaro.org/openembedded/lkft/morty/am57xx-evm/rpb/linux-mainline/631/rpb-console-image-am57xx-evm-20180205221320-631.rootfs.img.gz
         compression: gz
         apply-overlay: true
-    os: oe
 
 - boot:
     namespace: droid
diff --git a/server-stretch-buster-debian.yaml b/server-stretch-buster-debian.yaml
index 3ba69a5..f9105d6 100644
--- a/server-stretch-buster-debian.yaml
+++ b/server-stretch-buster-debian.yaml
@@ -28,7 +28,6 @@ actions:
     timeout:
       minutes: 20
     to: lxc
-    os: debian
 
 - boot:
     method: lxc
diff --git a/standard/qemu-amd64-standard-jessie.yaml b/standard/qemu-amd64-standard-jessie.yaml
index 3c8478c..6163195 100644
--- a/standard/qemu-amd64-standard-jessie.yaml
+++ b/standard/qemu-amd64-standard-jessie.yaml
@@ -60,7 +60,6 @@ actions:
           url: http://images.validation.linaro.org/kvm/standard/large-stable-6.img.gz
           sha256sum: 8c305938e973dcfe4b4d2cf4da242c2cc036dd2ea6c867cb21b967ae2d9a52d7
           compression: gz
-    os: debian
     root_partition: 1
 
 - boot:
diff --git a/standard/qemu-amd64-standard-sid.yaml b/standard/qemu-amd64-standard-sid.yaml
index 9877819..21d35cf 100644
--- a/standard/qemu-amd64-standard-sid.yaml
+++ b/standard/qemu-amd64-standard-sid.yaml
@@ -39,7 +39,6 @@ actions:
           url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/sid/amd64/14/large-sid.img.gz
           sha256sum: 6a4341b3c5d1d5fb0510b8314bee2c27fca5e4523d3d496144e14dab99d4dc31
           compression: gz
-    os: debian
     root_partition: 1
 
 - boot:
diff --git a/standard/qemu-amd64-standard-stretch.yaml b/standard/qemu-amd64-standard-stretch.yaml
index 41706f5..2e43d8d 100644
--- a/standard/qemu-amd64-standard-stretch.yaml
+++ b/standard/qemu-amd64-standard-stretch.yaml
@@ -60,7 +60,6 @@ actions:
           url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/stretch/amd64/2/stretch.img.gz
           sha256sum: b5cdb3b9e65fec2d3654a05dcdf507281f408b624535b33375170d1e852b982c
           compression: gz
-    os: debian
     root_partition: 1
 
 - boot:
diff --git a/standard/standard-armmp-nfs-bbb.yaml b/standard/standard-armmp-nfs-bbb.yaml
index f265ddb..b74c338 100644
--- a/standard/standard-armmp-nfs-bbb.yaml
+++ b/standard/standard-armmp-nfs-bbb.yaml
@@ -64,7 +64,6 @@ actions:
     nfsrootfs:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/stretch/armhf/3/stretch-armhf-nfs.tar.gz
       compression: gz
-    os: debian
     dtb:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/stretch/armhf/3/dtbs/am335x-boneblack.dtb
 
diff --git a/standard/standard-armmp-nfs-cubietruck.yaml b/standard/standard-armmp-nfs-cubietruck.yaml
index 159bc6d..6d78095 100644
--- a/standard/standard-armmp-nfs-cubietruck.yaml
+++ b/standard/standard-armmp-nfs-cubietruck.yaml
@@ -64,7 +64,6 @@ actions:
     nfsrootfs:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/stretch/armhf/3/stretch-armhf-nfs.tar.gz
       compression: gz
-    os: debian
     dtb:
       url: http://images.validation.linaro.org/snapshots.linaro.org/components/lava/standard/debian/stretch/armhf/3/dtbs/sun7i-a20-cubietruck.dtb
 
diff --git a/x15-aosp-lcr.yaml b/x15-aosp-lcr.yaml
index 1efbce9..075d799 100644
--- a/x15-aosp-lcr.yaml
+++ b/x15-aosp-lcr.yaml
@@ -34,7 +34,6 @@ actions:
     - android-tools-fastboot
     - systemd
     - systemd-sysv
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -59,7 +58,6 @@ actions:
         url: http://images.validation.linaro.org/snapshots.linaro.org/android/android-lcr-reference-x15-n/23/system.img
       cache:
         url: http://images.validation.linaro.org/snapshots.linaro.org/android/android-lcr-reference-x15-n/23/cache.img
-    os: debian
 
 - boot:
     namespace: droid
diff --git a/x15-emmc-oe.yaml b/x15-emmc-oe.yaml
index 9ec7bb2..8703f43 100644
--- a/x15-emmc-oe.yaml
+++ b/x15-emmc-oe.yaml
@@ -35,7 +35,6 @@ actions:
     - android-tools-fastboot
     - systemd
     - systemd-sysv
-    os: debian
 
 - boot:
     namespace: tlxc
@@ -55,7 +54,6 @@ actions:
       userdata:
         url: http://snapshots.linaro.org/openembedded/lkft/morty/am57xx-evm/rpb/linux-next/113/rpb-console-image-am57xx-evm-20170919122309-113.rootfs.img.gz
         compression: gz
-    os: oe
 
 - boot:
     namespace: droid
diff --git a/x15-tftp-rpb.yaml b/x15-tftp-rpb.yaml
index c2222f9..40aa0f4 100644
--- a/x15-tftp-rpb.yaml
+++ b/x15-tftp-rpb.yaml
@@ -31,7 +31,6 @@ actions:
     nfsrootfs:
       url: http://snapshots.linaro.org/openembedded/lkft/morty/am57xx-evm/rpb/linux-next/113/rpb-console-image-am57xx-evm-20170919122309-113.rootfs.tar.xz
       compression: xz
-    os: debian
     dtb:
       url: http://snapshots.linaro.org/openembedded/lkft/morty/am57xx-evm/rpb/linux-next/113/zImage--4.12+git0+840cc455c5-r0-am57xx-beagle-x15-20170919122309-113.dtb