From 8595bbf60d092d87dd65d2a9a867eef0b5a87207 Mon Sep 17 00:00:00 2001
From: Tommaso Pecorella <tommaso.pecorella@unifi.it>
Date: Mon, 15 May 2023 20:57:57 +0200
Subject: [PATCH] ci: remove unused conditions in jobs

---
 utils/tests/gitlab-ci-alpine.yml | 7 ++-----
 utils/tests/gitlab-ci-clang.yml  | 3 ---
 utils/tests/gitlab-ci-fedora.yml | 2 --
 utils/tests/gitlab-ci-gcc.yml    | 2 --
 utils/tests/gitlab-ci-ubuntu.yml | 2 --
 5 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/utils/tests/gitlab-ci-alpine.yml b/utils/tests/gitlab-ci-alpine.yml
index 78341652f..e0009adbf 100644
--- a/utils/tests/gitlab-ci-alpine.yml
+++ b/utils/tests/gitlab-ci-alpine.yml
@@ -7,9 +7,9 @@
 # Alpine base
 .weekly-build-alpine:
   extends: .base-build
+  image: alpine:latest
   rules:
     - if: $RELEASE == "weekly"
-    - if: $ALPINE == "True"
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       allow_failure: true
   before_script:
@@ -26,7 +26,6 @@
 weekly-alpine:
   rules:
     - if: $RELEASE == "weekly"
-    - if: $ALPINE == "True"
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       when: manual
       allow_failure: true
@@ -37,16 +36,14 @@ weekly-alpine:
 weekly-alpine-latest-default:
   extends: .weekly-build-alpine
   needs: ["weekly-alpine"]
-  image: alpine:latest
   stage: build
   variables:
     MODE: default
 
 weekly-alpine-latest-default-test:
   extends: .weekly-build-alpine
-  image: alpine:latest
-  stage: test
   needs: ["weekly-alpine-latest-default"]
+  stage: test
   dependencies:
     - weekly-alpine-latest-default
   variables:
diff --git a/utils/tests/gitlab-ci-clang.yml b/utils/tests/gitlab-ci-clang.yml
index 19401ee66..14199d6e0 100644
--- a/utils/tests/gitlab-ci-clang.yml
+++ b/utils/tests/gitlab-ci-clang.yml
@@ -13,7 +13,6 @@
   extends: .base-build
   rules:
     - if: $RELEASE == "weekly"
-    - if: $CLANG_BUILD_ENABLE == "True"
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       allow_failure: true
   before_script:
@@ -37,7 +36,6 @@
   extends: .base-build
   rules:
     - if: $RELEASE == "weekly"
-    - if: $CLANG_BUILD_ENABLE == "True"
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       allow_failure: true
   before_script:
@@ -59,7 +57,6 @@
 weekly-clang:
   rules:
     - if: $RELEASE == "weekly"
-    - if: $CLANG_BUILD_ENABLE == "True"
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       when: manual
       allow_failure: true
diff --git a/utils/tests/gitlab-ci-fedora.yml b/utils/tests/gitlab-ci-fedora.yml
index c46cfb90a..902eab583 100644
--- a/utils/tests/gitlab-ci-fedora.yml
+++ b/utils/tests/gitlab-ci-fedora.yml
@@ -11,7 +11,6 @@
   extends: .base-build
   rules:
     - if: $RELEASE == "weekly"
-    - if: $FEDORA == "True"
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       allow_failure: true
   before_script:
@@ -37,7 +36,6 @@
 weekly-fedora:
   rules:
     - if: $RELEASE == "weekly"
-    - if: $FEDORA == "True"
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       when: manual
       allow_failure: true
diff --git a/utils/tests/gitlab-ci-gcc.yml b/utils/tests/gitlab-ci-gcc.yml
index b9c836147..d4c0b6665 100644
--- a/utils/tests/gitlab-ci-gcc.yml
+++ b/utils/tests/gitlab-ci-gcc.yml
@@ -11,7 +11,6 @@
   extends: .base-build
   rules:
     - if: $RELEASE == "weekly"
-    - if: $UBUNTU == "True"
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       allow_failure: true
   before_script:
@@ -36,7 +35,6 @@
 weekly-gcc:
   rules:
     - if: $RELEASE == "weekly"
-    - if: $UBUNTU == "True"
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       when: manual
       allow_failure: true
diff --git a/utils/tests/gitlab-ci-ubuntu.yml b/utils/tests/gitlab-ci-ubuntu.yml
index d2e6fad6c..6fe8fd9bc 100644
--- a/utils/tests/gitlab-ci-ubuntu.yml
+++ b/utils/tests/gitlab-ci-ubuntu.yml
@@ -11,7 +11,6 @@
   extends: .base-build
   rules:
     - if: $RELEASE == "weekly"
-    - if: $UBUNTU == "True"
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       allow_failure: true
   before_script:
@@ -38,7 +37,6 @@
 weekly-ubuntu:
   rules:
     - if: $RELEASE == "weekly"
-    - if: $UBUNTU == "True"
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       when: manual
       allow_failure: true