From 64ba72efefacfcd32a8d36417c398430a797f102 Mon Sep 17 00:00:00 2001
From: Gunasekar-K <gunasekar.kesavalu@wipro.com>
Date: Wed, 27 Jan 2021 14:57:44 +0530
Subject: [PATCH 01/11] circleci chagnes

---
 .circleci/config.yml | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 334a941..44ed126 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -39,6 +39,16 @@ builddeploy_steps: &builddeploy_steps
             ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
             source buildenvvar
             ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
+            #testing code changes
+            if [[ true ]]; then
+                ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-qa-appvar
+                source buildenvvar  
+                curl --request POST \
+                  --url https://circleci.com/api/v2/project/github/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pipeline \
+                  --header "Circle-Token: ${QA_USER_TOKEN}" \
+                  --header 'content-type: application/json' \
+                  --data '{"branch":"'"$CIRCLE_BRANCH"'","parameters":{"run_automatedtesting":true}}'
+            fi  
 
 
 jobs:
@@ -84,7 +94,12 @@ jobs:
 
 workflows:
   version: 2
+  parameters:
+  run_automatedtesting:
+    default: false
+    type: boolean
   build:
+    when: not << pipeline.parameters.run_automatedtesting >>
     jobs:
       # Development builds are executed on "develop" branch only.
       - "build-dev":
@@ -93,6 +108,7 @@ workflows:
             branches:
               only:
                 - develop
+                - dev-circleci
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.
@@ -102,13 +118,12 @@ workflows:
             branches:
               only: master
 
+  testingflow:
+    when: << pipeline.parameters.run_automatedtesting >>
+    jobs:
       - "Run-Newman-Test":
-          context : org-global
-          requires:
-            - build-dev
-            - build-prod          
+          context : org-global        
           filters:
             branches:
               only:
-                - automated-postman-testing
-                - develop
\ No newline at end of file
+                - dev-circleci
\ No newline at end of file

From e70ce36bc81de4a176faa8e3eccfb40c1bbc8636 Mon Sep 17 00:00:00 2001
From: Gunasekar-K <gunasekar.kesavalu@wipro.com>
Date: Wed, 27 Jan 2021 15:01:32 +0530
Subject: [PATCH 02/11] circleci chagnes

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 44ed126..5359143 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,4 +1,8 @@
 version: 2
+parameters:
+  run_automatedtesting:
+    default: false
+    type: boolean
 defaults: &defaults
     docker:
       - image: circleci/python:2.7-stretch-browsers
@@ -94,10 +98,6 @@ jobs:
 
 workflows:
   version: 2
-  parameters:
-  run_automatedtesting:
-    default: false
-    type: boolean
   build:
     when: not << pipeline.parameters.run_automatedtesting >>
     jobs:

From fa3d4da6f86d41fd0c15c182404cd5be873d8e5e Mon Sep 17 00:00:00 2001
From: Gunasekar-K <gunasekar.kesavalu@wipro.com>
Date: Wed, 27 Jan 2021 15:18:49 +0530
Subject: [PATCH 03/11] circleci chagnes

---
 .circleci/config.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5359143..7773fd0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,4 +1,4 @@
-version: 2
+version: 2.1
 parameters:
   run_automatedtesting:
     default: false
@@ -99,7 +99,8 @@ jobs:
 workflows:
   version: 2
   build:
-    when: not << pipeline.parameters.run_automatedtesting >>
+    when: 
+      - not << pipeline.parameters.run_automatedtesting >>
     jobs:
       # Development builds are executed on "develop" branch only.
       - "build-dev":

From 0343813691b19dbfcc1dda1ad05fe4eaf2315419 Mon Sep 17 00:00:00 2001
From: Gunasekar-K <gunasekar.kesavalu@wipro.com>
Date: Wed, 27 Jan 2021 15:20:40 +0530
Subject: [PATCH 04/11] circleci chagnes

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7773fd0..8118dcb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -100,7 +100,7 @@ workflows:
   version: 2
   build:
     when: 
-      - not << pipeline.parameters.run_automatedtesting >>
+      - not: << pipeline.parameters.run_automatedtesting >>
     jobs:
       # Development builds are executed on "develop" branch only.
       - "build-dev":

From 251206973081423f3e4ad136d95d40fe138e087e Mon Sep 17 00:00:00 2001
From: Gunasekar-K <gunasekar.kesavalu@wipro.com>
Date: Wed, 27 Jan 2021 15:35:32 +0530
Subject: [PATCH 05/11] circleci chagnes

---
 .circleci/config.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8118dcb..be78437 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -99,8 +99,7 @@ jobs:
 workflows:
   version: 2
   build:
-    when: 
-      - not: << pipeline.parameters.run_automatedtesting >>
+    when: not << pipeline.parameters.run_automatedtesting >>
     jobs:
       # Development builds are executed on "develop" branch only.
       - "build-dev":

