From a5f72a382f2b2c63e173d834b5acf04a5c01459e Mon Sep 17 00:00:00 2001 From: Aakash Singh Date: Mon, 11 Dec 2023 15:54:40 +0530 Subject: [PATCH 1/3] use celery beat to check for pending migrations --- .github/workflows/cypress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml index f04045d0c72..36f8bdfe1d1 100644 --- a/.github/workflows/cypress.yaml +++ b/.github/workflows/cypress.yaml @@ -32,7 +32,7 @@ jobs: run: | cd care make docker_config_file=docker-compose.pre-built.yaml up - while docker compose exec backend bash -c "python manage.py showmigrations 2>/dev/null | cat | grep -q '\[ \]'"; do + while docker compose exec celery-beat bash -c "python manage.py showmigrations 2>/dev/null | cat | grep -q '\[ \]'"; do >&2 echo "Migrations are not yet applied - sleeping" sleep 5 done From 6a9c48e9575f5a02078b016f310d7f03a6b431dc Mon Sep 17 00:00:00 2001 From: Aakash Singh Date: Mon, 11 Dec 2023 15:58:04 +0530 Subject: [PATCH 2/3] increase wait time for migrations --- .github/workflows/cypress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml index 36f8bdfe1d1..aff93524f27 100644 --- a/.github/workflows/cypress.yaml +++ b/.github/workflows/cypress.yaml @@ -34,7 +34,7 @@ jobs: make docker_config_file=docker-compose.pre-built.yaml up while docker compose exec celery-beat bash -c "python manage.py showmigrations 2>/dev/null | cat | grep -q '\[ \]'"; do >&2 echo "Migrations are not yet applied - sleeping" - sleep 5 + sleep 10 done echo "Migrations are applied" cd .. From 08126d0f7264985cf3d3f612291cde72a0586ec2 Mon Sep 17 00:00:00 2001 From: Rithvik Nishad Date: Wed, 13 Dec 2023 16:42:21 +0530 Subject: [PATCH 3/3] use sainak/ci/backend-docker for cypress test --- .github/workflows/cypress.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml index aff93524f27..247e4c420dc 100644 --- a/.github/workflows/cypress.yaml +++ b/.github/workflows/cypress.yaml @@ -26,6 +26,7 @@ jobs: uses: actions/checkout@v3 with: repository: coronasafe/care + ref: sainak/fix/dummy-data-2 path: care - name: Start care docker containers 🐳