Alexandre Julliard : gitlab: Run the full test suite on merge requests.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9c5b2bd62c8a7d89d4d3849c61dc91b471e5fb22
URL:    https://gitlab.winehq.org/wine/wine/-/commit/9c5b2bd62c8a7d89d4d3849c61dc91b...

Author: Alexandre Julliard 
Date:   Tue Sep 27 16:36:20 2022 +0200

gitlab: Run the full test suite on merge requests.

---

tools/gitlab/build.yml |  5 ++---
 tools/gitlab/test.yml  | 12 ++++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml
index ba654485488..6bc253b2c77 100644
--- a/tools/gitlab/build.yml
+++ b/tools/gitlab/build.yml
@@ -29,10 +29,9 @@ build-linux:
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
   artifacts:
-    when: on_failure
+    expire_in: 1 day
     paths:
-      - build64/config.log
-      - build32/config.log
+      - usr/local/
   script:
     - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-linux

diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml
index a7edd17f447..66079527be5 100644
--- a/tools/gitlab/test.yml
+++ b/tools/gitlab/test.yml
@@ -42,6 +42,18 @@
     - wine wineboot.exe -u
     - wineserver -w

+test-linux-32:
+  extends: .wine-test
+  variables:
+    EXCLUDE_TESTS: "d3d10core:d3d10core d3d11:d3d11 d3d8:device d3d8:visual d3d9:d3d9ex d3d9:device d3d9:visual"
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+  needs:
+    - job: build-linux
+  script:
+    - export WINETEST_COLOR=1
+    - wine usr/local/lib/wine/i386-windows/winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL -n $EXCLUDE_TESTS
+
 debian-32:
   extends: .wine-test
   rules: