From 2663e69862cc3f78928fe6bb4966d8f6377dcee9 Mon Sep 17 00:00:00 2001
From: Shane Laymance <shane.laymance@gmail.com>
Date: Mon, 3 May 2021 14:11:19 -0700
Subject: [PATCH 1/2] Add configuration for duplicate-packages integ tests

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5d58240dd9f..94dc39caeda 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -725,6 +725,23 @@ jobs:
           spec: << parameters.scenario >>
           browser: firefox
 
+  integ_duplicate_packages:
+    parameters:
+      browser:
+        type: string
+    executor: js-test-executor
+    <<: *test_env_vars
+    working_directory: ~/amplify-js-samples-staging/samples/react/version-conflict/duplicate-packages
+    steps:
+      - prepare_test_env
+      - integ_test_js:
+          test_name: 'Duplicate Package Errors'
+          framework: react
+          category: version-conflict
+          sample_name: duplicate-packages
+          spec: duplicate-packages
+          browser: << parameters.browser >>
+
   deploy:
     executor: macos-executor
     working_directory: ~/amplify-js
@@ -771,6 +788,7 @@ releasable_branches: &releasable_branches
       - ui-components/main
       - 1.0-stable
       - native
+      - version-upgrade-circle
 
 test_browsers: &test_browsers
   browser: [chrome, firefox]
@@ -971,6 +989,15 @@ workflows:
           matrix:
             parameters:
               <<: *datastore_auth_scenarios
+      - integ_duplicate_packages:
+          requires:
+            - integ_setup
+            - build
+          filters:
+            <<: *releasable_branches
+          matrix:
+            parameters:
+              <<: *test_browsers
       - deploy:
           filters:
             <<: *releasable_branches
@@ -995,6 +1022,7 @@ workflows:
             - integ_rn_android_storage
             - integ_rn_android_storage_multipart_progress
             - integ_datastore_auth
+            - integ_duplicate_packages
       - post_release:
           filters:
             branches:

From cdd08d980ffb6c64b1be407d0014da7134014054 Mon Sep 17 00:00:00 2001
From: Shane Laymance <shane.laymance@gmail.com>
Date: Mon, 3 May 2021 15:27:38 -0700
Subject: [PATCH 2/2] Remove releasable branch used for testing

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 94dc39caeda..c123173c965 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -788,7 +788,6 @@ releasable_branches: &releasable_branches
       - ui-components/main
       - 1.0-stable
       - native
-      - version-upgrade-circle
 
 test_browsers: &test_browsers
   browser: [chrome, firefox]