Merge pull request #318 from snyk/chore/cci-exclusive-job

Chore/cci exclusive job

Author: ivanstanev

.circleci/config.yml

@@ -211,7 +211,7 @@ jobs:
             export IMAGE_TAG=$([[ "$CIRCLE_BRANCH" == "staging" ]] && echo "staging-candidate" || echo "discardable") &&
             export KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG=snyk/kubernetes-monitor:${IMAGE_TAG}-${CIRCLE_SHA1} &&
             docker pull ${KUBERNETES_MONITOR_IMAGE_NAME_AND_TAG} &&
-            .circleci/do-exclusively --branch staging npm run test:integration:eks
+            .circleci/do-exclusively --branch staging --job ${CIRCLE_JOB} npm run test:integration:eks
       - run:
           name: Notify Slack on failure
           command: |

.circleci/do-exclusively

@@ -8,6 +8,7 @@ parse_args() {
         case $1 in
             -b|--branch) branch="$2" ;;
             -t|--tag) tag="$2" ;;
+            -j|--job) job="$2" ;;
             *) break ;;
         esac
         shift 2
@@ -43,6 +44,10 @@ make_jq_prog() {
         jq_filters+=" and (.subject | contains(\"[$tag]\"))"
     fi
 
+    if [[ $job ]]; then
+        jq_filters+=" and .workflows.job_name == \"$job\""
+    fi
+
     jq_prog=".[] | select(.build_num < $CIRCLE_BUILD_NUM and (.status | test(\"running|pending|queued\")) $jq_filters) | .build_num"
 }
 
@@ -55,7 +60,7 @@ set -o pipefail
     branch=""
     tag=""
     rest=()
-    api_url="https://circleci.com/api/v1/project/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME?circle-token=$CIRCLE_TOKEN&limit=100"
+    api_url="https://circleci.com/api/v1.1/project/gh/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME?circle-token=$CIRCLE_TOKEN&limit=100"
 
     parse_args "$@"
     commit_message=$(git log -1 --pretty=%B)