From 0389859d3038807dca1c9bd067486146366db50f Mon Sep 17 00:00:00 2001
From: nadeemshahzad <nshahzad@edx.org>
Date: Wed, 23 Sep 2020 12:06:41 +0000
Subject: [PATCH] add wait to github action to complete db migration

---
 .github/workflows/mysqldbdump.yml   | 4 ++++
 .github/workflows/mysqldbdump_pr.sh | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/mysqldbdump.yml b/.github/workflows/mysqldbdump.yml
index 75be24d019..23961eefbc 100644
--- a/.github/workflows/mysqldbdump.yml
+++ b/.github/workflows/mysqldbdump.yml
@@ -12,6 +12,10 @@ jobs:
         uses: actions/checkout@v2
       - name: Migrate
         run: docker-compose -f ./.github/workflows/docker-compose.yml.mysqldbdump up -d
+      - name: Wait for migration to complete
+        uses: jakejarvis/wait-action@master
+        with:
+          time: '600s'
       - name: Dump database
         run: docker exec -i edx.devstack.mysql mysqldump -u'edxapp001' -p'password' edxapp > edxapp.sql
       - name: Commit dump file to repo.
diff --git a/.github/workflows/mysqldbdump_pr.sh b/.github/workflows/mysqldbdump_pr.sh
index 893cc52bbc..42c8e7c194 100755
--- a/.github/workflows/mysqldbdump_pr.sh
+++ b/.github/workflows/mysqldbdump_pr.sh
@@ -17,7 +17,7 @@ cd "$REPO_NAME"
 git config --global user.name "${GITHUB_USER}"
 git config --global user.email "${GITHUB_EMAIL}"
 
-obsolete_dump_pr=`../hub-linux*/bin/hub pr list -s open  | grep 'github-actions-mysqldbdump' | awk '{print $1}' | sed 's/\#//g'`
+obsolete_dump_pr=`../hub-linux*/bin/hub pr list -s open  | grep "${DB_NAME} MySQL database dump" | awk '{print $1}' | sed 's/\#//g'`
 if [[ ! -z $obsolete_dump_pr ]]; then
  ../hub-linux*/bin/hub issue update $obsolete_dump_pr -s closed
 fi
@@ -26,4 +26,4 @@ git checkout -b github-actions-mysqldbdump/$GITHUB_SHA
 git add "${DB_NAME}".sql
 git commit  -m "MySQLdbdump" --author "GitHub Actions MySQLdbdump automation <admin@edx.org>"
 git push --set-upstream origin github-actions-mysqldbdump/$GITHUB_SHA
-../hub-linux*/bin/hub pull-request -m "${DB_NAME} MySQL database dump" -m "MySQL database dump" -l github-actions-mysqldbdump
+../hub-linux*/bin/hub pull-request -m "${DB_NAME} MySQL database dump" -m "MySQL database dump"