From 0ff353ff468fcd5aefc94861861baf5d013dd5f3 Mon Sep 17 00:00:00 2001
From: Jay Sharma <jay.sharma@lifeline.com>
Date: Wed, 2 Aug 2023 11:47:42 +0530
Subject: [PATCH] dev/qa commit

---
 bitbucket-pipelines.yml | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 290b4e4f..ca3a23fd 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -63,10 +63,9 @@ definitions:
       - source setenv.sh
       - fi
       - echo "This is for $ENV environment"
-      - curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && unzip awscliv2.zip && ./aws/install
       - ls -lrth && cd build/${ENV}      
-      - export DB_PASSWORD=$(aws ssm get-parameters --names $ENV-medicalalert-masterdbpass  --query "Parameters[*].{Value:Value}" --output text)
-      - export DB_PASSWORD=`echo -n "$DB_PASSWORD" | base64` &&  sed -i "/DB_PASSWORD/c\  DB_PASSWORD: $DB_PASSWORD" secrets.yaml
+#     - export DB_PASSWORD=$(aws ssm get-parameters --names $ENV-$BITBUCKET_REPO_SLUG  --query "Parameters[*].{Value:Value}" --output text)
+#     - export DB_PASSWORD=`echo -n "$DB_PASSWORD" | base64` &&  sed -i "/DB_PASSWORD/c\  DB_PASSWORD = $DB_PASSWORD" secrets.yaml
       - envsubst < deployment.tpl > deployment.yaml
       - cat deployment.yaml
       - pipe: atlassian/aws-eks-kubectl-run:2.2.0
@@ -85,36 +84,36 @@ pipelines:
   # our custom pipeline, what shows up Bitbucket web app
   custom:
     deploy-dev:
-    - <<: *set-variables
+    - !!merge <<: *set-variables
     - step:
-        <<: *deploy
+        !!merge <<: *deploy
         deployment: dev
         name: "deploy to dev"
 
     deploy-qa:
-    -  <<: *set-variables
+    - !!merge <<: *set-variables
     - step:
-        <<: *deploy
+        !!merge <<: *deploy
         deployment: qa
         name: "deploy to qa"
 
     release-stg:
-    -  <<: *set-variables
+    - !!merge <<: *set-variables
     - step:
-        <<: *deploy
+        !!merge <<: *deploy
         deployment: stage
         name: "deploy to stage"
 
     release-prod:
-    - <<: *set-variables
+    - !!merge <<: *set-variables
     - step:
-        <<: *deploy
+        !!merge <<: *deploy
         deployment: prod
         name: "deploy to prod"
 
 
     common-jobs:
-    - <<: *set-variables-jobs
+    - !!merge <<: *set-variables-jobs
     - step:
         name: vars for common-jobs
         script:
@@ -141,7 +140,7 @@ pipelines:
         
 
     subdomain-deploy:
-    - <<: *set-variables-subdomain
+    - !!merge <<: *set-variables-subdomain
     - step:
         name: vars for subdomain
         script:
@@ -188,7 +187,7 @@ pipelines:
 
 
     release:
-    - <<: *set-variables
+    - !!merge <<: *set-variables
     - step:
         name: "plan for the release and tag the given version."
         image: atlassian/pipelines-awscli
@@ -202,7 +201,7 @@ pipelines:
         artifacts: # define the artifacts to be passed to each future step
         - setenv.sh
     - step:
-        <<: *deploy
+        !!merge <<: *deploy
         deployment: stage
         name: "deploy the release to stage"
         trigger: manual
@@ -215,7 +214,7 @@ pipelines:
         artifacts: # define the artifacts to be passed to each future step
         - setenv.sh
     - step:
-        <<: *deploy
+        !!merge <<: *deploy
         deployment: prod
         name: "deploy the release to production"
         trigger: manual
@@ -252,7 +251,7 @@ pipelines:
         artifacts: # define the artifacts to be passed to each future step
         - setenv.sh
     - step:
-        <<: *deploy
+        !!merge <<: *deploy
         deployment: dev
         name: "deploy to dev"
     - step:
@@ -263,7 +262,7 @@ pipelines:
         artifacts:
         - setenv.sh
     - step:
-        <<: *deploy
+        !!merge <<: *deploy
         deployment: qa
         name: "deploy to qa"
         trigger: manual