update rules

pipeline.yml

@@ -17,4 +17,3 @@ include:
       - 'pipelines/linter.yml'
       - 'pipelines/security.yml'
       - 'rules/rules.yml'
-      - 'rules/mr-rules.yml'

pipelines/compliance.yml

@@ -19,7 +19,7 @@ version:
 secret_detection:
   stage: validate
   rules:
-    - if: $CI_MERGE_REQUEST_IID
+    - !reference [.mr_only_rules, rules]
   allow_failure: false
 
 sonarqube:

pipelines/go-build.yml

@@ -14,7 +14,7 @@ gobuild:
   extends: .golang-build
   stage: build
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ '/^release/' || $CI_MERGE_REQUEST_IID
+    - !reference [.default_mr_rules, rules]
       exists:
         - "go.mod"  
 

rules/mr-rules.yml

@@ -1,3 +0,0 @@
-.default_mr_rules:
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ '/^release/' || $CI_MERGE_REQUEST_IID

rules/rules.yml

@@ -4,6 +4,14 @@
 
 .sonarqube_rules:
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ '/^release/'
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ '/^release/' || $CI_MERGE_REQUEST_IID
       exists:
         - "sonar-project.properties"  
+
+.default_mr_rules:
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ '/^release/' || $CI_MERGE_REQUEST_IID
+
+.mr_only_rules:
+  rules:
+    - if: $CI_MERGE_REQUEST_IID