diff options
| -rw-r--r-- | lkft-hikey-aosp-4.4.yaml | 170 | ||||
| -rw-r--r-- | lkft-hikey-aosp-4.9.yaml | 172 | ||||
| -rw-r--r-- | lkft/hikey-aosp/builders.sh | 6 | ||||
| -rw-r--r-- | lkft/lava-job-definitions/hi6220-hikey/template-boot.yaml (renamed from lkft/lava-job-definitions/hikey-aosp/template-boot.yaml) | 21 | ||||
| -rw-r--r-- | lkft/lava-job-definitions/hi6220-hikey/template-cts.yaml (renamed from lkft/lava-job-definitions/hikey-aosp/template-cts.yaml) | 29 | ||||
| -rw-r--r-- | lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part1.yaml (renamed from lkft/lava-job-definitions/hikey-aosp/template-vts-kernel-part1.yaml) | 23 | ||||
| -rw-r--r-- | lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part2.yaml (renamed from lkft/lava-job-definitions/hikey-aosp/template-vts-kernel-part2.yaml) | 23 | ||||
| -rw-r--r-- | lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part3.yaml (renamed from lkft/lava-job-definitions/hikey-aosp/template-vts-kernel-part3.yaml) | 23 | ||||
| -rw-r--r-- | openembedded-lkft/submit_for_testing.py | 33 |
9 files changed, 218 insertions, 282 deletions
diff --git a/lkft-hikey-aosp-4.4.yaml b/lkft-hikey-aosp-4.4.yaml index 086c36364c..7acc73fceb 100644 --- a/lkft-hikey-aosp-4.4.yaml +++ b/lkft-hikey-aosp-4.4.yaml @@ -20,12 +20,18 @@ - string: name: KERNEL_BRANCH default: 'android-hikey-linaro-4.4' + - string: + name: KERNEL_REPO + default: 'https://android.googlesource.com/kernel/hikey-linaro' + - string: + name: QA_SERVER + default: 'https://qa-reports.linaro.org' disabled: false node: docker-xenial-aosp display-name: 'LKFT - AOSP 4.4 (Android)' scm: - git: - url: https://android.googlesource.com/kernel/hikey-linaro + url: ${KERNEL_REPO} refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH} name: origin branches: @@ -39,10 +45,19 @@ name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}' - timeout: timeout: 500 + - credentials-binding: + - text: + credential-id: QA_REPORTS_TOKEN + variable: QA_REPORTS_TOKEN + - text: + credential-id: ARTIFACTORIAL_TOKEN + variable: ARTIFACTORIAL_TOKEN builders: - shell: !include-raw: - lkft/hikey-aosp/builders.sh + - inject: + properties-file: injected_build_variables - linaro-publish-token - shell: | #!/bin/bash @@ -60,121 +75,46 @@ PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER} - # Construct post-build-lava parameters - cat << EOF > ${WORKSPACE}/post_build_lava_parameters - DEVICE_TYPE=hi6220-hikey - TARGET_PRODUCT=hikey - MAKE_TARGETS=droidcore - REFERENCE_BUILD_URL=${REFERENCE_BUILD_URL} - JOB_NAME=${JOB_NAME} - BUILD_NUMBER=${BUILD_NUMBER} - BUILD_URL=${BUILD_URL} - LAVA_SERVER=lkft.validation.linaro.org/RPC2/ - FRONTEND_JOB_NAME=${JOB_NAME} - DOWNLOAD_URL=https://snapshots.linaro.org/${PUB_DEST} - CTS_MODULE_NAME=CtsBionicTestCases - CUSTOM_JSON_URL=https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/lkft/lava-job-definitions/hikey-aosp/template-boot.yaml - EOF - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/lkft/lava-job-definitions/hikey-aosp/template-vts-kernel-part1.yaml#g" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/lkft/lava-job-definitions/hikey-aosp/template-vts-kernel-part2.yaml#g" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/lkft/lava-job-definitions/hikey-aosp/template-vts-kernel-part3.yaml#g" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/lkft/lava-job-definitions/hikey-aosp/template-cts.yaml#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsVmTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsCompilationTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsDramTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsHardwareTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsJobSchedulerTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsOsTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsPermissionTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsPermission2TestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsSecurityTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsUsbTests#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsFileSystemTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsLibcoreTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true + export DEVICE_TYPE=hi6220-hikey + export LAVA_SERVER=https://lkft.validation.linaro.org/RPC2/ + export PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER} + export DOWNLOAD_URL=https://snapshots.linaro.org/${PUB_DEST} + + rm -rf configs + git clone --depth 1 http://git.linaro.org/ci/job/configs.git + + 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 lkft \ + --qa-server-project "aosp-${KERNEL_BRANCH}" \ + --git-commit ${KERNEL_COMMIT} \ + --template-path configs/lkft/lava-job-definitions \ + --template-names template-boot.yaml template-vts-kernel-part1.yaml template-vts-kernel-part2.yaml template-vts-kernel-part3.yaml \ + --quiet + + for CTS_MODULE_NAME in CtsVmTestCases CtsLibcoreTiestCases CtsBionicTestCases \ + CtsCompilationTestCases CtsDramTestCases CtsFileSystemTestCases \ + CtsHardwareTestCases CtsJobSchedulerTestCases CtsOsTestCases \ + CtsPermissionTestCases CtsPermission2TestCases CtsSecurityTestCases \ + CtsUsbTests + do + export CTS_MODULE_NAME=${CTS_MODULE_NAME} + 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 lkft \ + --qa-server-project "aosp-${KERNEL_BRANCH}" \ + --git-commit ${KERNEL_COMMIT} \ + --template-path configs/lkft/lava-job-definitions \ + --template-names template-cts.yaml \ + --quiet + done publishers: - logparser: parse-rules: '/var/lib/jenkins/userContent/android.parse' diff --git a/lkft-hikey-aosp-4.9.yaml b/lkft-hikey-aosp-4.9.yaml index 977defc72b..eca0acda43 100644 --- a/lkft-hikey-aosp-4.9.yaml +++ b/lkft-hikey-aosp-4.9.yaml @@ -20,12 +20,18 @@ - string: name: KERNEL_BRANCH default: 'android-hikey-linaro-4.9' + - string: + name: KERNEL_REPO + default: 'https://android.googlesource.com/kernel/hikey-linaro' + - string: + name: QA_SERVER + default: 'https://qa-reports.linaro.org' disabled: false node: docker-xenial-aosp display-name: 'LKFT - AOSP 4.9 (Android)' scm: - git: - url: https://android.googlesource.com/kernel/hikey-linaro + url: ${KERNEL_REPO} refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH} name: origin branches: @@ -39,10 +45,19 @@ name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}' - timeout: timeout: 500 + - credentials-binding: + - text: + credential-id: QA_REPORTS_TOKEN + variable: QA_REPORTS_TOKEN + - text: + credential-id: ARTIFACTORIAL_TOKEN + variable: ARTIFACTORIAL_TOKEN builders: - shell: !include-raw: - lkft/hikey-aosp/builders.sh + - inject: + properties-file: injected_build_variables - linaro-publish-token - shell: | #!/bin/bash @@ -60,122 +75,47 @@ PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER} - # Construct post-build-lava parameters - cat << EOF > ${WORKSPACE}/post_build_lava_parameters - DEVICE_TYPE=hi6220-hikey - TARGET_PRODUCT=hikey - MAKE_TARGETS=droidcore - JOB_NAME=${JOB_NAME} - REFERENCE_BUILD_URL=${REFERENCE_BUILD_URL} - BUILD_NUMBER=${BUILD_NUMBER} - BUILD_URL=${BUILD_URL} - LAVA_SERVER=lkft.validation.linaro.org/RPC2/ - FRONTEND_JOB_NAME=${JOB_NAME} - DOWNLOAD_URL=https://snapshots.linaro.org/${PUB_DEST} - REFERENCE_BUILD_URL=${REFERENCE_BUILD_URL} - CTS_MODULE_NAME=CtsBionicTestCases - CUSTOM_JSON_URL=https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/lkft/lava-job-definitions/hikey-aosp/template-boot.yaml - EOF - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/lkft/lava-job-definitions/hikey-aosp/template-vts-kernel-part1.yaml#g" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/lkft/lava-job-definitions/hikey-aosp/template-vts-kernel-part2.yaml#g" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/lkft/lava-job-definitions/hikey-aosp/template-vts-kernel-part3.yaml#g" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/lkft/lava-job-definitions/hikey-aosp/template-cts.yaml#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsVmTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsCompilationTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsDramTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsHardwareTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsJobSchedulerTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsOsTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsPermissionTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsPermission2TestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsSecurityTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsUsbTests#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsFileSystemTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true - - shell: | - sed -i "s#CTS_MODULE_NAME=.*#CTS_MODULE_NAME=CtsLibcoreTestCases#" ${WORKSPACE}/post_build_lava_parameters - - trigger-builds: - - project: 'post-build-lava' - property-file: post_build_lava_parameters - block: true + export DEVICE_TYPE=hi6220-hikey + export LAVA_SERVER=https://lkft.validation.linaro.org/RPC2/ + export PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER} + export DOWNLOAD_URL=https://snapshots.linaro.org/${PUB_DEST} + + rm -rf configs + git clone --depth 1 http://git.linaro.org/ci/job/configs.git + + 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 lkft \ + --qa-server-project "aosp-${KERNEL_BRANCH}" \ + --git-commit ${KERNEL_COMMIT} \ + --template-path configs/lkft/lava-job-definitions \ + --template-names template-boot.yaml template-vts-kernel-part1.yaml template-vts-kernel-part2.yaml template-vts-kernel-part3.yaml \ + --quiet + + for CTS_MODULE_NAME in CtsVmTestCases CtsLibcoreTiestCases CtsBionicTestCases \ + CtsCompilationTestCases CtsDramTestCases CtsFileSystemTestCases \ + CtsHardwareTestCases CtsJobSchedulerTestCases CtsOsTestCases \ + CtsPermissionTestCases CtsPermission2TestCases CtsSecurityTestCases \ + CtsUsbTests + do + export CTS_MODULE_NAME=${CTS_MODULE_NAME} + 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 lkft \ + --qa-server-project "aosp-${KERNEL_BRANCH}" \ + --git-commit ${KERNEL_COMMIT} \ + --template-path configs/lkft/lava-job-definitions \ + --template-names template-cts.yaml \ + --quiet + done + publishers: - logparser: parse-rules: '/var/lib/jenkins/userContent/android.parse' diff --git a/lkft/hikey-aosp/builders.sh b/lkft/hikey-aosp/builders.sh index 4cf0260abe..9265a0aec9 100644 --- a/lkft/hikey-aosp/builders.sh +++ b/lkft/hikey-aosp/builders.sh @@ -24,6 +24,12 @@ xz out/boot.img wget -q ${REFERENCE_BUILD_URL}/build_config.json -O out/build_config.json remote=$(git remote -v | grep push | cut -d" " -f1 | cut -f2) commit=$(git log | grep commit | cut -d" " -f2) +describe=$(git describe) sed -i "s|\"kernel_repo\" : \"|\"kernel_repo\" : \"$remote|g" out/build_config.json sed -i "s|\"kernel_commit_id\" : \"|\"kernel_commit_id\" : \"$commit|g" out/build_config.json sed -i "s|\"kernel_branch\" : \"|\"kernel_branch\" : \"$KERNEL_BRANCH|g" out/build_config.json + +cat << EOF > ${WORKSPACE}/injected_build_variables +KERNEL_COMMIT=${commit} +KERNEL_DESCRIBE="${describe}" +EOF diff --git a/lkft/lava-job-definitions/hikey-aosp/template-boot.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-boot.yaml index 46c61d9671..8f73210364 100644 --- a/lkft/lava-job-definitions/hikey-aosp/template-boot.yaml +++ b/lkft/lava-job-definitions/hi6220-hikey/template-boot.yaml @@ -1,5 +1,5 @@ device_type: hi6220-hikey -job_name: "%%JOB_NAME%%-%%ANDROID_META_BUILD%%-basic" +job_name: "lkft-android-${KERNEL_BRANCH}-${BUILD_NUMBER}-boot" tags: - aosp-only @@ -15,8 +15,15 @@ priority: medium visibility: personal metadata: - source: https://git.linaro.org/lava-team/refactoring.git - path: hi6220-hikey.yaml + android.build: "${BUILD_NUMBER}" + android.name: "${JOB_NAME}" + android.url: "${BUILD_URL}" + kernel-branch: "${KERNEL_BRANCH}" + kernel-repo: "${KERNEL_REPO}" + kernel-commit: "${KERNEL_COMMIT}" + kernel-describe: "${KERNEL_DESCRIBE}" + build-url: "${BUILD_URL}" + series: lkft protocols: lava-lxc: @@ -55,16 +62,16 @@ actions: ptable: url: http://builds.96boards.org/snapshots/reference-platform/components/uefi/latest/release/hikey/ptable-aosp-8g.img boot: - url: "%%DOWNLOAD_URL%%/boot.img.xz" + url: "${DOWNLOAD_URL}/boot.img.xz" compression: xz cache: - url: "%%REFERENCE_BUILD_URL%%/cache.img.xz" + url: "${REFERENCE_BUILD_URL}/cache.img.xz" compression: xz userdata: - url: "%%REFERENCE_BUILD_URL%%/userdata.img.xz" + url: "${REFERENCE_BUILD_URL}/userdata.img.xz" compression: xz system: - url: "%%REFERENCE_BUILD_URL%%/system.img.xz" + url: "${REFERENCE_BUILD_URL}/system.img.xz" compression: xz os: debian diff --git a/lkft/lava-job-definitions/hikey-aosp/template-cts.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-cts.yaml index 818a9cde03..3a87d1278b 100644 --- a/lkft/lava-job-definitions/hikey-aosp/template-cts.yaml +++ b/lkft/lava-job-definitions/hi6220-hikey/template-cts.yaml @@ -1,7 +1,7 @@ device_type: hi6220-hikey tags: - aosp-only -job_name: "%%JOB_NAME%%-%%ANDROID_META_BUILD%%-%%CTS_MODULE_NAME%%" +job_name: "lkft-android-${KERNEL_BRANCH}-${BUILD_NUMBER}-cts-${CTS_MODULE_NAME}" timeouts: job: minutes: 360 @@ -15,12 +15,19 @@ visibility: - lkft secrets: - ARTIFACTORIAL_TOKEN: "%%ARTIFACTORIAL_TOKEN%%" + ARTIFACTORIAL_TOKEN: "${ARTIFACTORIAL_TOKEN}" metadata: - android.build: "%%ANDROID_META_BUILD%%" - android.name: "%%ANDROID_META_NAME%%" - android.url: "%%ANDROID_META_URL%%" + android.build: "${BUILD_NUMBER}" + android.name: "${JOB_NAME}" + android.url: "${BUILD_URL}" + kernel-branch: "${KERNEL_BRANCH}" + kernel-version: "${KERNEL_VERSION}" + kernel-repo: "${KERNEL_REPO}" + kernel-commit: "${KERNEL_COMMIT}" + kernel-describe: "${KERNEL_DESCRIBE}" + build-url: "${BUILD_URL}" + series: lkft protocols: lava-lxc: @@ -63,16 +70,16 @@ actions: ptable: url: http://builds.96boards.org/snapshots/reference-platform/components/uefi/latest/release/hikey/ptable-aosp-8g.img boot: - url: "%%DOWNLOAD_URL%%/boot.img.xz" + url: "${DOWNLOAD_URL}/boot.img.xz" compression: xz cache: - url: "%%REFERENCE_BUILD_URL%%/cache.img.xz" + url: "${REFERENCE_BUILD_URL}/cache.img.xz" compression: xz userdata: - url: "%%REFERENCE_BUILD_URL%%/userdata.img.xz" + url: "${REFERENCE_BUILD_URL}/userdata.img.xz" compression: xz system: - url: "%%REFERENCE_BUILD_URL%%/system.img.xz" + url: "${REFERENCE_BUILD_URL}/system.img.xz" compression: xz os: debian @@ -96,7 +103,7 @@ actions: from: git path: automated/android/tradefed/tradefed.yaml params: - TEST_PARAMS: "run cts --include-filter %%CTS_MODULE_NAME%% --disable-reboot --skip-preconditions --skip-device-info" + TEST_PARAMS: "run cts --include-filter ${CTS_MODULE_NAME} --disable-reboot --skip-preconditions --skip-device-info" TEST_URL: "http://snapshots.linaro.org/android/android-cts/hikey-userdebug/1/android-cts.zip" TEST_PATH: "android-cts" - name: "%%CTS_MODULE_NAME%%" + name: "${CTS_MODULE_NAME}" diff --git a/lkft/lava-job-definitions/hikey-aosp/template-vts-kernel-part1.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part1.yaml index 0673e02d40..1fb36a8f3b 100644 --- a/lkft/lava-job-definitions/hikey-aosp/template-vts-kernel-part1.yaml +++ b/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part1.yaml @@ -1,5 +1,5 @@ device_type: hi6220-hikey -job_name: "%%JOB_NAME%%-%%ANDROID_META_BUILD%%-vts-kernel-part1" +job_name: "lkft-android-${KERNEL_BRANCH}-${BUILD_NUMBER}-vts-kernel-syscalls" tags: - aosp-only @@ -15,8 +15,15 @@ priority: medium visibility: personal metadata: - source: https://git.linaro.org/lava-team/refactoring.git - path: hi6220-hikey.yaml + android.build: "${BUILD_NUMBER}" + android.name: "${JOB_NAME}" + android.url: "${BUILD_URL}" + kernel-branch: "${KERNEL_BRANCH}" + kernel-repo: "${KERNEL_REPO}" + kernel-commit: "${KERNEL_COMMIT}" + kernel-describe: "${KERNEL_DESCRIBE}" + build-url: "${BUILD_URL}" + series: lkft protocols: lava-lxc: @@ -27,7 +34,7 @@ protocols: verbose: true secrets: - ARTIFACTORIAL_TOKEN: "%%ARTIFACTORIAL_TOKEN%%" + ARTIFACTORIAL_TOKEN: "${ARTIFACTORIAL_TOKEN}" actions: - deploy: @@ -58,16 +65,16 @@ actions: ptable: url: http://builds.96boards.org/snapshots/reference-platform/components/uefi/latest/release/hikey/ptable-aosp-8g.img boot: - url: "%%DOWNLOAD_URL%%/boot.img.xz" + url: "${DOWNLOAD_URL}/boot.img.xz" compression: xz cache: - url: "%%REFERENCE_BUILD_URL%%/cache.img.xz" + url: "${REFERENCE_BUILD_URL}/cache.img.xz" compression: xz userdata: - url: "%%REFERENCE_BUILD_URL%%/userdata.img.xz" + url: "${REFERENCE_BUILD_URL}/userdata.img.xz" compression: xz system: - url: "%%REFERENCE_BUILD_URL%%/system.img.xz" + url: "${REFERENCE_BUILD_URL}/system.img.xz" compression: xz os: debian diff --git a/lkft/lava-job-definitions/hikey-aosp/template-vts-kernel-part2.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part2.yaml index c30543f3d4..d591301004 100644 --- a/lkft/lava-job-definitions/hikey-aosp/template-vts-kernel-part2.yaml +++ b/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part2.yaml @@ -1,5 +1,5 @@ device_type: hi6220-hikey -job_name: "%%JOB_NAME%%-%%ANDROID_META_BUILD%%-vts-kernel-part2" +job_name: "lkft-android-${KERNEL_BRANCH}-${BUILD_NUMBER}-vts-kernel-ltp" tags: - aosp-only @@ -15,8 +15,15 @@ priority: medium visibility: personal metadata: - source: https://git.linaro.org/lava-team/refactoring.git - path: hi6220-hikey.yaml + android.build: "${BUILD_NUMBER}" + android.name: "${JOB_NAME}" + android.url: "${BUILD_URL}" + kernel-branch: "${KERNEL_BRANCH}" + kernel-repo: "${KERNEL_REPO}" + kernel-commit: "${KERNEL_COMMIT}" + kernel-describe: "${KERNEL_DESCRIBE}" + build-url: "${BUILD_URL}" + series: lkft protocols: lava-lxc: @@ -27,7 +34,7 @@ protocols: verbose: true secrets: - ARTIFACTORIAL_TOKEN: "%%ARTIFACTORIAL_TOKEN%%" + ARTIFACTORIAL_TOKEN: "${ARTIFACTORIAL_TOKEN}" actions: - deploy: @@ -58,16 +65,16 @@ actions: ptable: url: http://builds.96boards.org/snapshots/reference-platform/components/uefi/latest/release/hikey/ptable-aosp-8g.img boot: - url: "%%DOWNLOAD_URL%%/boot.img.xz" + url: "${DOWNLOAD_URL}/boot.img.xz" compression: xz cache: - url: "%%REFERENCE_BUILD_URL%%/cache.img.xz" + url: "${REFERENCE_BUILD_URL}/cache.img.xz" compression: xz userdata: - url: "%%REFERENCE_BUILD_URL%%/userdata.img.xz" + url: "${REFERENCE_BUILD_URL}/userdata.img.xz" compression: xz system: - url: "%%REFERENCE_BUILD_URL%%/system.img.xz" + url: "${REFERENCE_BUILD_URL}/system.img.xz" compression: xz os: debian diff --git a/lkft/lava-job-definitions/hikey-aosp/template-vts-kernel-part3.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part3.yaml index 9a51bb5cf6..69c7013fd6 100644 --- a/lkft/lava-job-definitions/hikey-aosp/template-vts-kernel-part3.yaml +++ b/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part3.yaml @@ -1,5 +1,5 @@ device_type: hi6220-hikey -job_name: "%%JOB_NAME%%-%%ANDROID_META_BUILD%%-vts-kernel-part3" +job_name: "lkft-android-${KERNEL_BRANCH}-${BUILD_NUMBER}-vts-kernel-kselftest" tags: - aosp-only @@ -15,8 +15,15 @@ priority: medium visibility: personal metadata: - source: https://git.linaro.org/lava-team/refactoring.git - path: hi6220-hikey.yaml + android.build: "${BUILD_NUMBER}" + android.name: "${JOB_NAME}" + android.url: "${BUILD_URL}" + kernel-branch: "${KERNEL_BRANCH}" + kernel-repo: "${KERNEL_REPO}" + kernel-commit: "${KERNEL_COMMIT}" + kernel-describe: "${KERNEL_DESCRIBE}" + build-url: "${BUILD_URL}" + series: lkft protocols: lava-lxc: @@ -27,7 +34,7 @@ protocols: verbose: true secrets: - ARTIFACTORIAL_TOKEN: "%%ARTIFACTORIAL_TOKEN%%" + ARTIFACTORIAL_TOKEN: "${ARTIFACTORIAL_TOKEN}" actions: - deploy: @@ -58,16 +65,16 @@ actions: ptable: url: http://builds.96boards.org/snapshots/reference-platform/components/uefi/latest/release/hikey/ptable-aosp-8g.img boot: - url: "%%DOWNLOAD_URL%%/boot.img.xz" + url: "${DOWNLOAD_URL}/boot.img.xz" compression: xz cache: - url: "%%REFERENCE_BUILD_URL%%/cache.img.xz" + url: "${REFERENCE_BUILD_URL}/cache.img.xz" compression: xz userdata: - url: "%%REFERENCE_BUILD_URL%%/userdata.img.xz" + url: "${REFERENCE_BUILD_URL}/userdata.img.xz" compression: xz system: - url: "%%REFERENCE_BUILD_URL%%/system.img.xz" + url: "${REFERENCE_BUILD_URL}/system.img.xz" compression: xz os: debian diff --git a/openembedded-lkft/submit_for_testing.py b/openembedded-lkft/submit_for_testing.py index 66653053fd..6cfcaaa9a3 100644 --- a/openembedded-lkft/submit_for_testing.py +++ b/openembedded-lkft/submit_for_testing.py @@ -22,6 +22,10 @@ def main(): help="Device type in LAVA", dest="device_type", required=True) + parser.add_argument("--env-prefix", + help="Prefix for the environment name", + dest="env_prefix", + default="") parser.add_argument("--build-number", help="Build number", dest="build_number", @@ -50,23 +54,32 @@ def main(): help="git commit ID", dest="git_commit", required=True) + parser.add_argument("--template-path", + help="Path to LAVA job templates", + dest="template_path", + default=template_base_path) parser.add_argument("--template-names", help="list of the templates to submit for testing", dest="template_names", nargs="+", default=["template.yaml"]) + parser.add_argument("--quiet", + help="Only output the final qa-reports URL", + action='store_true', + dest="quiet") args, _ = parser.parse_known_args() - print(os.environ) + if not args.quiet: + print(os.environ) qa_server_base = args.qa_server if not (qa_server_base.startswith("http://") or qa_server_base.startswith("https://")): qa_server_base = "https://" + qa_server_base qa_server_team = args.qa_server_team qa_server_project = args.qa_server_project qa_server_build = args.git_commit - qa_server_env = args.device_type + qa_server_env = args.env_prefix + args.device_type qa_server_api = "%s/api/submitjob/%s/%s/%s/%s" % ( qa_server_base, qa_server_team, @@ -82,7 +95,7 @@ def main(): "Auth-Token": args.qa_token } for test in args.template_names: - template_file_name = "%s/%s/%s" % (template_base_path, args.device_type, test) + template_file_name = "%s/%s/%s" % (args.template_path, args.device_type, test) test_template = None if os.path.exists(template_file_name): test_template_file = open(template_file_name, "r") @@ -92,25 +105,27 @@ def main(): sys.exit(1) template = Template(test_template) + print("using template: %s" % template_file_name) lava_job = template.substitute(os.environ) - print(lava_job) + if not args.quiet: + print(lava_job) try: data = { "definition": lava_job, "backend": urlsplit(lava_url_base).netloc # qa-reports backends are named as lava instances } + print("Submit to: %s" % qa_server_api) results = requests.post(qa_server_api, data=data, headers=headers) if results.status_code < 300: print("%s/testjob/%s" % (qa_server_base, results.text)) else: print(results.status_code) print(results.text) - except xmlrpclib.ProtocolError as err: + except requests.exceptions.RequestException as err: print("QA Reports submission failed") - print("offending job definition:") - print(lava_job) - print("Error code: %d" % err.errcode) - print("Error message: %s" % err.errmsg) + if not args.quiet: + print("offending job definition:") + print(lava_job) if __name__ == "__main__": |