From 0b80b6a0a0117fec9bbe9ff09abf694e6ea598f7 Mon Sep 17 00:00:00 2001
From: euanmillar <euanmillar77@gmail.com>
Date: Wed, 14 Feb 2024 17:27:34 +0000
Subject: [PATCH] Remove QA_ENV true from staging env

---
 .github/workflows/deploy-prod.yml             |  4 +-
 .github/workflows/generate-demo-data.yml      | 48 -------------------
 .../docker-compose.staging-deploy.yml         |  3 --
 3 files changed, 2 insertions(+), 53 deletions(-)
 delete mode 100644 .github/workflows/generate-demo-data.yml

diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
index b0dd118a0..01e8f9110 100644
--- a/.github/workflows/deploy-prod.yml
+++ b/.github/workflows/deploy-prod.yml
@@ -30,8 +30,8 @@ jobs:
           secret: ${{ github.TOKEN }}
           approvers: euanmillar,rikukissa
           minimum-approvals: 1
-          issue-title: 'Deploy (Prod): core: ${{ github.event.inputs.core-image-tag }} country config: ${{ github.event.inputs.countryconfig-image-tag }}'
-          issue-body: 'Please approve or deny the deployment of core: ${{ github.event.inputs.core-image-tag }} country config: ${{ github.event.inputs.countryconfig-image-tag }} to production'
+          issue-title: 'Deploy (${{ github.event.inputs.environment }}): core: ${{ github.event.inputs.core-image-tag }} country config: ${{ github.event.inputs.countryconfig-image-tag }}'
+          issue-body: 'Please approve or deny the deployment of core: ${{ github.event.inputs.core-image-tag }} country config: ${{ github.event.inputs.countryconfig-image-tag }} to ${{ github.event.inputs.environment }}'
           exclude-workflow-initiator-as-approver: false
       - name: Clone core
         uses: actions/checkout@v3
diff --git a/.github/workflows/generate-demo-data.yml b/.github/workflows/generate-demo-data.yml
deleted file mode 100644
index 9ab7fb25b..000000000
--- a/.github/workflows/generate-demo-data.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# OpenCRVS is also distributed under the terms of the Civil Registration
-# & Healthcare Disclaimer located at http://opencrvs.org/license.
-#
-# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
-name: Generate demo data
-
-on:
-  workflow_dispatch:
-    inputs:
-      branch:
-        description: 'Branch to run from'
-        required: false
-        default: 'develop'
-      environment:
-        type: choice
-        description: Environment to deploy to
-        required: true
-        options:
-          - production
-          - qa
-          - staging
-
-jobs:
-  generate-demo-data:
-    environment: ${{ github.event.inputs.environment }}
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        node-version: [14.17.0]
-    steps:
-      - name: Checking out git repo
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ github.event.inputs.branch }}
-      - name: Install dependencies
-        run: yarn install
-      - name: Start generating test data
-        run: yarn data-generator
-        env:
-          COUNTRY_CONFIG_HOST: ${{ vars.COUNTRY_CONFIG_HOST }}
-          AUTH_HOST: ${{ vars.AUTH_HOST }}
-          GATEWAY_HOST: ${{ vars.GATEWAY_HOST }}
-          CONFIG_HOST: ${{ vars.CONFIG_HOST }}
-          CONCURRENCY: ${{ vars.CONCURRENCY }}
diff --git a/infrastructure/docker-compose.staging-deploy.yml b/infrastructure/docker-compose.staging-deploy.yml
index c658af0b3..4adea8ac3 100644
--- a/infrastructure/docker-compose.staging-deploy.yml
+++ b/infrastructure/docker-compose.staging-deploy.yml
@@ -39,7 +39,6 @@ services:
 
   metrics:
     environment:
-      - QA_ENV=true
       - NODE_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}
       - MONGO_URL=mongodb://metrics:${METRICS_MONGODB_PASSWORD}@mongo1/metrics?replicaSet=rs0
@@ -48,7 +47,6 @@ services:
 
   auth:
     environment:
-      - QA_ENV=true
       - NODE_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}
     deploy:
@@ -56,7 +54,6 @@ services:
 
   user-mgnt:
     environment:
-      - QA_ENV=true
       - NODE_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}
       - MONGO_URL=mongodb://user-mgnt:${USER_MGNT_MONGODB_PASSWORD}@mongo1/user-mgnt?replicaSet=rs0