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

---
 bitbucket-pipelines.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index bb342a81..290b4e4f 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -85,36 +85,36 @@ pipelines:
   # our custom pipeline, what shows up Bitbucket web app
   custom:
     deploy-dev:
-    - !!merge <<: *set-variables
+    - <<: *set-variables
     - step:
-        !!merge <<: *deploy
+        <<: *deploy
         deployment: dev
         name: "deploy to dev"
 
     deploy-qa:
-    - !!merge <<: *set-variables
+    -  <<: *set-variables
     - step:
-        !!merge <<: *deploy
+        <<: *deploy
         deployment: qa
         name: "deploy to qa"
 
     release-stg:
-    - !!merge <<: *set-variables
+    -  <<: *set-variables
     - step:
-        !!merge <<: *deploy
+        <<: *deploy
         deployment: stage
         name: "deploy to stage"
 
     release-prod:
-    - !!merge <<: *set-variables
+    - <<: *set-variables
     - step:
-        !!merge <<: *deploy
+        <<: *deploy
         deployment: prod
         name: "deploy to prod"
 
 
     common-jobs:
-    - !!merge <<: *set-variables-jobs
+    - <<: *set-variables-jobs
     - step:
         name: vars for common-jobs
         script:
@@ -141,7 +141,7 @@ pipelines:
         
 
     subdomain-deploy:
-    - !!merge <<: *set-variables-subdomain
+    - <<: *set-variables-subdomain
     - step:
         name: vars for subdomain
         script:
@@ -188,7 +188,7 @@ pipelines:
 
 
     release:
-    - !!merge <<: *set-variables
+    - <<: *set-variables
     - step:
         name: "plan for the release and tag the given version."
         image: atlassian/pipelines-awscli
@@ -202,7 +202,7 @@ pipelines:
         artifacts: # define the artifacts to be passed to each future step
         - setenv.sh
     - step:
-        !!merge <<: *deploy
+        <<: *deploy
         deployment: stage
         name: "deploy the release to stage"
         trigger: manual
@@ -215,7 +215,7 @@ pipelines:
         artifacts: # define the artifacts to be passed to each future step
         - setenv.sh
     - step:
-        !!merge <<: *deploy
+        <<: *deploy
         deployment: prod
         name: "deploy the release to production"
         trigger: manual
@@ -252,7 +252,7 @@ pipelines:
         artifacts: # define the artifacts to be passed to each future step
         - setenv.sh
     - step:
-        !!merge <<: *deploy
+        <<: *deploy
         deployment: dev
         name: "deploy to dev"
     - step:
@@ -263,7 +263,7 @@ pipelines:
         artifacts:
         - setenv.sh
     - step:
-        !!merge <<: *deploy
+        <<: *deploy
         deployment: qa
         name: "deploy to qa"
         trigger: manual