diff options
-rw-r--r-- | .gitlab-ci.yml | 6 | ||||
-rwxr-xr-x | .gitlab-ci/container/debian/x86_64_test.sh | 6 | ||||
-rw-r--r-- | .gitlab-ci/expectations/host/virgl-gles-fails.txt | 1 | ||||
-rw-r--r-- | .gitlab-ci/expectations/virt/venus-fails.txt | 7 | ||||
-rw-r--r-- | .gitlab-ci/expectations/virt/virgl-gl-fails.txt | 11 | ||||
-rw-r--r-- | .gitlab-ci/expectations/virt/virgl-gles-fails.txt | 3 |
6 files changed, 17 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a17269c..3b9acc8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ variables: # # Pick a pipeline on https://gitlab.freedesktop.org/mesa/mesa/-/pipelines/ # - MESA_PIPELINE_ID: 899161 + MESA_PIPELINE_ID: 906183 MESA_PROJECT_PATH: mesa/mesa STORAGE_HOST: s3.freedesktop.org CI_REGISTRY_IMAGE: "harbor.freedesktop.org/${MESA_PROJECT_PATH}" @@ -37,7 +37,7 @@ include: # IMPORTANT: Use a recent Mesa Git revision # The commit ref must be in sync with the pipeline picked above # It can be found on the pipeline page below the commit message - ref: 6d013d1f13a0040b65ef9a76234e80865d966b2a + ref: 926e97d5df203fe19a2498e6a84335dedbab382e file: - '/.gitlab-ci/image-tags.yml' @@ -84,7 +84,7 @@ debian/x86_64_build: variables: MESA_IMAGE_PATH: ${DEBIAN_X86_64_BUILD_IMAGE_PATH} MESA_IMAGE_TAG: ${DEBIAN_BUILD_TAG} - MINIO_ARTIFACT_NAME: virgl-x86_64 + S3_ARTIFACT_NAME: virgl-x86_64 script: - .gitlab-ci/meson/build.sh artifacts: diff --git a/.gitlab-ci/container/debian/x86_64_test.sh b/.gitlab-ci/container/debian/x86_64_test.sh index 84dd1ba..ad6c4c9 100755 --- a/.gitlab-ci/container/debian/x86_64_test.sh +++ b/.gitlab-ci/container/debian/x86_64_test.sh @@ -8,7 +8,11 @@ mkdir -p ${MESA_CI_PROJECT_DIR} cd ${MESA_CI_PROJECT_DIR} # Deploy Mesa CI artifacts -MESA_CI_ARTIFACTS_URL="https://${STORAGE_HOST}/artifacts/${MESA_PROJECT_PATH}/${MESA_PIPELINE_ID}/mesa-amd64.tar.zst" +MESA_ARCHITECTURE="x86_64" +MESA_CONFIGURATION="default" +MESA_BUILDTYPE="debugoptimized" +MESA_TARBALL="mesa-${MESA_ARCHITECTURE}-${MESA_CONFIGURATION}-${MESA_BUILDTYPE}.tar.zst" +MESA_CI_ARTIFACTS_URL="https://${STORAGE_HOST}/artifacts/${MESA_PROJECT_PATH}/${MESA_PIPELINE_ID}/${MESA_TARBALL}" if curl -s -I ${MESA_CI_ARTIFACTS_URL}; then curl ${MESA_CI_ARTIFACTS_URL} -o - | tar -xv --zstd else diff --git a/.gitlab-ci/expectations/host/virgl-gles-fails.txt b/.gitlab-ci/expectations/host/virgl-gles-fails.txt index c85796b..3bf545c 100644 --- a/.gitlab-ci/expectations/host/virgl-gles-fails.txt +++ b/.gitlab-ci/expectations/host/virgl-gles-fails.txt @@ -3175,4 +3175,5 @@ spec@arb_shader_draw_parameters@drawid-vertexid,Fail spec@arb_shader_draw_parameters@vertexid-zerobased,Fail spec@arb_shader_draw_parameters@vertexid-zerobased-indirect,Fail spec@arb_viewport_array@display-list,Fail + spec@khr_texture_compression_astc@void-extent-dl-bug,Crash diff --git a/.gitlab-ci/expectations/virt/venus-fails.txt b/.gitlab-ci/expectations/virt/venus-fails.txt index f22238c..6c02bc5 100644 --- a/.gitlab-ci/expectations/virt/venus-fails.txt +++ b/.gitlab-ci/expectations/virt/venus-fails.txt @@ -10,10 +10,3 @@ dEQP-VK.pipeline.extended_dynamic_state.before_draw.enable_raster,Fail dEQP-VK.pipeline.extended_dynamic_state.between_pipelines.enable_raster,Fail dEQP-VK.pipeline.extended_dynamic_state.cmd_buffer_start.enable_raster,Fail dEQP-VK.pipeline.extended_dynamic_state.two_draws_dynamic.enable_raster,Fail - -dEQP-VK.subgroups.shuffle.compute.subgroupshuffleup_double_constant,Crash -dEQP-VK.subgroups.shuffle.compute.subgroupshuffleup_dvec4_constant_requiredsubgroupsize,Crash -dEQP-VK.subgroups.shuffle.compute.subgroupshuffleup_i64vec2_constant_requiredsubgroupsize,Crash -dEQP-VK.subgroups.shuffle.compute.subgroupshuffleup_i64vec4_constant_requiredsubgroupsize,Crash -dEQP-VK.subgroups.shuffle.compute.subgroupshuffleup_u64vec4_constant_requiredsubgroupsize,Crash -dEQP-VK.subgroups.shuffle.graphics.subgroupshuffleup_i64vec4_constant,Crash diff --git a/.gitlab-ci/expectations/virt/virgl-gl-fails.txt b/.gitlab-ci/expectations/virt/virgl-gl-fails.txt index 466f5a9..a43b021 100644 --- a/.gitlab-ci/expectations/virt/virgl-gl-fails.txt +++ b/.gitlab-ci/expectations/virt/virgl-gl-fails.txt @@ -515,16 +515,17 @@ spec@!opengl 3.2@layered-rendering@clear-color-mismatched-layer-count,Fail spec@!opengl 1.1@line-smooth-stipple,Fail spec@arb_pipeline_statistics_query@arb_pipeline_statistics_query-frag,Fail -spec@arb_gl_spirv@execution@ubo@aoa,Crash -spec@arb_gl_spirv@execution@ubo@array,Crash -spec@arb_gl_spirv@execution@ubo@array-complex,Crash -spec@arb_gl_spirv@execution@ubo@array-indirect,Crash spec@arb_gl_spirv@execution@xfb@vs_two_block,Timeout spec@arb_gl_spirv@execution@xfb@vs_two_sets_ifc,Fail spec@arb_gl_spirv@execution@xfb@vs_two_sets_struct,Timeout spec@arb_gpu_shader5@arb_gpu_shader5-xfb-streams-without-invocations spirv,Fail spec@arb_gl_spirv@execution@ssbo@unsized-array,Fail -spec@arb_gl_spirv@execution@ubo@aoa-2,Crash spec@arb_gl_spirv@execution@xfb@vs_block_array,Timeout spec@arb_gl_spirv@execution@xfb@vs_two_sets,Timeout spec@arb_viewport_array@display-list,Fail + +spec@arb_gl_spirv@execution@ubo@aoa,Crash +spec@arb_gl_spirv@execution@ubo@aoa-2,Crash +spec@arb_gl_spirv@execution@ubo@array,Crash +spec@arb_gl_spirv@execution@ubo@array-complex,Crash +spec@arb_gl_spirv@execution@ubo@array-indirect,Crash diff --git a/.gitlab-ci/expectations/virt/virgl-gles-fails.txt b/.gitlab-ci/expectations/virt/virgl-gles-fails.txt index 8e8080c..f0d0132 100644 --- a/.gitlab-ci/expectations/virt/virgl-gles-fails.txt +++ b/.gitlab-ci/expectations/virt/virgl-gles-fails.txt @@ -3219,7 +3219,6 @@ spec@arb_shader_draw_parameters@drawid,Fail spec@arb_shader_draw_parameters@drawid-indirect-baseinstance,Fail spec@arb_shader_draw_parameters@drawid-single-draw,Fail spec@arb_shader_draw_parameters@drawid-single-draw-primitive-restart,Fail -spec@khr_texture_compression_astc@void-extent-dl-bug,Crash spec@arb_gl_spirv@execution@ssbo@unsized-array,Fail spec@arb_shader_draw_parameters@baseinstance,Fail spec@arb_shader_draw_parameters@baseinstance-indirect,Fail @@ -3228,3 +3227,5 @@ spec@arb_shader_draw_parameters@basevertex-indirect,Fail spec@arb_shader_draw_parameters@drawid-indirect-basevertex,Fail spec@arb_shader_draw_parameters@vertexid-zerobased,Fail spec@arb_viewport_array@display-list,Fail + +spec@khr_texture_compression_astc@void-extent-dl-bug,Crash |