From 8ea3b877c5fb238ae1768ff15738faf228e5b111 Mon Sep 17 00:00:00 2001
From: Mihai Patrascoiu <mihai.patrascoiu@cern.ch>
Date: Thu, 20 Jul 2023 14:51:10 +0200
Subject: [PATCH 1/6] CI: Test commit

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 588ee170..1468c695 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -234,6 +234,7 @@ rpm_tests:
 rpms:
   <<: *publish-template_definition
   rules:
+    # Change for test commit
     - if: '$CI_PROJECT_NAMESPACE != "fts"'
       when: never
     - if: '$CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_TAG != null'
-- 
GitLab


From 3a134c1a814448a3343e8208687371735bd493e3 Mon Sep 17 00:00:00 2001
From: Mihai Patrascoiu <mihai.patrascoiu@cern.ch>
Date: Thu, 20 Jul 2023 14:58:16 +0200
Subject: [PATCH 2/6] CI: Another test commit

---
 .gitlab-ci.yml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1468c695..8576d974 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -109,6 +109,26 @@ server_rpm:
     paths:
       - artifacts/
 
+ci_cd_test:
+  stage: build
+  image: gitlab-registry.cern.ch/linuxsupport/cc7-base
+  script:
+    - echo "GitLab CI/CD | Print all environment variables"
+    - env
+
+ci_cd_test_with_rules:
+  stage: build
+  image: gitlab-registry.cern.ch/linuxsupport/cc7-base
+  script:
+    - echo "GitLab CI/CD | Print all environment variables"
+    - env
+  rules:
+    - if: '$CI_PROJECT_NAMESPACE != "fts"'
+      when: never
+    - if: '$CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_TAG != null'
+    - if: '$CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_TAG == null'
+      when: manual
+
 #--------------------------
 # Docker build templates
 #--------------------------
@@ -234,7 +254,6 @@ rpm_tests:
 rpms:
   <<: *publish-template_definition
   rules:
-    # Change for test commit
     - if: '$CI_PROJECT_NAMESPACE != "fts"'
       when: never
     - if: '$CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_TAG != null'
-- 
GitLab


From 555a170f8f3f5e9d283056beeab6c96e95665bcb Mon Sep 17 00:00:00 2001
From: Mihai Patrascoiu <mihai.patrascoiu@cern.ch>
Date: Thu, 20 Jul 2023 15:11:04 +0200
Subject: [PATCH 3/6] CI: Yet another test commit

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8576d974..202d3531 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -125,6 +125,8 @@ ci_cd_test_with_rules:
   rules:
     - if: '$CI_PROJECT_NAMESPACE != "fts"'
       when: never
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
     - if: '$CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_TAG != null'
     - if: '$CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_TAG == null'
       when: manual
-- 
GitLab


From 6031149f53a19105b8d139104dc39413f9c062cc Mon Sep 17 00:00:00 2001
From: Mihai Patrascoiu <mihai.patrascoiu@cern.ch>
Date: Thu, 20 Jul 2023 15:13:43 +0200
Subject: [PATCH 4/6] Revert "CI: Yet another test commit"

This reverts commit 555a170f8f3f5e9d283056beeab6c96e95665bcb.
---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 202d3531..8576d974 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -125,8 +125,6 @@ ci_cd_test_with_rules:
   rules:
     - if: '$CI_PROJECT_NAMESPACE != "fts"'
       when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: never
     - if: '$CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_TAG != null'
     - if: '$CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_TAG == null'
       when: manual
-- 
GitLab


From e4d1f868a2a3c5d59d6f1946aa9536ebf8210477 Mon Sep 17 00:00:00 2001
From: Mihai Patrascoiu <mihai.patrascoiu@cern.ch>
Date: Thu, 20 Jul 2023 15:11:04 +0200
Subject: [PATCH 5/6] CI: Yet another test commit

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8576d974..202d3531 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -125,6 +125,8 @@ ci_cd_test_with_rules:
   rules:
     - if: '$CI_PROJECT_NAMESPACE != "fts"'
       when: never
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
     - if: '$CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_TAG != null'
     - if: '$CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_TAG == null'
       when: manual
-- 
GitLab


From d7170b9b35e31e0ffda182fb258354862dab21c7 Mon Sep 17 00:00:00 2001
From: Mihai Patrascoiu <mihai.patrascoiu@cern.ch>
Date: Thu, 20 Jul 2023 15:14:23 +0200
Subject: [PATCH 6/6] CI: Hopefully final commit

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 202d3531..cbde8e7c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -258,6 +258,8 @@ rpms:
   rules:
     - if: '$CI_PROJECT_NAMESPACE != "fts"'
       when: never
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
     - if: '$CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_TAG != null'
     - if: '$CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_TAG == null'
       when: manual
-- 
GitLab