From e97954634f6981a5d96164c81c15d4f562666b5d Mon Sep 17 00:00:00 2001
From: Joshua Li <lijshu@amazon.com>
Date: Mon, 13 Jul 2020 13:59:30 -0700
Subject: [PATCH 1/3] Add release drafter workflow

---
 .github/draft-release-notes-config.yml        | 35 +++++++++++++++++++
 .../draft-release-notes-workflow.yml          | 20 +++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 .github/draft-release-notes-config.yml
 create mode 100644 .github/workflows/draft-release-notes-workflow.yml

diff --git a/.github/draft-release-notes-config.yml b/.github/draft-release-notes-config.yml
new file mode 100644
index 0000000000..6501815bce
--- /dev/null
+++ b/.github/draft-release-notes-config.yml
@@ -0,0 +1,35 @@
+# The overall template of the release notes
+template: |
+  Open Distro for Elasticsearch Version $RESOLVED_VERSION
+  $CHANGES
+
+# Setting the formatting and sorting for the release notes body
+name-template: Version $RESOLVED_VERSION
+change-template: "- $TITLE (PR [#$NUMBER](https://github.com/opendistro-for-elasticsearch/sql/pull/$NUMBER))"
+sort-by: merged_at
+sort-direction: ascending
+
+# Organizing the tagged PRs into categories
+categories:
+  - title: "Version Upgrades"
+    labels:
+      - "version compatibility"
+  - title: "Documentation"
+    labels:
+      - "documentation"
+  - title: "SQL"
+    labels:
+      - "SQL"
+      - "PPL"
+  - title: "CLI"
+    labels:
+      - "CLI"
+  - title: "SQL JDBC"
+    labels:
+      - "JDBC"
+  - title: "SQL ODBC"
+    labels:
+      - "ODBC"
+  - title: "SQL Workbench"
+    labels:
+      - "Workbench"
diff --git a/.github/workflows/draft-release-notes-workflow.yml b/.github/workflows/draft-release-notes-workflow.yml
new file mode 100644
index 0000000000..366d56785f
--- /dev/null
+++ b/.github/workflows/draft-release-notes-workflow.yml
@@ -0,0 +1,20 @@
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    name: Update draft release notes
+    runs-on: ubuntu-latest
+    steps:
+      - name: Update draft release notes
+        uses: release-drafter/release-drafter@v5
+        with:
+          config-name: draft-release-notes-config.yml
+          tag: (None)
+          version: 1.9.0.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From a160ddd4532e07f2bf01e7512993f7aeda7cb0c7 Mon Sep 17 00:00:00 2001
From: Joshua Li <lijshu@amazon.com>
Date: Mon, 13 Jul 2020 15:08:11 -0700
Subject: [PATCH 2/3] Add more labels to release drafter workflow

---
 .github/draft-release-notes-config.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/draft-release-notes-config.yml b/.github/draft-release-notes-config.yml
index 6501815bce..26cbc84b3f 100644
--- a/.github/draft-release-notes-config.yml
+++ b/.github/draft-release-notes-config.yml
@@ -14,14 +14,26 @@ categories:
   - title: "Version Upgrades"
     labels:
       - "version compatibility"
+  - title: "Features"
+    labels:
+      - "feature"
+  - title: "Enhancements"
+    labels:
+      - "enhancement"
+  - title: "Maintenance"
+    labels:
+      - "maintenance"
+  - title: "Bug Fixes"
+    labels:
+      - "bug"
   - title: "Documentation"
     labels:
       - "documentation"
-  - title: "SQL"
+  - title: "SQL and PPL"
     labels:
       - "SQL"
       - "PPL"
-  - title: "CLI"
+  - title: "SQL CLI"
     labels:
       - "CLI"
   - title: "SQL JDBC"

From eb047dfe83283e0a0a721a92e2c5682d3df3fc4d Mon Sep 17 00:00:00 2001
From: Joshua Li <lijshu@amazon.com>
Date: Mon, 13 Jul 2020 15:15:19 -0700
Subject: [PATCH 3/3] Rearrange labels in release drafter workflow

---
 .github/draft-release-notes-config.yml        | 25 ++++++++-----------
 .../draft-release-notes-workflow.yml          |  1 +
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/.github/draft-release-notes-config.yml b/.github/draft-release-notes-config.yml
index 26cbc84b3f..8810497fef 100644
--- a/.github/draft-release-notes-config.yml
+++ b/.github/draft-release-notes-config.yml
@@ -14,21 +14,6 @@ categories:
   - title: "Version Upgrades"
     labels:
       - "version compatibility"
-  - title: "Features"
-    labels:
-      - "feature"
-  - title: "Enhancements"
-    labels:
-      - "enhancement"
-  - title: "Maintenance"
-    labels:
-      - "maintenance"
-  - title: "Bug Fixes"
-    labels:
-      - "bug"
-  - title: "Documentation"
-    labels:
-      - "documentation"
   - title: "SQL and PPL"
     labels:
       - "SQL"
@@ -45,3 +30,13 @@ categories:
   - title: "SQL Workbench"
     labels:
       - "Workbench"
+  - title: "Enhancements"
+    labels:
+      - "enhancement"
+      - "maintenance"
+  - title: "Bug Fixes"
+    labels:
+      - "bug"
+  - title: "Documentation"
+    labels:
+      - "documentation"
diff --git a/.github/workflows/draft-release-notes-workflow.yml b/.github/workflows/draft-release-notes-workflow.yml
index 366d56785f..1b2e7b2797 100644
--- a/.github/workflows/draft-release-notes-workflow.yml
+++ b/.github/workflows/draft-release-notes-workflow.yml
@@ -10,6 +10,7 @@ jobs:
     name: Update draft release notes
     runs-on: ubuntu-latest
     steps:
+      # Drafts your next Release notes as Pull Requests are merged into "master"
       - name: Update draft release notes
         uses: release-drafter/release-drafter@v5
         with: