projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bin/khronos-update: having a folder in include/ is not a requirement
[mesa.git]
/
.gitlab-ci.yml
diff --git
a/.gitlab-ci.yml
b/.gitlab-ci.yml
index b2e40c25f9c4220e8633bb646ae16802916df6ad..374e79def2245297c78d2717760e3563b0c46222 100644
(file)
--- a/
.gitlab-ci.yml
+++ b/
.gitlab-ci.yml
@@
-64,6
+64,8
@@
pages:
test-docs:
extends: .docs-base
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
stage: container+docs
rules:
- *ignore_scheduled_pipelines
@@
-109,8
+111,6
@@
test-docs:
max: 2
when:
- runner_system_failure
max: 2
when:
- runner_system_failure
- # Cancel CI run if a newer commit is pushed to the same branch
- interruptible: true
success:
stage: success
success:
stage: success
@@
-193,7
+193,7
@@
success:
variables:
FDO_DISTRIBUTION_VERSION: buster-slim
FDO_REPO_SUFFIX: "debian/$CI_JOB_NAME"
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
# no need to pull the whole repo to build the container image
GIT_STRATEGY: none
@@
-203,7
+203,7
@@
x86_build-base:
- .fdo.container-build@debian
- .container
variables:
- .fdo.container-build@debian
- .container
variables:
- FDO_DISTRIBUTION_TAG: &x86_build-base "2020-0
6-12
"
+ FDO_DISTRIBUTION_TAG: &x86_build-base "2020-0
7-21-tracie
"
.use-x86_build-base:
extends:
.use-x86_build-base:
extends:
@@
-221,7
+221,7
@@
x86_build:
extends:
- .use-x86_build-base
variables:
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:
.use-x86_build:
variables:
@@
-235,7
+235,7
@@
i386_build:
extends:
- .use-x86_build-base
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:
.use-i386_build:
variables:
@@
-249,7
+249,7
@@
ppc64el_build:
extends:
- .use-x86_build-base
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:
.use-ppc64el_build:
variables:
@@
-263,7
+263,7
@@
s390x_build:
extends:
- .use-x86_build-base
variables:
extends:
- .use-x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &s390x_build "2020-0
6-02
"
+ FDO_DISTRIBUTION_TAG: &s390x_build "2020-0
7-21-tracie
"
.use-s390x_build:
variables:
.use-s390x_build:
variables:
@@
-276,7
+276,7
@@
s390x_build:
x86_test-base:
extends: x86_build-base
variables:
x86_test-base:
extends: x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_test-base "2020-0
6-02
"
+ FDO_DISTRIBUTION_TAG: &x86_test-base "2020-0
7-21-tracie
"
.use-x86_test-base:
extends:
.use-x86_test-base:
extends:
@@
-293,19
+293,19
@@
x86_test-base:
x86_test-gl:
extends: .use-x86_test-base
variables:
x86_test-gl:
extends: .use-x86_test-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-07-
15-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:
# Debian 10 based x86 test image for VK
x86_test-vk:
extends: .use-x86_test-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-0
6-18-vkcts
"
+ FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-0
7-21-gfxreconstruct-dev
"
# Debian 9 based x86 build image (old LLVM)
x86_build_old:
extends: x86_build-base
variables:
# Debian 9 based x86 build image (old LLVM)
x86_build_old:
extends: x86_build-base
variables:
- FDO_DISTRIBUTION_TAG: &x86_build_old "2020-0
6-12
"
+ FDO_DISTRIBUTION_TAG: &x86_build_old "2020-0
7-21-tracie
"
FDO_DISTRIBUTION_VERSION: stretch-slim
.use-x86_build_old:
FDO_DISTRIBUTION_VERSION: stretch-slim
.use-x86_build_old:
@@
-321,7
+321,7
@@
arm_build:
- .fdo.container-build@debian@arm64v8
- .container
variables:
- .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:
.use-arm_build:
variables:
@@
-336,7
+336,7
@@
arm_test-base:
- .fdo.container-build@debian
- .container
variables:
- .fdo.container-build@debian
- .container
variables:
- FDO_DISTRIBUTION_TAG: &arm_test-base "2020-07-
09-cache
"
+ FDO_DISTRIBUTION_TAG: &arm_test-base "2020-07-
18-nginx
"
.use-arm_test-base:
extends:
.use-arm_test-base:
extends:
@@
-354,7
+354,7
@@
arm64_test:
extends:
- .use-arm_test-base
variables:
extends:
- .use-arm_test-base
variables:
- FDO_DISTRIBUTION_TAG: &arm64_test "2020-07-
09-cache
"
+ FDO_DISTRIBUTION_TAG: &arm64_test "2020-07-
18-nginx
"
.use-arm64_test:
variables:
.use-arm64_test:
variables:
@@
-449,6
+449,8
@@
make git archive:
# Shared between windows and Linux
.build-common:
extends: .ci-run-policy
# 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
artifacts:
name: "mesa_${CI_JOB_NAME}"
when: always
@@
-500,10
+502,8
@@
make git archive:
- .build-linux
- .use-x86_build
stage: scons
- .build-linux
- .use-x86_build
stage: scons
- variables:
- SCONSFLAGS: "-j4"
script:
script:
- - .gitlab-ci/scons-build.sh
+ -
env SCONSFLAGS="-j${FDO_CI_CONCURRENT:-4}"
.gitlab-ci/scons-build.sh
meson-testing:
extends:
meson-testing:
extends:
@@
-786,6
+786,8
@@
meson-mingw32-x86_64:
.test:
extends:
- .ci-run-policy
.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:
variables:
GIT_STRATEGY: none # testing doesn't build anything from source
before_script:
@@
-841,7
+843,6
@@
piglit-quick_gl:
NIR_VALIDATE: 0
PIGLIT_OPTIONS: >
--process-isolation false
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
-x egl_ext_device_
-x egl_ext_platform_device
-x ext_timer_query@time-elapsed
@@
-896,10
+897,9
@@
piglit-quick_shader:
llvmpipe-gles2:
variables:
DEQP_VER: gles2
llvmpipe-gles2:
variables:
DEQP_VER: gles2
- DEQP_PARALLEL: 4
NIR_VALIDATE: 0
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"
LP_NUM_THREADS: 0
DEQP_EXPECTED_FAILS: deqp-llvmpipe-fails.txt
LIBGL_ALWAYS_SOFTWARE: "true"
@@
-919,13
+919,12
@@
softpipe-gles2:
DEQP_EXPECTED_RENDERER: softpipe
softpipe-gles3:
DEQP_EXPECTED_RENDERER: softpipe
softpipe-gles3:
- parallel: 2
variables:
DEQP_VER: gles3
extends: softpipe-gles2
softpipe-gles31:
variables:
DEQP_VER: gles3
extends: softpipe-gles2
softpipe-gles31:
- parallel:
4
+ parallel:
2
variables:
DEQP_VER: gles31
extends: softpipe-gles2
variables:
DEQP_VER: gles31
extends: softpipe-gles2
@@
-933,11
+932,10
@@
softpipe-gles31:
virgl-gles2-on-gl:
variables:
DEQP_VER: gles2
virgl-gles2-on-gl:
variables:
DEQP_VER: gles2
- DEQP_PARALLEL: 4
NIR_VALIDATE: 0
DEQP_NO_SAVE_RESULTS: 1
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"
LP_NUM_THREADS: 0
DEQP_EXPECTED_FAILS: deqp-virgl-gl-fails.txt
DEQP_OPTIONS: "--deqp-log-images=disable"
@@
-949,14
+947,13
@@
virgl-gles2-on-gl:
- .virgl-rules
virgl-gles3-on-gl:
- .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:
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"
variables:
DEQP_VER: gles31
MESA_GLES_VERSION_OVERRIDE: "3.1"
@@
-1120,6
+1117,8
@@
arm64_a630_vk_sysmem:
extends:
- .ci-run-policy
- .test
extends:
- .ci-run-policy
- .test
+ # Cancel job if a newer commit is pushed to the same branch
+ interruptible: true
stage: test
artifacts:
when: always
stage: test
artifacts:
when: always
@@
-1257,6
+1256,8
@@
radv-fossils:
key: ${CI_JOB_NAME}
paths:
- traces-db/
key: ${CI_JOB_NAME}
paths:
- traces-db/
+ variables:
+ TRACIE_UPLOAD_TO_MINIO: 1
.traces-test-gl:
extends:
.traces-test-gl:
extends:
@@
-1291,6
+1292,16
@@
radv-polaris10-traces:
tags:
- polaris10
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
virgl-traces:
extends:
- .traces-test-gl