From 60db3b6303aa873b81a0c224b76c524292a75cff Mon Sep 17 00:00:00 2001
From: Olivier Crête <olivier.crete@collabora.com>
Date: Mon, 17 Jul 2023 15:54:47 -0400
Subject: gitlab-ci: Move Coverity build to Fedora 38

---
 .gitlab-ci.yml                        | 22 +++++++++++++++++++---
 tests/docker/fedora38/pip-installs.sh |  5 +++++
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100755 tests/docker/fedora38/pip-installs.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1615a84..4ce31a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,8 @@ include:
     file: '/templates/ci-fairy.yml'
   - project: 'freedesktop/ci-templates'
     file: '/templates/centos.yml'
+  - project: 'freedesktop/ci-templates'
+    file: '/templates/fedora.yml'
 
 .libnice.centos:7:
   variables:
@@ -28,6 +30,12 @@ include:
     FDO_DISTRIBUTION_TAG: '2022-10-17-cov'
     FDO_UPSTREAM_REPO: 'libnice/libnice'
 
+.libnice.fedora:38:
+  variables:
+    FDO_DISTRIBUTION_VERSION: '38'
+    FDO_DISTRIBUTION_TAG: '2023-07-17'
+    FDO_UPSTREAM_REPO: 'libnice/libnice'
+
 check-allow-collaboration:
   extends:
     - .fdo.ci-fairy
@@ -51,6 +59,15 @@ build-centos-container:7:
     FDO_DISTRIBUTION_PACKAGES: 'git gtk-doc gnutls-devel gupnp-igd-devel gstreamer1-devel gobject-introspection-devel valgrind net-tools centos-release-scl graphviz'
     FDO_DISTRIBUTION_EXEC: 'tests/docker/centos7-meson/pip-installs.sh'
 
+build-fedora-container:38:
+  extends:
+  - .fdo.container-build@fedora     # the CI template
+  - .libnice.fedora:38              # our template job above
+  stage: containers
+  variables:
+    FDO_DISTRIBUTION_PACKAGES: 'git gtk-doc gnutls-devel gupnp-igd-devel gstreamer1-devel gobject-introspection-devel valgrind net-tools graphviz meson ninja-build lcov python3-pip'
+    FDO_DISTRIBUTION_EXEC: 'tests/docker/fedora38/pip-installs.sh'
+
 build:
   stage: build
   extends:
@@ -283,8 +300,8 @@ doc-and-install:
 submit-to-coverity:
  stage: test
  extends:
-  - .fdo.distribution-image@centos
-  - .libnice.centos:7
+  - .fdo.distribution-image@fedora
+  - .libnice.fedora:38
  variables:
    COVERITY_PROJECT: libnice
    PREFIX: "${CI_PROJECT_DIR}/libnice-prefix"
@@ -297,7 +314,6 @@ submit-to-coverity:
  script:
   - curl -v https://scan.coverity.com/download/linux64  -o coverity_tool.tgz  --data "token=${COVERITY_TOKEN}&project=${COVERITY_PROJECT}" && tar xf coverity_tool.tgz && rm coverity_tool.tgz
   - mv cov-analysis-linux64-* cov-analysis-linux64
-  - source scl_source enable rh-python36 && true
   - meson --werror --warnlevel 2 -Dgtk_doc=disabled -Dintrospection=disabled --prefix=$PREFIX cov-build/
   - export PATH="$PATH:${CI_PROJECT_DIR}/cov-analysis-linux64/bin"
   - echo $PATH
diff --git a/tests/docker/fedora38/pip-installs.sh b/tests/docker/fedora38/pip-installs.sh
new file mode 100755
index 0000000..5c9ffd1
--- /dev/null
+++ b/tests/docker/fedora38/pip-installs.sh
@@ -0,0 +1,5 @@
+#/bin/sh
+
+set -ex
+
+pip3 install lcov-cobertura
-- 
cgit v1.2.3