- *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
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-07-10"
+ FDO_DISTRIBUTION_TAG: &x86_build "2020-07-21-tracie"
.use-x86_build:
variables:
extends:
- .use-x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &i386_build "2020-07-10"
+ FDO_DISTRIBUTION_TAG: &i386_build "2020-07-21-tracie"
.use-i386_build:
variables:
extends:
- .use-x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-07-10"
+ FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-07-21-tracie"
.use-ppc64el_build:
variables:
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:
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-10"
+ 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:
- .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:
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"
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"
arm64_a630_gles31:
extends: arm64_a630_gles2
variables:
- CI_NODE_INDEX: 1
- CI_NODE_TOTAL: 2
DEQP_VER: gles31
# gles31 is about 12 minutes with validation enabled.
NIR_VALIDATE: 0
arm64_a630_gles3:
extends: arm64_a630_gles2
variables:
- CI_NODE_INDEX: 1
- CI_NODE_TOTAL: 2
DEQP_VER: gles3
# gles3 is about 15 minutes with validation enabled.
NIR_VALIDATE: 0
# We almost always manage to lower UBOs back to constant uploads in
# the test suite, so get a little testing for it here.
-.arm64_a630_noubo:
+arm64_a630_noubo:
extends: arm64_a630_gles31
variables:
DEQP_VER: gles31
# The driver does some guessing as to whether to render using gmem
# or bypass, and some GLES3.1 features interact with either one.
# Do a little testing with gmem and bypass forced.
-.arm64_a630_bypass:
+arm64_a630_bypass:
extends: arm64_a630_gles31
variables:
CI_NODE_INDEX: 1
FD_MESA_DEBUG: nogmem
DEQP_EXPECTED_FAILS: deqp-freedreno-a630-bypass-fails.txt
-.arm64_a630_traces:
+arm64_a630_traces:
extends:
- arm64_a630_gles2
variables:
# Along with checking gmem path, check that we don't get obvious nir
# validation failures (though it's too expensive to have it on for the
# full CTS)
-.arm64_a630_gmem:
+arm64_a630_gmem:
extends: arm64_a630_gles31
variables:
CI_NODE_INDEX: 1
# Do a separate sysmem pass over the testcases that really affect sysmem
# rendering. This is currently very flaky, leave it as an option for devs
# to click play on in their branches.
-.arm64_a630_vk_sysmem:
+arm64_a630_vk_sysmem:
extends:
- arm64_a630_vk
variables: