projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
glthread: don't declare unmarshal functions as inline
[mesa.git] / .gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0da26a64e2f9dc61d19f1c7893c4e973782fbe8..fbe88ed1ed87650c785be4a8388d4a4bf8ac0f3a 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,9 @@
 variables:
-  UPSTREAM_REPO: mesa/mesa
+  FDO_UPSTREAM_REPO: mesa/mesa
 
 include:
-  - project: 'wayland/ci-templates'
-    ref: b7030c2cd0d6ccc5f6d4f8299bafa4daa9240d71
+  - project: 'freedesktop/ci-templates'
+    ref: a1699326519fd28526485ce93464e33423bac564
     file: '/templates/debian.yml'
   - local: '.gitlab-ci/lava-gitlab-ci.yml'
   - local: '.gitlab-ci/test-source-dep.yml'
@@ -88,7 +88,7 @@ success:
 
 # Build the CI docker images.
 #
-# DEBIAN_TAG is the tag of the docker image used by later stage jobs. If the
+# FDO_DISTRIBUTION_TAG is the tag of the docker image used by later stage jobs. If the
 # image doesn't exist yet, the container stage job generates it.
 #
 # In order to generate a new image, one should generally change the tag.
@@ -108,19 +108,19 @@ success:
   extends:
     - .ci-run-policy
   variables:
-    DEBIAN_VERSION: buster-slim
-    REPO_SUFFIX: $CI_JOB_NAME
-    DEBIAN_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
+    FDO_DISTRIBUTION_VERSION: buster-slim
+    FDO_REPO_SUFFIX: $CI_JOB_NAME
+    FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
     # no need to pull the whole repo to build the container image
     GIT_STRATEGY: none
 
 # Debian 10 based x86 build image
 x86_build:
   extends:
-    - .debian@container-ifnot-exists
+    - .fdo.container-ifnot-exists@debian
     - .container
   variables:
-    DEBIAN_TAG: &x86_build "2020-03-11"
+    FDO_DISTRIBUTION_TAG: &x86_build "2020-03-13"
 
 .use-x86_build:
   variables:
@@ -133,20 +133,20 @@ x86_build:
 x86_test-gl:
   extends: x86_build
   variables:
-    DEBIAN_TAG: &x86_test-gl "2020-03-11"
+    FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-03-13"
 
 # Debian 10 based x86 test image for VK
 x86_test-vk:
   extends: x86_build
   variables:
-    DEBIAN_TAG: &x86_test-vk "2020-03-05"
+    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-03-16"
 
 # Debian 9 based x86 build image (old LLVM)
 x86_build_old:
   extends: x86_build
   variables:
-    DEBIAN_TAG: &x86_build_old "2019-09-18"
-    DEBIAN_VERSION: stretch-slim
+    FDO_DISTRIBUTION_TAG: &x86_build_old "2019-09-18"
+    FDO_DISTRIBUTION_VERSION: stretch-slim
 
 .use-x86_build_old:
   variables:
@@ -158,10 +158,10 @@ x86_build_old:
 # Debian 10 based ARM build image
 arm_build:
   extends:
-    - .debian@container-ifnot-exists@arm64v8
+    - .fdo.container-ifnot-exists@debian@arm64v8
     - .container
   variables:
-    DEBIAN_TAG: &arm_build "2020-03-09"
+    FDO_DISTRIBUTION_TAG: &arm_build "2020-03-17-db820c"
 
 .use-arm_build:
   variables:
@@ -174,7 +174,7 @@ arm_build:
 arm_test:
   extends: arm_build
   variables:
-    DEBIAN_TAG: &arm_test "2020-01-30"
+    FDO_DISTRIBUTION_TAG: &arm_test "2020-01-30"
 
 .use-arm_test:
   variables:
@@ -265,7 +265,7 @@ meson-testing:
     - .gitlab-ci/meson-build.sh
     - .gitlab-ci/prepare-artifacts.sh
 
-meson-main:
+meson-gallium:
   extends: .meson-build
   variables:
     UNWIND: "true"
@@ -274,7 +274,6 @@ meson-main:
       -D gbm=true
       -D egl=true
       -D platforms=x11,wayland,drm,surfaceless
-    DRI_DRIVERS: "i915,i965,r100,r200,nouveau"
     GALLIUM_ST: >
       -D dri3=true
       -D gallium-extra-hud=true
@@ -293,6 +292,20 @@ meson-main:
     - .gitlab-ci/meson-build.sh
     - .gitlab-ci/run-shader-db.sh
 
+meson-classic:
+  extends: .meson-build
+  variables:
+    UNWIND: "true"
+    DRI_LOADERS: >
+      -D glx=dri
+      -D gbm=true
+      -D egl=true
+      -D platforms=x11,wayland,drm,surfaceless
+    DRI_DRIVERS: "auto"
+    EXTRA_OPTION: >
+      -D osmesa=classic
+      -D tools=all
+
 .meson-cross:
   extends:
     - .meson-build
@@ -382,13 +395,6 @@ meson-clang:
   script:
     - cmd /C .gitlab-ci\meson-build.bat
 
-scons-swr:
-  extends: .scons-build
-  variables:
-    SCONS_TARGET: "swr=1"
-    SCONS_CHECK_COMMAND: "true"
-    LLVM_VERSION: "6.0"
-
 scons-win64:
   extends: .scons-build
   variables:
@@ -465,19 +471,14 @@ meson-vulkan:
       -D vulkan-overlay-layer=true
       -D werror=true
 
-# While the main point of this build is testing the i386 cross build,
-# we also use this one to test some other options that are exclusive
-# with meson-main's choices (classic swrast and osmesa)
 meson-i386:
   extends: .meson-cross
   variables:
     CROSS: i386
     VULKAN_DRIVERS: intel,amd
-    DRI_DRIVERS: "swrast"
-    GALLIUM_DRIVERS: "iris"
+    GALLIUM_DRIVERS: "iris,r300,radeonsi,swrast,virgl"
     EXTRA_OPTION: >
       -D vulkan-overlay-layer=true
-      -D osmesa=classic
       -D werror=true
   script:
     - dpkg -i /var/cache/apt/archives/$CROSS/*.deb
@@ -519,8 +520,8 @@ meson-mingw32-x86_64:
 scons:
   extends: .scons-build
   variables:
-    SCONS_TARGET: "llvm=1"
-    SCONS_CHECK_COMMAND: "scons llvm=1 force_scons=1 check"
+    SCONS_TARGET: "llvm=1 swr=1"
+    SCONS_CHECK_COMMAND: "scons force_scons=1 ${SCONS_TARGET} check"
   script:
     - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check force_scons=1" .gitlab-ci/scons-build.sh
     - LLVM_VERSION=9 .gitlab-ci/scons-build.sh
@@ -710,9 +711,9 @@ arm64_a306_gles2:
   extends:
     - .baremetal-test
     - .use-arm_build
-  stage: freedreno
+    - .freedreno-rules
   variables:
-    BM_KERNEL: /lava-files/Image
+    BM_KERNEL: /lava-files/Image.gz
     BM_DTB: /lava-files/apq8016-sbc.dtb
     BM_ROOTFS: /lava-files/rootfs-arm64
     BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8"
@@ -735,6 +736,26 @@ arm64_a306_gles2:
   variables:
     DEQP_VER: gles3
 
+arm64_a530_gles2:
+  extends:
+    - arm64_a306_gles2
+  stage: freedreno
+  variables:
+    BM_KERNEL: /lava-files/db820c-kernel
+    BM_DTB: /lava-files/db820c.dtb
+    BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8"
+    DEQP_EXPECTED_FAILS: deqp-freedreno-a530-fails.txt
+    DEQP_SKIPS: deqp-freedreno-a530-skips.txt
+  tags:
+    - google-freedreno-db820c
+
+arm64_a530_gles3:
+  extends:
+    - arm64_a530_gles2
+  parallel: 6
+  variables:
+    DEQP_VER: gles3
+
 # RADV CI
 .test-radv:
   extends: .radv-rules
@@ -782,7 +803,7 @@ radv-polaris10-fossils:
   cache:
     key: ${CI_JOB_NAME}
     paths:
-      - .git-lfs-storage/
+      - traces-db/
 
 .traces-test-gl:
   extends: