diff options
Diffstat (limited to '.gitlab-ci/lava-gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci/lava-gitlab-ci.yml | 54 |
1 files changed, 33 insertions, 21 deletions
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 2e15e923b68..77ec9b89728 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -1,3 +1,30 @@ +variables: + DISTRIBUTION_TAG: "2020-07-06" + +.kernel+rootfs: + stage: container-2 + variables: + GIT_STRATEGY: fetch + script: + - DEBIAN_ARCH=${DEBIAN_ARCH} .gitlab-ci/container/lava_arm.sh + rules: + - when: always + +kernel+rootfs_arm64: + extends: + - .use-arm_build + - .kernel+rootfs + tags: + - aarch64 + variables: + DEBIAN_ARCH: "arm64" + +kernel+rootfs_armhf: + extends: + - kernel+rootfs_arm64 + variables: + DEBIAN_ARCH: "armhf" + .lava-test: extends: - .ci-run-policy @@ -5,22 +32,17 @@ GIT_STRATEGY: none # testing doesn't build anything from source ENV_VARS: "DEQP_PARALLEL=6" DEQP_VERSION: gles2 + ARTIFACTS_URL: "https://minio-packet.freedesktop.org/mesa-lava/${CI_PROJECT_PATH}/${DISTRIBUTION_TAG}/${ARCH}" + MESA_URL: "https://minio-packet.freedesktop.org/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}/mesa-${ARCH}.tar.gz" script: - - mkdir -p /srv/${FILES_HOST_NAME}/$CI_JOB_ID/ - - cp /lava-files/${KERNEL_IMAGE_NAME} /srv/${FILES_HOST_NAME}/$CI_JOB_ID/. - - cp /lava-files/${DEVICE_TYPE}.dtb /srv/${FILES_HOST_NAME}/$CI_JOB_ID/. - - tar -C /lava-files/rootfs-${ARCH} -xf artifacts/install.tar - - pushd /lava-files/rootfs-${ARCH} - - find -H | cpio -H newc -o | gzip -c - > /srv/${FILES_HOST_NAME}/$CI_JOB_ID/lava-rootfs-${ARCH}.cpio.gz - - popd - > artifacts/generate_lava.py \ --template artifacts/lava-deqp.yml.jinja2 \ --pipeline-info "$CI_PIPELINE_URL on $CI_COMMIT_REF_NAME ${CI_NODE_INDEX}/${CI_NODE_TOTAL}" \ - --base-artifacts-url ${FILES_HOST_URL}/$CI_JOB_ID \ + --base-artifacts-url ${ARTIFACTS_URL} \ + --mesa-url ${MESA_URL} \ --device-type ${DEVICE_TYPE} \ --env-vars "${ENV_VARS}" \ - --arch ${ARCH} \ --deqp-version ${DEQP_VERSION} \ --kernel-image-name ${KERNEL_IMAGE_NAME} \ --kernel-image-type "${KERNEL_IMAGE_TYPE}" \ @@ -38,8 +60,6 @@ - result=`lavacli results $lava_job_id 0_deqp deqp | head -1` - echo $result - '[[ "$result" == "pass" ]]' - after_script: - - rm -rf /srv/${FILES_HOST_NAME}/$CI_JOB_ID/ artifacts: name: "mesa_${CI_JOB_NAME}" when: always @@ -58,7 +78,7 @@ dependencies: - meson-armhf needs: - - arm_build + - kernel+rootfs_armhf - meson-armhf .lava-test:arm64: @@ -73,7 +93,7 @@ dependencies: - meson-arm64 needs: - - arm_build + - kernel+rootfs_arm64 - meson-arm64 panfrost-t720-gles2:arm64: @@ -84,8 +104,6 @@ panfrost-t720-gles2:arm64: DEVICE_TYPE: sun50i-h6-pine-h64 GPU_VERSION: panfrost-t720 ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T720" - FILES_HOST_NAME: "mesa-ci-lava-files.freedesktop.org" - FILES_HOST_URL: "https://mesa-ci-lava-files.freedesktop.org" tags: - mesa-ci-aarch64-lava-collabora @@ -99,8 +117,6 @@ panfrost-t760-gles2:armhf: BOOT_METHOD: depthcharge KERNEL_IMAGE_TYPE: "" ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T760" - FILES_HOST_NAME: "mesa-ci-lava-files.freedesktop.org" - FILES_HOST_URL: "https://mesa-ci-lava-files.freedesktop.org" tags: - mesa-ci-aarch64-lava-collabora @@ -114,8 +130,6 @@ panfrost-t860-gles2:arm64: BOOT_METHOD: depthcharge KERNEL_IMAGE_TYPE: "" ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T860" - FILES_HOST_NAME: "mesa-ci-lava-files.freedesktop.org" - FILES_HOST_URL: "https://mesa-ci-lava-files.freedesktop.org" tags: - mesa-ci-aarch64-lava-collabora @@ -132,8 +146,6 @@ panfrost-t860-gles3:arm64: ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T860" CI_NODE_INDEX: 1 CI_NODE_TOTAL: 5 - FILES_HOST_NAME: "mesa-ci-lava-files.freedesktop.org" - FILES_HOST_URL: "https://mesa-ci-lava-files.freedesktop.org" tags: - mesa-ci-aarch64-lava-collabora |