From 77e88f03a234e90736caab11b3ac6ec599c6ca2a Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Tue, 25 Jun 2019 20:53:50 +0300 Subject: lhg-oe-build: remove redundant test templates All the template-tests-${MANIFEST_BRANCH}.yaml for a given machine are the same (no dependency on the manifest branch). So let's use a single template for all the manifest branches (for a given machine). Change-Id: I7ad73965df001ceeb02140379d8d2112830eec2a Signed-off-by: Andrey Konovalov --- .../template-robotframework-tests.yaml | 150 +++++++++++++++++++++ .../hi6220-hikey/template-tests-morty.yaml | 150 --------------------- .../hi6220-hikey/template-tests-rocko.yaml | 150 --------------------- 3 files changed, 150 insertions(+), 300 deletions(-) create mode 100644 lhg-oe-build/lava-job-definitions/hi6220-hikey/template-robotframework-tests.yaml delete mode 100644 lhg-oe-build/lava-job-definitions/hi6220-hikey/template-tests-morty.yaml delete mode 100644 lhg-oe-build/lava-job-definitions/hi6220-hikey/template-tests-rocko.yaml (limited to 'lhg-oe-build/lava-job-definitions/hi6220-hikey') diff --git a/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-robotframework-tests.yaml b/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-robotframework-tests.yaml new file mode 100644 index 0000000000..af9acc2293 --- /dev/null +++ b/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-robotframework-tests.yaml @@ -0,0 +1,150 @@ +device_type: hi6220-hikey-r2 +tags: + - static-ip + - 4k-hdmi-dongle + - usb-mouse +job_name: lhg-oe-robotframework-tests-${MANIFEST_BRANCH}-${BUILD_NUMBER} +timeouts: + job: + minutes: 40 + action: + minutes: 20 + connection: + minutes: 5 +priority: high +visibility: public + +metadata: + manifest branch: ${MANIFEST_BRANCH} + build-url: ${BUILD_URL} + build-location: ${BASE_URL}/${PUB_DEST} + +protocols: + lava-lxc: + name: lxc-hikey-test + distribution: ubuntu + release: xenial + arch: amd64 + verbose: true + +actions: +- deploy: + namespace: tlxc + timeout: + minutes: 20 + to: lxc + packages: + - wget + - unzip + - python-opencv + - python-pip + - libffi-dev + - libssl-dev + - python-lxml + - tesseract-ocr + - git + os: debian + +- boot: + namespace: tlxc + prompts: + - "root@(.*):/#" + - "hikey:/" + timeout: + minutes: 5 + method: lxc + +- test: + namespace: tlxc + timeout: + minutes: 10 + definitions: + - repository: https://git.linaro.org/qa/test-definitions.git + from: git + path: automated/linux/android-platform-tools/install.yaml + name: install-android-platform-tools-r2600 + parameters: + LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip' + +- deploy: + timeout: + minutes: 20 + to: fastboot + namespace: hikey-oe + connection: lxc + images: + ptable: + url: ${PTABLE_URL} + reboot: hard-reset + # Reflashing fip.bin doesn't seem to work atm + #fastboot: + # url: ${FIP_URL} + # reboot: hard-reset + boot: + url: ${BOOT_URL} + reboot: hard-reset + system: + url: ${SYSTEM_URL} + compression: gz + apply-overlay: true + os: oe + protocols: + lava-lxc: + - action: fastboot-deploy + request: pre-power-command + timeout: + minutes: 2 + +- boot: + namespace: hikey-oe + auto_login: + login_prompt: "login:" + username: root + prompts: + - "root@hikey:~#" + timeout: + minutes: 5 + method: grub + commands: installed + protocols: + lava-lxc: + - action: grub-sequence-action + request: pre-os-command + timeout: + minutes: 2 + +- test: + namespace: hikey-oe + timeout: + minutes: 20 + definitions: + - from: inline + repository: + metadata: + format: Lava-Test Test Definition 1.0 + name: basic-tests + description: "Basic tests after hikey boots to the shell prompt" + run: + steps: + - lava-test-case ps --shell ps aux + - lava-test-case hikey-dmesg --shell dmesg + - lava-test-case weston-status --shell test -f /run/user/1000/weston.log + # Prevent Weston enter "inactive mode" + - echo -e "idle-time=0" >> /etc/xdg/weston/weston.ini + - cat /etc/xdg/weston/weston.ini + - lava-test-case prevent-weston-enter-inactive-mode-and-restart-it --shell systemctl restart weston@linaro + name: basic-tests + path: inline/basic-tests.yaml + +- test: + namespace: tlxc + timeout: + minutes: 40 + definitions: + - repository: https://git.linaro.org/people/arthur.she/test-definitions.git + from: git + path: openembedded/robotframework-lxc.yaml + name: robotframework-lxc + params: + RF_TEST_CASE: "weston-simple-egl/weston-simple-egl-test.robot,gst-wayland-test/gst-wayland-test.robot,browser-test/chromium-browser-test.robot,youtube-test/youtube-test.robot,webgl-test/webgl-test.robot,x-test/xtest-benchmark.robot,x-test/xtest-regression.robot,eme-test/eme-clearkey-test.robot" + RF_TEST_CASES_REPO: "https://github.com/linaro-mmwg/lhg-robotframework-test.git" diff --git a/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-tests-morty.yaml b/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-tests-morty.yaml deleted file mode 100644 index af9acc2293..0000000000 --- a/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-tests-morty.yaml +++ /dev/null @@ -1,150 +0,0 @@ -device_type: hi6220-hikey-r2 -tags: - - static-ip - - 4k-hdmi-dongle - - usb-mouse -job_name: lhg-oe-robotframework-tests-${MANIFEST_BRANCH}-${BUILD_NUMBER} -timeouts: - job: - minutes: 40 - action: - minutes: 20 - connection: - minutes: 5 -priority: high -visibility: public - -metadata: - manifest branch: ${MANIFEST_BRANCH} - build-url: ${BUILD_URL} - build-location: ${BASE_URL}/${PUB_DEST} - -protocols: - lava-lxc: - name: lxc-hikey-test - distribution: ubuntu - release: xenial - arch: amd64 - verbose: true - -actions: -- deploy: - namespace: tlxc - timeout: - minutes: 20 - to: lxc - packages: - - wget - - unzip - - python-opencv - - python-pip - - libffi-dev - - libssl-dev - - python-lxml - - tesseract-ocr - - git - os: debian - -- boot: - namespace: tlxc - prompts: - - "root@(.*):/#" - - "hikey:/" - timeout: - minutes: 5 - method: lxc - -- test: - namespace: tlxc - timeout: - minutes: 10 - definitions: - - repository: https://git.linaro.org/qa/test-definitions.git - from: git - path: automated/linux/android-platform-tools/install.yaml - name: install-android-platform-tools-r2600 - parameters: - LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip' - -- deploy: - timeout: - minutes: 20 - to: fastboot - namespace: hikey-oe - connection: lxc - images: - ptable: - url: ${PTABLE_URL} - reboot: hard-reset - # Reflashing fip.bin doesn't seem to work atm - #fastboot: - # url: ${FIP_URL} - # reboot: hard-reset - boot: - url: ${BOOT_URL} - reboot: hard-reset - system: - url: ${SYSTEM_URL} - compression: gz - apply-overlay: true - os: oe - protocols: - lava-lxc: - - action: fastboot-deploy - request: pre-power-command - timeout: - minutes: 2 - -- boot: - namespace: hikey-oe - auto_login: - login_prompt: "login:" - username: root - prompts: - - "root@hikey:~#" - timeout: - minutes: 5 - method: grub - commands: installed - protocols: - lava-lxc: - - action: grub-sequence-action - request: pre-os-command - timeout: - minutes: 2 - -- test: - namespace: hikey-oe - timeout: - minutes: 20 - definitions: - - from: inline - repository: - metadata: - format: Lava-Test Test Definition 1.0 - name: basic-tests - description: "Basic tests after hikey boots to the shell prompt" - run: - steps: - - lava-test-case ps --shell ps aux - - lava-test-case hikey-dmesg --shell dmesg - - lava-test-case weston-status --shell test -f /run/user/1000/weston.log - # Prevent Weston enter "inactive mode" - - echo -e "idle-time=0" >> /etc/xdg/weston/weston.ini - - cat /etc/xdg/weston/weston.ini - - lava-test-case prevent-weston-enter-inactive-mode-and-restart-it --shell systemctl restart weston@linaro - name: basic-tests - path: inline/basic-tests.yaml - -- test: - namespace: tlxc - timeout: - minutes: 40 - definitions: - - repository: https://git.linaro.org/people/arthur.she/test-definitions.git - from: git - path: openembedded/robotframework-lxc.yaml - name: robotframework-lxc - params: - RF_TEST_CASE: "weston-simple-egl/weston-simple-egl-test.robot,gst-wayland-test/gst-wayland-test.robot,browser-test/chromium-browser-test.robot,youtube-test/youtube-test.robot,webgl-test/webgl-test.robot,x-test/xtest-benchmark.robot,x-test/xtest-regression.robot,eme-test/eme-clearkey-test.robot" - RF_TEST_CASES_REPO: "https://github.com/linaro-mmwg/lhg-robotframework-test.git" diff --git a/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-tests-rocko.yaml b/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-tests-rocko.yaml deleted file mode 100644 index af9acc2293..0000000000 --- a/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-tests-rocko.yaml +++ /dev/null @@ -1,150 +0,0 @@ -device_type: hi6220-hikey-r2 -tags: - - static-ip - - 4k-hdmi-dongle - - usb-mouse -job_name: lhg-oe-robotframework-tests-${MANIFEST_BRANCH}-${BUILD_NUMBER} -timeouts: - job: - minutes: 40 - action: - minutes: 20 - connection: - minutes: 5 -priority: high -visibility: public - -metadata: - manifest branch: ${MANIFEST_BRANCH} - build-url: ${BUILD_URL} - build-location: ${BASE_URL}/${PUB_DEST} - -protocols: - lava-lxc: - name: lxc-hikey-test - distribution: ubuntu - release: xenial - arch: amd64 - verbose: true - -actions: -- deploy: - namespace: tlxc - timeout: - minutes: 20 - to: lxc - packages: - - wget - - unzip - - python-opencv - - python-pip - - libffi-dev - - libssl-dev - - python-lxml - - tesseract-ocr - - git - os: debian - -- boot: - namespace: tlxc - prompts: - - "root@(.*):/#" - - "hikey:/" - timeout: - minutes: 5 - method: lxc - -- test: - namespace: tlxc - timeout: - minutes: 10 - definitions: - - repository: https://git.linaro.org/qa/test-definitions.git - from: git - path: automated/linux/android-platform-tools/install.yaml - name: install-android-platform-tools-r2600 - parameters: - LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip' - -- deploy: - timeout: - minutes: 20 - to: fastboot - namespace: hikey-oe - connection: lxc - images: - ptable: - url: ${PTABLE_URL} - reboot: hard-reset - # Reflashing fip.bin doesn't seem to work atm - #fastboot: - # url: ${FIP_URL} - # reboot: hard-reset - boot: - url: ${BOOT_URL} - reboot: hard-reset - system: - url: ${SYSTEM_URL} - compression: gz - apply-overlay: true - os: oe - protocols: - lava-lxc: - - action: fastboot-deploy - request: pre-power-command - timeout: - minutes: 2 - -- boot: - namespace: hikey-oe - auto_login: - login_prompt: "login:" - username: root - prompts: - - "root@hikey:~#" - timeout: - minutes: 5 - method: grub - commands: installed - protocols: - lava-lxc: - - action: grub-sequence-action - request: pre-os-command - timeout: - minutes: 2 - -- test: - namespace: hikey-oe - timeout: - minutes: 20 - definitions: - - from: inline - repository: - metadata: - format: Lava-Test Test Definition 1.0 - name: basic-tests - description: "Basic tests after hikey boots to the shell prompt" - run: - steps: - - lava-test-case ps --shell ps aux - - lava-test-case hikey-dmesg --shell dmesg - - lava-test-case weston-status --shell test -f /run/user/1000/weston.log - # Prevent Weston enter "inactive mode" - - echo -e "idle-time=0" >> /etc/xdg/weston/weston.ini - - cat /etc/xdg/weston/weston.ini - - lava-test-case prevent-weston-enter-inactive-mode-and-restart-it --shell systemctl restart weston@linaro - name: basic-tests - path: inline/basic-tests.yaml - -- test: - namespace: tlxc - timeout: - minutes: 40 - definitions: - - repository: https://git.linaro.org/people/arthur.she/test-definitions.git - from: git - path: openembedded/robotframework-lxc.yaml - name: robotframework-lxc - params: - RF_TEST_CASE: "weston-simple-egl/weston-simple-egl-test.robot,gst-wayland-test/gst-wayland-test.robot,browser-test/chromium-browser-test.robot,youtube-test/youtube-test.robot,webgl-test/webgl-test.robot,x-test/xtest-benchmark.robot,x-test/xtest-regression.robot,eme-test/eme-clearkey-test.robot" - RF_TEST_CASES_REPO: "https://github.com/linaro-mmwg/lhg-robotframework-test.git" -- cgit v1.2.3