Merge pull request #100 from snyk/chore/ci_fixes

Chore/ci fixes

Author: Amir Moualem

.travis.yml

@@ -42,7 +42,8 @@ jobs:
               IMAGE_NAME_APPROVED=snyk/kubernetes-monitor:${NEW_VERSION}-approved &&
               docker tag ${IMAGE_NAME_CANDIDATE} ${IMAGE_NAME_APPROVED} &&
               docker push ${IMAGE_NAME_APPROVED} &&
-              ./scripts/slack-notify-push.sh ${IMAGE_NAME_APPROVED}
+              ./scripts/slack-notify-push.sh ${IMAGE_NAME_APPROVED} ||
+              ./scripts/slack-notify-failure.sh staging
       name: Test and Build
 ######################## PR TO MASTER ########################
     - stage: pre-publish
@@ -52,7 +53,8 @@ jobs:
 ######################## MERGE TO MASTER ########################
     - stage: Publish
       if: branch = master AND type = push
-      script: LATEST_TAG=`git describe --abbrev=0 --tags ${TRAVIS_COMMIT}` &&
+      script: LATEST_TAG_WITH_V=`git describe --abbrev=0 --tags ${TRAVIS_COMMIT}` &&
+              LATEST_TAG=${LATEST_TAG_WITH_V:1} &&
               IMAGE_NAME_APPROVED=snyk/kubernetes-monitor:${LATEST_TAG}-approved &&
               IMAGE_NAME_PUBLISHED=snyk/kubernetes-monitor:${LATEST_TAG} &&
               docker login --username ${DOCKERHUB_USER} --password ${DOCKERHUB_PASSWORD} &&
@@ -62,7 +64,8 @@ jobs:
               ./scripts/slack-notify-push.sh ${IMAGE_NAME_PUBLISHED} &&
               docker tag ${IMAGE_NAME_APPROVED} snyk/kubernetes-monitor:latest &&
               docker push ${IMAGE_NAME_PUBLISHED} &&
-              ./scripts/slack-notify-push.sh snyk/kubernetes-monitor:latest
+              ./scripts/slack-notify-push.sh snyk/kubernetes-monitor:latest ||
+              ./scripts/slack-notify-failure.sh master
       name: publish the kubernetes-monitor (npm, container, helm)
 branches:
   only:

scripts/slack-notify-failure.sh

@@ -0,0 +1,2 @@
+#! /bin/bash
+curl -X POST -H 'Content-Type:application/json' -d '{"attachments": [{"color": "warning", "fallback": "Build Notification: $TRAVIS_BUILD_WEB_URL", "title": ":warning: Kubernetes-Monitor Merge Failure :warning:", "text": ":egg_broken_1: Kubernetes-Monitor broken branch: `'$1'` :egg_broken_1:"}]}' $SLACK_WEBHOOK