From 61d75a11ef58fb03734057c575a3f9bcaecaf1e2 Mon Sep 17 00:00:00 2001
From: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Date: Mon, 20 Jan 2025 14:05:52 +0100
Subject: [PATCH 1/2] tests: rewrite coverity job to avoid deprecated "only"
 feature

The "only" feature has been deprecated for a while. The standard
replacement is the rules:if feature.

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
---
 .gitlab-ci.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ecc81133..0b48c3a2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -178,11 +178,6 @@ coverity:
   stage: .post
   extends:
     - .ubuntu-before_script
-  only:
-    refs:
-      - master
-    variables:
-      - $CI_PROJECT_PATH == "apparmor/apparmor"
   script:
       - apt-get install --no-install-recommends -y curl git texlive-latex-recommended
       - *install-c-build-deps
@@ -196,3 +191,5 @@ coverity:
   artifacts:
     paths:
       - "apparmor-*.tar.gz"
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_PATH == "apparmor/apparmor"

From 5abbf31ce164d838a906fa7544d48e56791f43d9 Mon Sep 17 00:00:00 2001
From: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Date: Mon, 20 Jan 2025 14:06:49 +0100
Subject: [PATCH 2/2] tests: inline .send-to-coverity command

There is no other use of this yaml fragment in the project so inline it
for simplicity.

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
---
 .gitlab-ci.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b48c3a2d..0dea64ff1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -168,12 +168,6 @@ variables:
   SAST_EXCLUDED_ANALYZERS: "eslint,flawfinder,semgrep,spotbugs"
   SAST_BANDIT_EXCLUDED_PATHS: "*/tst/*, */test/*"
 
-.send-to-coverity: &send-to-coverity
-  - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME
-    --form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL
-    --form file=@$(ls apparmor-*-cov-int.tar.gz) --form version="$(git describe --tags)"
-    --form description="$(git describe --tags) / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID"
-
 coverity:
   stage: .post
   extends:
@@ -187,7 +181,10 @@ coverity:
       - COV_VERSION=$(ls -dt cov-analysis-linux64-* | head -1)
       - PATH=$PATH:$(pwd)/$COV_VERSION/bin
       - make coverity
-      - *send-to-coverity
+      - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME
+        --form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL
+        --form file=@$(ls apparmor-*-cov-int.tar.gz) --form version="$(git describe --tags)"
+        --form description="$(git describe --tags) / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID"
   artifacts:
     paths:
       - "apparmor-*.tar.gz"