removing some duplicated code.

.gitlab-ci.yml

@@ -49,32 +49,22 @@ run-test:
   # Create 'resource_group', to avoid collision when executing many pipelines at the same time.
   resource_group: test-group
 
-deliver-latest-job:
+deliver-image-job:
   stage: deliver
   variables:
-    IMAGE_TAG: "latest"
+    IMAGE_TAG: "testing-${CI_COMMIT_BRANCH}"
   script:
     - ansible-playbook ansible/deliver.yml
   rules:
+    # deliver latest
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-
-deliver-tagged-job:
-  stage: deliver
-  variables:
-    IMAGE_TAG: $CI_COMMIT_TAG
-  script:
-    - ansible-playbook ansible/deliver.yml
-  rules:
+      variables:                              # Override IMAGE_TAG variable
+        IMAGE_TAG: "latest"
+    # deliver tagged image
     - 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
+      variables:                              # Override IMAGE_TAG variable
+        IMAGE_TAG: $CI_COMMIT_TAG
+    # For custom Testing images, keep standard, naming your branch as v4.1-someSquadNameRef
     - if: $CI_COMMIT_BRANCH == 'develop'
     - if: $CI_COMMIT_BRANCH =~ /^v3*/
     - if: $CI_COMMIT_BRANCH =~ /^v4*/