add per commit oss->ent merge on master and release branches (#8740)

.circleci/config.yml

@@ -726,6 +726,21 @@ jobs:
             - "c9:04:b7:85:bf:0e:ce:93:5f:b8:0e:68:8e:16:f3:71"
       - run: .circleci/scripts/cherry-picker.sh
 
+trigger-oss-merge:
+  docker:
+    - image: alpine:3.11
+  steps:
+    - run: apk add --no-cache --no-progress curl jq
+    - run:
+        name: trigger oss merge
+        command: |
+          curl -s -X POST \
+                  --header "Circle-Token: ${CIRCLECI_API_TOKEN}" \
+                  --header "Content-Type: application/json" \
+                  -d '{"build_parameters": {"CIRCLE_JOB": "oss-merge"}}' \
+                  "https://circleci.com/api/v1.1/project/github/hashicorp/consul-enterprise/tree/${CIRCLE_BRANCH}" | jq -r '.build_url'
+    - run: *notify-slack-failure
+
 workflows:
   version: 2
   go-tests:
@@ -851,8 +866,15 @@ workflows:
       - ember-coverage:
           requires:
             - ember-build-ent
-  cherry-pick:
+  workflow-automation:
     jobs:
+      - trigger-oss-merge:
+          context: team-consul
+          filters:
+            branches:
+              only:
+                - master
+                - /release\/\d+\.\d+\.x$/
       - cherry-picker:
           context: team-consul
           filters: