test-docs:
extends: .docs-base
+ # Cancel job if a newer commit is pushed to the same branch
+ interruptible: true
stage: container+docs
rules:
- *ignore_scheduled_pipelines
- if: '$CI_PROJECT_NAMESPACE == "mesa"'
when: never
- - if: '$GITLAB_USER_LOGIN == "marge-bot"'
+ - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
changes: *docs-or-ci
when: on_success
- changes: *docs-or-ci
max: 2
when:
- runner_system_failure
- # Cancel CI run if a newer commit is pushed to the same branch
- interruptible: true
success:
stage: success
when: on_success
# Run pipeline by default if it was triggered by Marge Bot, is for a
# merge request, and any files affecting the pipeline were changed
- - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_PROJECT_PATH != "mesa/mesa"'
+ - if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME'
changes:
*all_paths
when: on_success
variables:
FDO_DISTRIBUTION_VERSION: buster-slim
FDO_REPO_SUFFIX: "debian/$CI_JOB_NAME"
- FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
+ FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
# no need to pull the whole repo to build the container image
GIT_STRATEGY: none
- .fdo.container-build@debian
- .container
variables:
- FDO_DISTRIBUTION_TAG: &x86_build-base "2020-06-12"
+ FDO_DISTRIBUTION_TAG: &x86_build-base "2020-07-21-tracie"
.use-x86_build-base:
extends:
extends:
- .use-x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_build "2020-06-02"
+ FDO_DISTRIBUTION_TAG: &x86_build "2020-07-21-tracie"
.use-x86_build:
variables:
TAG: *x86_build
image: "$CI_REGISTRY_IMAGE/debian/x86_build:$TAG"
needs:
- - x86_build-base
- x86_build
# Debian 10 based i386 cross-build image
extends:
- .use-x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &i386_build "2020-06-02"
+ FDO_DISTRIBUTION_TAG: &i386_build "2020-07-21-tracie"
.use-i386_build:
variables:
TAG: *i386_build
image: "$CI_REGISTRY_IMAGE/debian/i386_build:$TAG"
needs:
- - x86_build-base
- i386_build
# Debian 10 based ppc64el cross-build image
extends:
- .use-x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-06-02"
+ FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-07-21-tracie"
.use-ppc64el_build:
variables:
TAG: *ppc64el_build
image: "$CI_REGISTRY_IMAGE/debian/ppc64el_build:$TAG"
needs:
- - x86_build-base
- ppc64el_build
# Debian 10 based s390x cross-build image
extends:
- .use-x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &s390x_build "2020-06-02"
+ FDO_DISTRIBUTION_TAG: &s390x_build "2020-07-21-tracie"
.use-s390x_build:
variables:
TAG: *s390x_build
image: "$CI_REGISTRY_IMAGE/debian/s390x_build:$TAG"
needs:
- - x86_build-base
- s390x_build
# Debian 10 based x86 test image base
x86_test-base:
extends: x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_test-base "2020-06-02"
+ FDO_DISTRIBUTION_TAG: &x86_test-base "2020-07-21-tracie"
.use-x86_test-base:
extends:
x86_test-gl:
extends: .use-x86_test-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-06-23-virgl"
+ FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-07-21-tracie"
# Debian 10 based x86 test image for VK
x86_test-vk:
extends: .use-x86_test-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-06-18-vkcts"
+ FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-07-21-gfxreconstruct-dev"
# Debian 9 based x86 build image (old LLVM)
x86_build_old:
extends: x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_build_old "2020-06-12"
+ FDO_DISTRIBUTION_TAG: &x86_build_old "2020-07-21-tracie"
FDO_DISTRIBUTION_VERSION: stretch-slim
.use-x86_build_old:
- .fdo.container-build@debian@arm64v8
- .container
variables:
- FDO_DISTRIBUTION_TAG: &arm_build "2020-07-07"
+ FDO_DISTRIBUTION_TAG: &arm_build "2020-07-21-tracie"
.use-arm_build:
variables:
- .fdo.container-build@debian
- .container
variables:
- FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-22-tracie"
+ FDO_DISTRIBUTION_TAG: &arm_test-base "2020-07-18-nginx"
.use-arm_test-base:
extends:
extends:
- .use-arm_test-base
variables:
- FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-25-kernelfix"
+ FDO_DISTRIBUTION_TAG: &arm64_test "2020-07-18-nginx"
.use-arm64_test:
variables:
TAG: *arm64_test
image: "$CI_REGISTRY_IMAGE/debian/arm64_test:$TAG"
needs:
- - arm_test-base
- arm64_test
# Native Windows docker builds
# Shared between windows and Linux
.build-common:
extends: .ci-run-policy
+ # Cancel job if a newer commit is pushed to the same branch
+ interruptible: true
artifacts:
name: "mesa_${CI_JOB_NAME}"
when: always
- .build-linux
- .use-x86_build
stage: scons
- variables:
- SCONSFLAGS: "-j4"
script:
- - .gitlab-ci/scons-build.sh
+ - env SCONSFLAGS="-j${FDO_CI_CONCURRENT:-4}" .gitlab-ci/scons-build.sh
meson-testing:
extends:
-D glx=dri
-D gbm=enabled
-D egl=enabled
- -D platforms=x11,drm
+ -D platforms=x11
GALLIUM_ST: >
-D dri3=enabled
GALLIUM_DRIVERS: "swrast,virgl"
-D glx=dri
-D gbm=enabled
-D egl=enabled
- -D platforms=x11,wayland,drm
+ -D platforms=x11,wayland
GALLIUM_ST: >
-D dri3=enabled
-D gallium-extra-hud=true
-D glx=disabled
-D egl=disabled
-D gbm=disabled
- -D platforms=drm
+ -D platforms=[]
GALLIUM_DRIVERS: "i915,r600"
script:
- LLVM_VERSION=3.9 .gitlab-ci/meson-build.sh
-D glx=disabled
-D gbm=disabled
-D egl=disabled
- -D platforms=x11,wayland,drm
+ -D platforms=x11,wayland
-D osmesa=none
GALLIUM_ST: >
-D dri3=enabled
.test:
extends:
- .ci-run-policy
+ # Cancel job if a newer commit is pushed to the same branch
+ interruptible: true
variables:
GIT_STRATEGY: none # testing doesn't build anything from source
before_script:
TAG: *x86_test-gl
image: "$CI_REGISTRY_IMAGE/debian/x86_test-gl:$TAG"
needs:
- - x86_build-base
- - x86_build
- meson-testing
- - x86_test-base
- x86_test-gl
- dependencies:
- - meson-testing
.test-vk:
extends:
TAG: *x86_test-vk
image: "$CI_REGISTRY_IMAGE/debian/x86_test-vk:$TAG"
needs:
- - x86_build-base
- - x86_build
- meson-testing
- - x86_test-base
- x86_test-vk
- dependencies:
- - meson-testing
.piglit-test:
extends:
NIR_VALIDATE: 0
PIGLIT_OPTIONS: >
--process-isolation false
- -x arb_gpu_shader5
-x egl_ext_device_
-x egl_ext_platform_device
-x ext_timer_query@time-elapsed
llvmpipe-gles2:
variables:
DEQP_VER: gles2
- DEQP_PARALLEL: 4
NIR_VALIDATE: 0
- # Don't use threads inside llvmpipe, we've already got all 4 cores
- # busy with DEQP_PARALLEL.
+ # Don't use threads inside llvmpipe, we've already got all cores
+ # busy at the deqp-runner level.
LP_NUM_THREADS: 0
DEQP_EXPECTED_FAILS: deqp-llvmpipe-fails.txt
LIBGL_ALWAYS_SOFTWARE: "true"
DEQP_EXPECTED_RENDERER: softpipe
softpipe-gles3:
- parallel: 2
variables:
DEQP_VER: gles3
extends: softpipe-gles2
softpipe-gles31:
- parallel: 4
+ parallel: 2
variables:
DEQP_VER: gles31
extends: softpipe-gles2
virgl-gles2-on-gl:
variables:
DEQP_VER: gles2
- DEQP_PARALLEL: 4
NIR_VALIDATE: 0
DEQP_NO_SAVE_RESULTS: 1
- # Don't use threads inside llvmpipe, we've already got all 4 cores
- # busy with DEQP_PARALLEL.
+ # Don't use threads inside llvmpipe, we've already got all cores
+ # busy at the deqp-runner level.
LP_NUM_THREADS: 0
DEQP_EXPECTED_FAILS: deqp-virgl-gl-fails.txt
DEQP_OPTIONS: "--deqp-log-images=disable"
- .virgl-rules
virgl-gles3-on-gl:
- parallel: 2
variables:
DEQP_VER: gles3
DEQP_RUNNER_OPTIONS: "--timeout 180"
extends: virgl-gles2-on-gl
virgl-gles31-on-gl:
- parallel: 4
+ parallel: 2
variables:
DEQP_VER: gles31
MESA_GLES_VERSION_OVERRIDE: "3.1"
extends:
- .ci-run-policy
- .test
+ # Cancel job if a newer commit is pushed to the same branch
+ interruptible: true
stage: test
artifacts:
when: always
script:
- ./install/bare-metal/fastboot.sh
needs:
- - arm_test-base
- arm64_test
- - arm_build
- meson-arm64
tags:
- google-freedreno-db410c
key: ${CI_JOB_NAME}
paths:
- traces-db/
+ variables:
+ TRACIE_UPLOAD_TO_MINIO: 1
.traces-test-gl:
extends:
tags:
- polaris10
+radv-raven-traces:
+ extends:
+ - .traces-test-vk
+ - .test-radv
+ - .test-manual
+ variables:
+ DEVICE_NAME: "vk-amd-raven"
+ tags:
+ - raven
+
virgl-traces:
extends:
- .traces-test-gl