From e72f05e636b881978d6ab1adaf9a1be2ed419b52 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 4 Jan 2018 22:56:06 +0000 Subject: templates/machine: remove unused test dirs The "test" dir of the machine templates is no longer used by the Jenkins job builder tools (ci-management). Remove them. Change-Id: Ice2ee89d7fba4f5cce763f71e4a4b206fa04b98c Signed-off-by: Kevin Hilman --- templates/machine/dra7xx-evm/test/hwtest.enable | 1 - .../machine/dra7xx-evm/test/hwtest.short.enable | 1 - .../dra7xx-evm/test/hwtest.short.environment | 11 ----- .../machine/dra7xx-evm/test/testjob_short.yaml | 51 ---------------------- templates/machine/m3ulcb-nogfx/test/hwtest.enable | 1 - .../machine/m3ulcb-nogfx/test/hwtest.short.enable | 1 - .../m3ulcb-nogfx/test/hwtest.short.environment | 9 ---- .../machine/m3ulcb-nogfx/test/testjob_short.yaml | 48 -------------------- templates/machine/porter-nogfx/test/hwtest.enable | 1 - .../machine/porter-nogfx/test/hwtest.short.enable | 1 - .../porter-nogfx/test/hwtest.short.environment | 11 ----- .../machine/porter-nogfx/test/testjob_short.yaml | 49 --------------------- templates/machine/qemux86-64/test/hwtest.enable | 1 - .../machine/qemux86-64/test/hwtest.short.enable | 1 - .../qemux86-64/test/hwtest.short.environment | 10 ----- .../raspberrypi3-64/test/hwtest.short.environment | 10 ----- .../raspberrypi3-64/test/testjob_short.yaml | 49 --------------------- templates/machine/raspberrypi3/test/hwtest.enable | 1 - .../machine/raspberrypi3/test/hwtest.short.enable | 1 - .../raspberrypi3/test/hwtest.short.environment | 10 ----- .../machine/raspberrypi3/test/testjob_short.yaml | 49 --------------------- 21 files changed, 317 deletions(-) delete mode 100644 templates/machine/dra7xx-evm/test/hwtest.enable delete mode 100644 templates/machine/dra7xx-evm/test/hwtest.short.enable delete mode 100644 templates/machine/dra7xx-evm/test/hwtest.short.environment delete mode 100644 templates/machine/dra7xx-evm/test/testjob_short.yaml delete mode 100644 templates/machine/m3ulcb-nogfx/test/hwtest.enable delete mode 100644 templates/machine/m3ulcb-nogfx/test/hwtest.short.enable delete mode 100644 templates/machine/m3ulcb-nogfx/test/hwtest.short.environment delete mode 100644 templates/machine/m3ulcb-nogfx/test/testjob_short.yaml delete mode 100644 templates/machine/porter-nogfx/test/hwtest.enable delete mode 100644 templates/machine/porter-nogfx/test/hwtest.short.enable delete mode 100644 templates/machine/porter-nogfx/test/hwtest.short.environment delete mode 100644 templates/machine/porter-nogfx/test/testjob_short.yaml delete mode 100644 templates/machine/qemux86-64/test/hwtest.enable delete mode 100644 templates/machine/qemux86-64/test/hwtest.short.enable delete mode 100644 templates/machine/qemux86-64/test/hwtest.short.environment delete mode 100644 templates/machine/raspberrypi3-64/test/hwtest.short.environment delete mode 100644 templates/machine/raspberrypi3-64/test/testjob_short.yaml delete mode 100644 templates/machine/raspberrypi3/test/hwtest.enable delete mode 100644 templates/machine/raspberrypi3/test/hwtest.short.enable delete mode 100644 templates/machine/raspberrypi3/test/hwtest.short.environment delete mode 100644 templates/machine/raspberrypi3/test/testjob_short.yaml diff --git a/templates/machine/dra7xx-evm/test/hwtest.enable b/templates/machine/dra7xx-evm/test/hwtest.enable deleted file mode 100644 index d00491fd7..000000000 --- a/templates/machine/dra7xx-evm/test/hwtest.enable +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/templates/machine/dra7xx-evm/test/hwtest.short.enable b/templates/machine/dra7xx-evm/test/hwtest.short.enable deleted file mode 100644 index d00491fd7..000000000 --- a/templates/machine/dra7xx-evm/test/hwtest.short.enable +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/templates/machine/dra7xx-evm/test/hwtest.short.environment b/templates/machine/dra7xx-evm/test/hwtest.short.environment deleted file mode 100644 index 2db9ab26e..000000000 --- a/templates/machine/dra7xx-evm/test/hwtest.short.environment +++ /dev/null @@ -1,11 +0,0 @@ -DEVICE_TYPE=ti-vayu-uboot -DEVICE_NAME=dra7xx-evm -DEVICE_DTB=zImage-dra7-evm-lcd-lg.dtb -DEVICE_KERNEL=zImage -DEVICE_INITRAMFS=initramfs-netboot-image-dra7xx-evm.ext4.gz -DEVICE_NBDROOT=agl-demo-platform-dra7xx-evm.ext4.xz -DEVICE_NBDROOT_COMPRESSION=xz -DEVICE_BOOT_METHOD=u-boot -DEVICE_BOOT_TYPE=bootz -#DEVICE_URL_PREFIX=https://download.automotivelinux.org/AGL -# \ No newline at end of file diff --git a/templates/machine/dra7xx-evm/test/testjob_short.yaml b/templates/machine/dra7xx-evm/test/testjob_short.yaml deleted file mode 100644 index 304cc8a6b..000000000 --- a/templates/machine/dra7xx-evm/test/testjob_short.yaml +++ /dev/null @@ -1,51 +0,0 @@ -# Your first LAVA JOB definition for a vayu board -device_type: @REPLACE_DEVICE_TYPE@ -job_name: AGL-short-smoke - -protocols: - lava-xnbd: - port: auto - -timeouts: - job: - minutes: 30 - action: - minutes: 15 - connection: - minutes: 5 - bootloader-commands: - minutes: 4 -priority: medium -visibility: public - -# ACTION_BLOCK -actions: -- deploy: - timeout: - minutes: 15 - to: nbd - dtb: - url: '@REPLACE_URL_PREFIX@/@REPLACE_DTB@' - kernel: - url: '@REPLACE_URL_PREFIX@/@REPLACE_KERNEL@' - initrd: - url: '@REPLACE_URL_PREFIX@/@REPLACE_INITRAMFS@' - allow_modify: false - nbdroot: - url: '@REPLACE_URL_PREFIX@/@REPLACE_NBDROOT@' - compression: @REPLACE_NBDROOT_COMPRESSION@ - os: debian - failure_retry: 2 - -# BOOT_BLOCK -- boot: - method: @REPLACE_BOOT_METHOD@ - commands: nbd - type: @REPLACE_BOOT_TYPE@ - prompts: ["root@@REPLACE_MACHINE@:~"] - auto_login: - login_prompt: "login:" - username: root - failure_retry: 2 - - diff --git a/templates/machine/m3ulcb-nogfx/test/hwtest.enable b/templates/machine/m3ulcb-nogfx/test/hwtest.enable deleted file mode 100644 index d00491fd7..000000000 --- a/templates/machine/m3ulcb-nogfx/test/hwtest.enable +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/templates/machine/m3ulcb-nogfx/test/hwtest.short.enable b/templates/machine/m3ulcb-nogfx/test/hwtest.short.enable deleted file mode 100644 index d00491fd7..000000000 --- a/templates/machine/m3ulcb-nogfx/test/hwtest.short.enable +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/templates/machine/m3ulcb-nogfx/test/hwtest.short.environment b/templates/machine/m3ulcb-nogfx/test/hwtest.short.environment deleted file mode 100644 index 57057444d..000000000 --- a/templates/machine/m3ulcb-nogfx/test/hwtest.short.environment +++ /dev/null @@ -1,9 +0,0 @@ -DEVICE_TYPE=r8a7796-m3ulcb -DEVICE_NAME=m3ulcb -DEVICE_DTB=Image-r8a7796-m3ulcb.dtb -DEVICE_KERNEL=Image -DEVICE_INITRAMFS=initramfs-netboot-image-m3ulcb.ext4.gz -DEVICE_NBDROOT=core-image-minimal-m3ulcb.ext4.xz -DEVICE_NBDROOT_COMPRESSION=xz -DEVICE_BOOT_METHOD=u-boot -DEVICE_BOOT_TYPE=booti diff --git a/templates/machine/m3ulcb-nogfx/test/testjob_short.yaml b/templates/machine/m3ulcb-nogfx/test/testjob_short.yaml deleted file mode 100644 index d14b7704f..000000000 --- a/templates/machine/m3ulcb-nogfx/test/testjob_short.yaml +++ /dev/null @@ -1,48 +0,0 @@ -device_type: @REPLACE_DEVICE_TYPE@ -job_name: AGL-short-smoke - -protocols: - lava-xnbd: - port: auto - -timeouts: - job: - minutes: 30 - action: - minutes: 15 - connection: - minutes: 5 - bootloader-commands: - minutes: 4 -priority: medium -visibility: public - -# ACTION_BLOCK -actions: -- deploy: - timeout: - minutes: 15 - to: nbd - dtb: - url: '@REPLACE_URL_PREFIX@/@REPLACE_DTB@' - kernel: - url: '@REPLACE_URL_PREFIX@/@REPLACE_KERNEL@' - initrd: - url: '@REPLACE_URL_PREFIX@/@REPLACE_INITRAMFS@' - allow_modify: false - nbdroot: - url: '@REPLACE_URL_PREFIX@/@REPLACE_NBDROOT@' - compression: @REPLACE_NBDROOT_COMPRESSION@ - os: debian - failure_retry: 2 - -# BOOT_BLOCK -- boot: - method: @REPLACE_BOOT_METHOD@ - commands: nbd - type: @REPLACE_BOOT_TYPE@ - prompts: ["root@@REPLACE_MACHINE@:~"] - auto_login: - login_prompt: "login:" - username: root - diff --git a/templates/machine/porter-nogfx/test/hwtest.enable b/templates/machine/porter-nogfx/test/hwtest.enable deleted file mode 100644 index d00491fd7..000000000 --- a/templates/machine/porter-nogfx/test/hwtest.enable +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/templates/machine/porter-nogfx/test/hwtest.short.enable b/templates/machine/porter-nogfx/test/hwtest.short.enable deleted file mode 100644 index d00491fd7..000000000 --- a/templates/machine/porter-nogfx/test/hwtest.short.enable +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/templates/machine/porter-nogfx/test/hwtest.short.environment b/templates/machine/porter-nogfx/test/hwtest.short.environment deleted file mode 100644 index 6cb0b9a0b..000000000 --- a/templates/machine/porter-nogfx/test/hwtest.short.environment +++ /dev/null @@ -1,11 +0,0 @@ -DEVICE_TYPE=renesas-porter-uboot -DEVICE_NAME=porter -DEVICE_DTB=uImage-r8a7791-porter.dtb -DEVICE_KERNEL=uImage -DEVICE_INITRAMFS=initramfs-netboot-image-porter.ext4.gz.u-boot -DEVICE_NBDROOT=core-image-minimal-porter.ext4.xz -DEVICE_NBDROOT_COMPRESSION=xz -DEVICE_BOOT_METHOD=u-boot -DEVICE_BOOT_TYPE=bootm -#DEVICE_URL_PREFIX=https://download.automotivelinux.org/AGL -# \ No newline at end of file diff --git a/templates/machine/porter-nogfx/test/testjob_short.yaml b/templates/machine/porter-nogfx/test/testjob_short.yaml deleted file mode 100644 index 2ff1ac995..000000000 --- a/templates/machine/porter-nogfx/test/testjob_short.yaml +++ /dev/null @@ -1,49 +0,0 @@ -# Your first LAVA JOB definition for a porter board -device_type: @REPLACE_DEVICE_TYPE@ -job_name: AGL-short-smoke - -protocols: - lava-xnbd: - port: auto - -timeouts: - job: - minutes: 30 - action: - minutes: 15 - connection: - minutes: 5 - bootloader-commands: - minutes: 4 -priority: medium -visibility: public - -# ACTION_BLOCK -actions: -- deploy: - timeout: - minutes: 15 - to: nbd - dtb: - url: '@REPLACE_URL_PREFIX@/@REPLACE_DTB@' - kernel: - url: '@REPLACE_URL_PREFIX@/@REPLACE_KERNEL@' - initrd: - url: '@REPLACE_URL_PREFIX@/@REPLACE_INITRAMFS@' - allow_modify: false - nbdroot: - url: '@REPLACE_URL_PREFIX@/@REPLACE_NBDROOT@' - compression: @REPLACE_NBDROOT_COMPRESSION@ - os: debian - failure_retry: 2 - -# BOOT_BLOCK -- boot: - method: @REPLACE_BOOT_METHOD@ - commands: nbd - type: @REPLACE_BOOT_TYPE@ - prompts: ["root@@REPLACE_MACHINE@:~"] - auto_login: - login_prompt: "login:" - username: root - diff --git a/templates/machine/qemux86-64/test/hwtest.enable b/templates/machine/qemux86-64/test/hwtest.enable deleted file mode 100644 index d00491fd7..000000000 --- a/templates/machine/qemux86-64/test/hwtest.enable +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/templates/machine/qemux86-64/test/hwtest.short.enable b/templates/machine/qemux86-64/test/hwtest.short.enable deleted file mode 100644 index d00491fd7..000000000 --- a/templates/machine/qemux86-64/test/hwtest.short.enable +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/templates/machine/qemux86-64/test/hwtest.short.environment b/templates/machine/qemux86-64/test/hwtest.short.environment deleted file mode 100644 index 68b97fb42..000000000 --- a/templates/machine/qemux86-64/test/hwtest.short.environment +++ /dev/null @@ -1,10 +0,0 @@ -DEVICE_ARCH=x86_64 -DEVICE_TYPE=qemu -DEVICE_NAME=qemux86-64 -DEVICE_DTB= -DEVICE_KERNEL=bzImage -DEVICE_INITRAMFS=agl-demo-platform-qemux86-64.ext4.xz -DEVICE_INITRAMFS_COMPRESSION=xz -DEVICE_BOOT_METHOD=qemu -DEVICE_QEMU_ARGS='"-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -m 1048 -soundhw hda"' -DEVICE_KERNEL_CMDLINE='"console=ttyS0,115200 root=/dev/hda debug verbose"' diff --git a/templates/machine/raspberrypi3-64/test/hwtest.short.environment b/templates/machine/raspberrypi3-64/test/hwtest.short.environment deleted file mode 100644 index 9e2dcbd0f..000000000 --- a/templates/machine/raspberrypi3-64/test/hwtest.short.environment +++ /dev/null @@ -1,10 +0,0 @@ -DEVICE_TYPE=bcm2837-rpi-3-b -DEVICE_NAME=raspberrypi3-64 -DEVICE_DTB=Image-bcm2837-rpi-3-b.dtb -DEVICE_KERNEL=Image -DEVICE_INITRAMFS=initramfs-netboot-image-raspberrypi3-64.ext4.gz.u-boot -DEVICE_NBDROOT=agl-demo-platform-raspberrypi3-64.ext4.xz -DEVICE_NBDROOT_COMPRESSION=xz -DEVICE_BOOT_METHOD=u-boot -DEVICE_BOOT_TYPE=booti -#DEVICE_URL_PREFIX=https://download.automotivelinux.org/AGL diff --git a/templates/machine/raspberrypi3-64/test/testjob_short.yaml b/templates/machine/raspberrypi3-64/test/testjob_short.yaml deleted file mode 100644 index 2ff1ac995..000000000 --- a/templates/machine/raspberrypi3-64/test/testjob_short.yaml +++ /dev/null @@ -1,49 +0,0 @@ -# Your first LAVA JOB definition for a porter board -device_type: @REPLACE_DEVICE_TYPE@ -job_name: AGL-short-smoke - -protocols: - lava-xnbd: - port: auto - -timeouts: - job: - minutes: 30 - action: - minutes: 15 - connection: - minutes: 5 - bootloader-commands: - minutes: 4 -priority: medium -visibility: public - -# ACTION_BLOCK -actions: -- deploy: - timeout: - minutes: 15 - to: nbd - dtb: - url: '@REPLACE_URL_PREFIX@/@REPLACE_DTB@' - kernel: - url: '@REPLACE_URL_PREFIX@/@REPLACE_KERNEL@' - initrd: - url: '@REPLACE_URL_PREFIX@/@REPLACE_INITRAMFS@' - allow_modify: false - nbdroot: - url: '@REPLACE_URL_PREFIX@/@REPLACE_NBDROOT@' - compression: @REPLACE_NBDROOT_COMPRESSION@ - os: debian - failure_retry: 2 - -# BOOT_BLOCK -- boot: - method: @REPLACE_BOOT_METHOD@ - commands: nbd - type: @REPLACE_BOOT_TYPE@ - prompts: ["root@@REPLACE_MACHINE@:~"] - auto_login: - login_prompt: "login:" - username: root - diff --git a/templates/machine/raspberrypi3/test/hwtest.enable b/templates/machine/raspberrypi3/test/hwtest.enable deleted file mode 100644 index 573541ac9..000000000 --- a/templates/machine/raspberrypi3/test/hwtest.enable +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/templates/machine/raspberrypi3/test/hwtest.short.enable b/templates/machine/raspberrypi3/test/hwtest.short.enable deleted file mode 100644 index 573541ac9..000000000 --- a/templates/machine/raspberrypi3/test/hwtest.short.enable +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/templates/machine/raspberrypi3/test/hwtest.short.environment b/templates/machine/raspberrypi3/test/hwtest.short.environment deleted file mode 100644 index 2f084f8ff..000000000 --- a/templates/machine/raspberrypi3/test/hwtest.short.environment +++ /dev/null @@ -1,10 +0,0 @@ -DEVICE_TYPE=raspberrypi3-uboot -DEVICE_NAME=raspberrypi3 -DEVICE_DTB=uImage-bcm2710-rpi-3-b.dtb -DEVICE_KERNEL=uImage -DEVICE_INITRAMFS=initramfs-netboot-image-raspberrypi3.ext4.gz.u-boot -DEVICE_NBDROOT=agl-demo-platform-raspberrypi3.ext4.xz -DEVICE_NBDROOT_COMPRESSION=xz -DEVICE_BOOT_METHOD=u-boot -DEVICE_BOOT_TYPE=bootm -#DEVICE_URL_PREFIX=https://download.automotivelinux.org/AGL diff --git a/templates/machine/raspberrypi3/test/testjob_short.yaml b/templates/machine/raspberrypi3/test/testjob_short.yaml deleted file mode 100644 index 2ff1ac995..000000000 --- a/templates/machine/raspberrypi3/test/testjob_short.yaml +++ /dev/null @@ -1,49 +0,0 @@ -# Your first LAVA JOB definition for a porter board -device_type: @REPLACE_DEVICE_TYPE@ -job_name: AGL-short-smoke - -protocols: - lava-xnbd: - port: auto - -timeouts: - job: - minutes: 30 - action: - minutes: 15 - connection: - minutes: 5 - bootloader-commands: - minutes: 4 -priority: medium -visibility: public - -# ACTION_BLOCK -actions: -- deploy: - timeout: - minutes: 15 - to: nbd - dtb: - url: '@REPLACE_URL_PREFIX@/@REPLACE_DTB@' - kernel: - url: '@REPLACE_URL_PREFIX@/@REPLACE_KERNEL@' - initrd: - url: '@REPLACE_URL_PREFIX@/@REPLACE_INITRAMFS@' - allow_modify: false - nbdroot: - url: '@REPLACE_URL_PREFIX@/@REPLACE_NBDROOT@' - compression: @REPLACE_NBDROOT_COMPRESSION@ - os: debian - failure_retry: 2 - -# BOOT_BLOCK -- boot: - method: @REPLACE_BOOT_METHOD@ - commands: nbd - type: @REPLACE_BOOT_TYPE@ - prompts: ["root@@REPLACE_MACHINE@:~"] - auto_login: - login_prompt: "login:" - username: root - -- cgit 1.2.3-korg