Update build-and-push-resources.yaml, build-and-push-gitlab-ci.yaml

build-and-push-gitlab-ci.yaml

@@ -25,5 +25,8 @@ docker_build:build:
 # docker_build:build:
 #   extends: .docker_build:build_docker
 
-docker_notify:notify_teams:
-  extends: .docker_notify:notify_teams
+docker_notify:notify_teams_success:
+  extends: .docker_notify:notify_teams_success
+
+docker_notify:notify_teams_failure:
+  extends: .docker_notify:notify_teams_failure

build-and-push-resources.yaml

@@ -162,26 +162,23 @@ variables:
 #      - reports/gl-container-scanning-report.json
 #    expire_in: 6h
 
-
-.docker_notify:notify_teams:
-  stage: docker_notify
-  image: stefanfritsch/baseimage_statup
-  when: always
+.docker_notify:common_rules:
   rules:
     - if: '$TEAMS_WEBHOOK == null'
       when: never
     - if: '$CI_COMMIT_MESSAGE =~ /skip-build/'
       when: never
     - if: '$CI_COMMIT_TAG != null'
-      when: on_failure
-      variables:
-        CI_NOTIFICATION_STATE: failed
-        CI_NOTIFICATION_COLOR: C0392B
-    - if: '$CI_COMMIT_TAG != null'
-      when: on_success
-      variables:
-        CI_NOTIFICATION_STATE: successful
-        CI_NOTIFICATION_COLOR: 2980B9
+
+.docker_notify:notify_teams_success:
+  stage: docker_notify
+  image: stefanfritsch/baseimage_statup
+  variables:
+    CI_NOTIFICATION_STATE: successful
+    CI_NOTIFICATION_COLOR: 2980B9
+  when: always
+  rules:
+    - !reference [.docker_notify:common_rules, rules]
   script:
     - echo "CI_COMMIT_TAG is ${CI_COMMIT_TAG}"
     - |
@@ -217,5 +214,19 @@ variables:
       --data-binary "@CI_TEAMS_PAYLOAD.json" 
       ${TEAMS_WEBHOOK}
 
-.docker_notify:notify:
+
+.docker_notify:notify_teams_failure:
   extends: .docker_notify:notify_teams
+  rules:
+    - !reference [.docker_notify:common_rules, rules]
+    - if: '$CI_COMMIT_TAG != null'
+      when: on_failure
+      variables:
+        CI_NOTIFICATION_STATE: failed
+        CI_NOTIFICATION_COLOR: C0392B
+
+.docker_notify:notify_teams:
+  extends: .docker_notify:notify_teams_failure
+
+.docker_notify:notify:
+  extends: .docker_notify:notify_teams_failure