From c966304e90d08eebc0264b40c3a62c7a2cd51152 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Mon, 14 Feb 2022 21:06:31 +0100
Subject: [PATCH] Drop coverity cache feature

The coverity CI job cache feature is used to ensure that the 1 GB
cov-analysis-linux64.tgz file is being cached on GitLab CI runner, where
it was downloaded in the past. This feature does not seem to work
anymore; given that the proper solution to creating distributed cache is
complicated, better to drop the feature altogether.
---
 .gitlab-ci.yml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75b68b687c..7188734558 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1174,16 +1174,14 @@ release:
 
 # Coverity Scan analysis upload
 
-.coverity_cache_prep: &coverity_cache_prep
-  - test -f cov-analysis-linux64.md5 && test -f cov-analysis-linux64.tgz || (
-    curl --output cov-analysis-linux64.md5 https://scan.coverity.com/download/linux64
+.coverity_prep: &coverity_prep
+  - curl --output cov-analysis-linux64.md5 https://scan.coverity.com/download/linux64
          --form project=$COVERITY_SCAN_PROJECT_NAME
          --form token=$COVERITY_SCAN_TOKEN
-         --form md5=1;
-    curl --output cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64
+         --form md5=1
+  - curl --output cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64
          --form project=$COVERITY_SCAN_PROJECT_NAME
-         --form token=$COVERITY_SCAN_TOKEN;
-    )
+         --form token=$COVERITY_SCAN_TOKEN
   - test "$(md5sum cov-analysis-linux64.tgz | awk '{ print $1 }')" = "$(cat cov-analysis-linux64.md5)"
   - tar --extract --gzip --file=cov-analysis-linux64.tgz
   - test -d cov-analysis-linux64-2021.12.1
@@ -1208,7 +1206,7 @@ coverity:
     CFLAGS: "${CFLAGS_COMMON} -Og"
     EXTRA_CONFIGURE: "--with-libidn2"
   script:
-    - *coverity_cache_prep
+    - *coverity_prep
     - *configure
     - *coverity_build
   needs:
@@ -1224,11 +1222,6 @@ coverity:
     variables:
       - $COVERITY_SCAN_PROJECT_NAME
       - $COVERITY_SCAN_TOKEN
-  cache:
-    key: cov-analysis-linux64-2021.12.1
-    paths:
-      - cov-analysis-linux64.md5
-      - cov-analysis-linux64.tgz
 
 # Respdiff tests