From aae6d4a5d1d2406149400a421e61c1e969b31224 Mon Sep 17 00:00:00 2001
From: Gunasekar-K <gunasekar.kesavalu@wipro.com>
Date: Wed, 27 Jan 2021 17:09:35 +0530
Subject: [PATCH 06/11] circleci chagnes

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index be78437..0334f92 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,6 +30,7 @@ save_cache_settings: &save_cache_settings
 builddeploy_steps: &builddeploy_steps
       - checkout
       - setup_remote_docker
+      - run: echo "<< pipeline.parameters.run_automatedtesting >>"
       - run: *install_dependency
       - run: *install_deploysuite
       - restore_cache: *restore_cache_settings_for_build

From bcf0bf0c6c358c06ea7f068ab20f0b7522583ac5 Mon Sep 17 00:00:00 2001
From: Gunasekar-K <gunasekar.kesavalu@wipro.com>
Date: Wed, 27 Jan 2021 17:15:11 +0530
Subject: [PATCH 07/11] circleci chagnes

---
 .circleci/config.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0334f92..72c81c0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,6 +3,9 @@ parameters:
   run_automatedtesting:
     default: false
     type: boolean
+  run_basedeployment:
+    default: true
+    type: boolean
 defaults: &defaults
     docker:
       - image: circleci/python:2.7-stretch-browsers
@@ -52,7 +55,7 @@ builddeploy_steps: &builddeploy_steps
                   --url https://circleci.com/api/v2/project/github/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pipeline \
                   --header "Circle-Token: ${QA_USER_TOKEN}" \
                   --header 'content-type: application/json' \
-                  --data '{"branch":"'"$CIRCLE_BRANCH"'","parameters":{"run_automatedtesting":true}}'
+                  --data '{"branch":"'"$CIRCLE_BRANCH"'","parameters":{"run_automatedtesting":true , "run_basedeployment": false}}'
             fi  
 
 
@@ -100,7 +103,7 @@ jobs:
 workflows:
   version: 2
   build:
-    when: not << pipeline.parameters.run_automatedtesting >>
+    when: << pipeline.parameters.run_basedeployment >>
     jobs:
       # Development builds are executed on "develop" branch only.
       - "build-dev":

From 46c3cc171b677f517f064881a825176ec94d95a5 Mon Sep 17 00:00:00 2001
From: Gunasekar-K <gunasekar.kesavalu@wipro.com>
Date: Wed, 27 Jan 2021 17:29:16 +0530
Subject: [PATCH 08/11] circleci chagnes

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 72c81c0..946453a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -49,7 +49,7 @@ builddeploy_steps: &builddeploy_steps
             ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
             #testing code changes
             if [[ true ]]; then
-                ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-qa-appvar
+                ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-qa-v1-appvar
                 source buildenvvar  
                 curl --request POST \
                   --url https://circleci.com/api/v2/project/github/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pipeline \

From 0a007654aeb293da745df8a74e7dcbfda8e39bf9 Mon Sep 17 00:00:00 2001
From: Gunasekar-K <gunasekar.kesavalu@wipro.com>
Date: Thu, 28 Jan 2021 12:38:57 +0530
Subject: [PATCH 09/11] circleci chagnes

---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 946453a..7a8fa23 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,7 +33,6 @@ save_cache_settings: &save_cache_settings
 builddeploy_steps: &builddeploy_steps
       - checkout
       - setup_remote_docker
-      - run: echo "<< pipeline.parameters.run_automatedtesting >>"
       - run: *install_dependency
       - run: *install_deploysuite
       - restore_cache: *restore_cache_settings_for_build

From f3686b7d86db8200d4dbf4acbcf35d5bd38dd72e Mon Sep 17 00:00:00 2001
From: Gunasekar-K <gunasekar.kesavalu@wipro.com>
Date: Wed, 3 Feb 2021 16:09:32 +0530
Subject: [PATCH 10/11] approval

---
 .circleci/config.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7a8fa23..4ca633e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -124,8 +124,12 @@ workflows:
   testingflow:
     when: << pipeline.parameters.run_automatedtesting >>
     jobs:
+      - Hold [Performance-Testing]:
+          type: approval
       - "Run-Newman-Test":
-          context : org-global        
+          context : org-global   
+          requires:
+            - Hold [Performance-Testing]     
           filters:
             branches:
               only:

From fbe3324df1fb78c6d838559e1b94d7f94a75ef5c Mon Sep 17 00:00:00 2001
From: Gunasekar-K <Gunasekar.Kesavalu@wipro.com>
Date: Thu, 11 Feb 2021 20:10:37 +0530
Subject: [PATCH 11/11] Update config.yml

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4ca633e..3640bf5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -113,7 +113,7 @@ workflows:
                 - develop
                 - dev-circleci
 
-      # Production builds are exectuted only on tagged commits to the
+      # Production builds are exectuted only on tagged commits to the testing
       # master branch.
       - "build-prod":
           context : org-global
@@ -133,4 +133,4 @@ workflows:
           filters:
             branches:
               only:
-                - dev-circleci
\ No newline at end of file
+                - dev-circleci