diff options
author | Fathi Boudra <fathi.boudra@linaro.org> | 2017-11-23 14:49:47 +0200 |
---|---|---|
committer | Fathi Boudra <fathi.boudra@linaro.org> | 2017-11-23 14:49:47 +0200 |
commit | c38702eac3d37184169f9caf776f10f10400588e (patch) | |
tree | e6fe995d2a14acf99221a3c4c987620557d67b36 | |
parent | f492c1605219c2f821ff23f4aae89d20fc4c19c2 (diff) |
lt-qcom: move submit for testing into their own scripts
It's easier to compare and consistent with the other jobs.
Change-Id: I6aab51123c30b5c47abb5fddd76e72ff84f3a860
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
-rw-r--r-- | lt-qcom-debian-images-dragonboard410c.yaml | 38 | ||||
-rw-r--r-- | lt-qcom-debian-images/submit_for_testing.sh | 35 | ||||
-rw-r--r-- | lt-qcom-openembedded-rpb-morty.yaml | 50 | ||||
-rwxr-xr-x | lt-qcom-openembedded/submit_for_testing.sh | 47 |
4 files changed, 86 insertions, 84 deletions
diff --git a/lt-qcom-debian-images-dragonboard410c.yaml b/lt-qcom-debian-images-dragonboard410c.yaml index 6d657e349c..18ecb4c9e1 100644 --- a/lt-qcom-debian-images-dragonboard410c.yaml +++ b/lt-qcom-debian-images-dragonboard410c.yaml @@ -108,42 +108,8 @@ --server ${PUBLISH_SERVER} \ --link-latest \ out snapshots/dragonboard410c/${VENDOR}/debian/${BUILD_NUMBER} - - shell: | - #!/bin/bash - - rm -rf configs - git clone --depth 1 http://git.linaro.org/ci/job/configs.git - - # main parameters - export DEPLOY_OS=debian - export OS_INFO=debian-${OS_FLAVOUR} - export BOOT_OS_PROMPT=\'root@linaro-alip:~#\' - - # boot and rootfs parameters - export PUB_DEST=https://builds.96boards.org/snapshots/dragonboard410c/${VENDOR}/debian/${BUILD_NUMBER} - - export BOOT_URL=${PUB_DEST}/boot-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${BUILD_NUMBER}.img.gz - export BOOT_URL_COMP="gz" - export LXC_BOOT_FILE=`basename ${BOOT_URL} .gz` - export ROOTFS_URL=${PUB_DEST}/${VENDOR}-${OS_FLAVOUR}-alip-${PLATFORM_NAME}-${BUILD_NUMBER}.img.gz - export ROOTFS_URL_COMP="gz" - export LXC_ROOTFS_FILE=`basename ${ROOTFS_URL} .gz` - - # XXX: the debian rootfs images are build small as possible, resize - # to be able install LAVA test overlay, by now to 3GB is enough - export RESIZE_ROOTFS=3G - - python configs/openembedded-lkft/submit_for_testing.py \ - --device-type ${DEVICE_TYPE} \ - --build-number ${BUILD_NUMBER} \ - --lava-server ${LAVA_SERVER} \ - --qa-server ${QA_SERVER} \ - --qa-server-team qcomlt \ - --qa-server-project ${OS_INFO} \ - --git-commit ${BUILD_NUMBER} \ - --template-path configs/lt-qcom/lava-job-definitions \ - --template-base-pre base_template.yaml \ - --template-names template.yaml template-wifi.yaml template-bt.yaml + - shell: + !include-raw: lt-qcom-debian-images/submit_for_testing.sh publishers: - groovy-postbuild: script: diff --git a/lt-qcom-debian-images/submit_for_testing.sh b/lt-qcom-debian-images/submit_for_testing.sh new file mode 100644 index 0000000000..a44785efea --- /dev/null +++ b/lt-qcom-debian-images/submit_for_testing.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +rm -rf configs +git clone --depth 1 http://git.linaro.org/ci/job/configs.git + +# main parameters +export DEPLOY_OS=debian +export OS_INFO=debian-${OS_FLAVOUR} +export BOOT_OS_PROMPT=\'root@linaro-alip:~#\' + +# boot and rootfs parameters +export PUB_DEST=https://builds.96boards.org/snapshots/dragonboard410c/${VENDOR}/debian/${BUILD_NUMBER} + +export BOOT_URL=${PUB_DEST}/boot-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${BUILD_NUMBER}.img.gz +export BOOT_URL_COMP="gz" +export LXC_BOOT_FILE=$(basename ${BOOT_URL} .gz) +export ROOTFS_URL=${PUB_DEST}/${VENDOR}-${OS_FLAVOUR}-alip-${PLATFORM_NAME}-${BUILD_NUMBER}.img.gz +export ROOTFS_URL_COMP="gz" +export LXC_ROOTFS_FILE=$(basename ${ROOTFS_URL} .gz) + +# XXX: the debian rootfs images are build small as possible, resize +# to be able install LAVA test overlay, by now to 3GB is enough +export RESIZE_ROOTFS=3G + +python configs/openembedded-lkft/submit_for_testing.py \ + --device-type ${DEVICE_TYPE} \ + --build-number ${BUILD_NUMBER} \ + --lava-server ${LAVA_SERVER} \ + --qa-server ${QA_SERVER} \ + --qa-server-team qcomlt \ + --qa-server-project ${OS_INFO} \ + --git-commit ${BUILD_NUMBER} \ + --template-path configs/lt-qcom/lava-job-definitions \ + --template-base-pre base_template.yaml \ + --template-names template.yaml template-wifi.yaml template-bt.yaml diff --git a/lt-qcom-openembedded-rpb-morty.yaml b/lt-qcom-openembedded-rpb-morty.yaml index 6132ece61f..38093afa99 100644 --- a/lt-qcom-openembedded-rpb-morty.yaml +++ b/lt-qcom-openembedded-rpb-morty.yaml @@ -94,54 +94,8 @@ host: builds.96boards.org - shell: !include-raw: rpb-openembedded/publishers.sh - - shell: | - rm -rf configs - git clone --depth 1 http://git.linaro.org/ci/job/configs.git - - # main parameters - export DEPLOY_OS=oe - export OS_INFO=openembedded-${DISTRO}-${MANIFEST_BRANCH} - export BOOT_OS_PROMPT=\'root@dragonboard-410c:~#\' - - # boot and rootfs parameters, BOOT_URL comes from builders.sh - # and has not compression - export BOOT_URL_COMP= - export LXC_BOOT_FILE=`basename ${BOOT_URL}` - - export ROOTFS_URL=${ROOTFS_SPARSE_BUILD_URL} - export ROOTFS_URL_COMP="gz" - export LXC_ROOTFS_FILE=`basename ${ROOTFS_URL} .gz` - export RESIZE_ROOTFS= - - case "${MACHINE}" in - dragonboard-410c) - export DEVICE_TYPE="${MACHINE}" - - case "${DISTRO}" in - rpb) - python configs/openembedded-lkft/submit_for_testing.py \ - --device-type ${DEVICE_TYPE} \ - --build-number ${BUILD_NUMBER} \ - --lava-server ${LAVA_SERVER} \ - --qa-server ${QA_SERVER} \ - --qa-server-team qcomlt \ - --qa-server-project openembedded-rpb-morty \ - --env-suffix="-${DISTRO}" \ - --git-commit ${BUILD_NUMBER} \ - --template-path configs/lt-qcom/lava-job-definitions \ - --template-base-pre base_template.yaml \ - --template-names template.yaml template-wifi.yaml template-bt.yaml template-ptest.yaml - ;; - rpb-wayland) - echo "Currently no tests for rpb-wayland" - ;; - esac - - ;; - *) - echo "Skip DEVICE_TYPE for ${MACHINE}" - ;; - esac + - shell: + !include-raw: lt-qcom-openembedded/submit_for_testing.sh publishers: - groovy-postbuild: script: diff --git a/lt-qcom-openembedded/submit_for_testing.sh b/lt-qcom-openembedded/submit_for_testing.sh new file mode 100755 index 0000000000..a9a28575e9 --- /dev/null +++ b/lt-qcom-openembedded/submit_for_testing.sh @@ -0,0 +1,47 @@ +#!/bin/bash + +rm -rf configs +git clone --depth 1 http://git.linaro.org/ci/job/configs.git + +# main parameters +export DEPLOY_OS=oe +export OS_INFO=openembedded-${DISTRO}-${MANIFEST_BRANCH} +export BOOT_OS_PROMPT=\'root@dragonboard-410c:~#\' + +# boot and rootfs parameters, BOOT_URL comes from builders.sh +# and has not compression +export BOOT_URL_COMP= +export LXC_BOOT_FILE=$(basename ${BOOT_URL}) + +export ROOTFS_URL=${ROOTFS_SPARSE_BUILD_URL} +export ROOTFS_URL_COMP="gz" +export LXC_ROOTFS_FILE=$(basename ${ROOTFS_URL} .gz) +export RESIZE_ROOTFS= + +case "${MACHINE}" in + dragonboard-410c) + export DEVICE_TYPE="${MACHINE}" + case "${DISTRO}" in + rpb) + python configs/openembedded-lkft/submit_for_testing.py \ + --device-type ${DEVICE_TYPE} \ + --build-number ${BUILD_NUMBER} \ + --lava-server ${LAVA_SERVER} \ + --qa-server ${QA_SERVER} \ + --qa-server-team qcomlt \ + --qa-server-project openembedded-rpb-morty \ + --env-suffix="-${DISTRO}" \ + --git-commit ${BUILD_NUMBER} \ + --template-path configs/lt-qcom/lava-job-definitions \ + --template-base-pre base_template.yaml \ + --template-names template.yaml template-wifi.yaml template-bt.yaml template-ptest.yaml + ;; + rpb-wayland) + echo "Currently no tests for rpb-wayland" + ;; + esac + ;; + *) + echo "Skip DEVICE_TYPE for ${MACHINE}" + ;; +esac |