Develop

.gitlab-ci.yml

@@ -3,7 +3,9 @@ workflow:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
     - if: $CI_COMMIT_TAG
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-
+    - if: $CI_COMMIT_BRANCH == 'develop'
+    - if: $CI_COMMIT_BRANCH =~ /^v3*/
+    - if: $CI_COMMIT_BRANCH =~ /^v4*/
 
 default:
   tags:
@@ -121,9 +123,8 @@ deliver-latest-job:
     IMAGE_TAG: "latest"
   script:
     - ansible-playbook ansible/deliver.yml
-  only:
-    - main
-    - master
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 
 deliver-tagged-job:
   stage: deliver
@@ -131,5 +132,18 @@ deliver-tagged-job:
     IMAGE_TAG: $CI_COMMIT_TAG
   script:
     - ansible-playbook ansible/deliver.yml
-  only:
-    - tags
+  rules:
+    - if: $CI_COMMIT_TAG
+
+deliver-testing-branch-job:
+  stage: deliver
+  variables:
+    IMAGE_TAG: "testing-${CI_COMMIT_BRANCH}"
+  script:
+    - ansible-playbook ansible/deliver.yml
+  rules:
+    # For custom Testing images, keep standard, naming your branch as v4.1someSquadNameRef
+    - if: $CI_COMMIT_BRANCH == 'develop'
+    - if: $CI_COMMIT_BRANCH =~ /^v3*/
+    - if: $CI_COMMIT_BRANCH =~ /^v4*/
+