From 804fef5c7cde4627f8909c9ca49c328c1872f12d Mon Sep 17 00:00:00 2001
From: Alvin Huang <17609145+alvin-huang@users.noreply.github.com>
Date: Fri, 9 Oct 2020 15:49:04 -0400
Subject: [PATCH] add per commit oss->ent merge on master and release branches
 (#8740)

---
 .circleci/config.yml | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d09c589c8..c0fd943ae 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -831,6 +831,21 @@ jobs:
       - run: .circleci/scripts/cherry-picker.sh
       - run: *notify-slack-failure
 
+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:
@@ -965,8 +980,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: