From 0caf4b74c0ef79c3fb63811bb3b58a58bea0de6d Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 28 Apr 2021 08:52:13 -0700
Subject: [PATCH] GitLab CI: Disable Fedora tests for now.

The test:rpm-fedora job is currently failing with:

$ dnf install -y build/packaging/rpm/RPMS/x86_64/*.rpm
Fedora 34 openh264 (From Cisco) - x86_64        6.4 kB/s | 2.5 kB     00:00
Fedora Modular 34 - x86_64                      8.4 MB/s | 3.8 MB     00:00
Fedora Modular 34 - x86_64 - Updates            500 kB/s | 754 kB     00:01
Fedora 34 - x86_64 - Updates                     11 MB/s | 5.8 MB     00:00
Fedora 34 - x86_64                               21 MB/s |  57 MB     00:02
Error:
 Problem: conflicting requests
  - nothing provides libminizip.so.2.5()(64bit) needed by wireshark-qt-3.5.0rc0_1661_ge2e4b79d0dd3-1.x86_64

It looks like this is due to Fedora 34 and later shipping with
minizip-3.0: https://src.fedoraproject.org/rpms/minizip.

Disable the test:rpm-fedora job for now until we can find a way to make
it more reliable.
---
 .gitlab-ci.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 89b5a1550d..04aa3b3507 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -201,16 +201,16 @@ build:rpm-fedora:
     - ninja rpm-package
   needs:
     - build:ubuntu-dist
-test:rpm-fedora:
-  image: fedora
-  stage: test
-  script:
-    - dnf install -y build/packaging/rpm/RPMS/x86_64/*.rpm
-    - tshark --version
-  variables:
-    GIT_STRATEGY: none
-  needs:
-    - build:rpm-fedora
+# test:rpm-fedora:
+#   image: fedora
+#   stage: test
+#   script:
+#     - dnf install -y build/packaging/rpm/RPMS/x86_64/*.rpm
+#     - tshark --version
+#   variables:
+#     GIT_STRATEGY: none
+#   needs:
+#     - build:rpm-fedora
 
 # Job to generate packages for Debian stable
 build:debian-stable: