From 33f829a82b12a063d4941a4d07ddc46471728330 Mon Sep 17 00:00:00 2001
From: Andy Brown <asbrown002@gmail.com>
Date: Mon, 25 Nov 2019 15:44:30 -0800
Subject: [PATCH 1/3] run cypress in single job for now

---
 azure-pipelines.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 25b9d4f8cc..11ee4b2cb8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,8 +13,9 @@ variables:
 jobs:
   - job: e2e
     displayName: End-to-End Tests
-    strategy:
-      parallel: 4
+    # re-enable once we upgrade our subscription to cypress
+    # strategy:
+    #   parallel: 4
     pool:
       vmImage: ubuntu-latest
 
@@ -46,7 +47,14 @@ jobs:
         workingDirectory: Composer
         continueOnError: true
         env:
-          CYPRESS_RECORD_KEY: $(CYPRESS_RECORD_KEY)
+          # CYPRESS_RECORD_KEY: $(CYPRESS_RECORD_KEY)
           CYPRESS_VIDEO: true
-          CYPRESS_VIDEO_UPLOAD_ON_PASSES: true
+          # CYPRESS_VIDEO_UPLOAD_ON_PASSES: true
+          CYPRESS_SCREENSHOTS_FOLDER: $(Build.ArtifactStagingDirectory)/cypress/screenshots
+          CYPRESS_VIDEOS_FOLDER: $(Build.ArtifactStagingDirectory)/cypress/videos
           TERM: xterm
+      - task: PublishPipelineArtifact@1
+        condition: in(variables['Agent.JobStatus'], 'SucceededWithIssues', 'Failed')
+        inputs:
+          targetPath: $(Build.ArtifactStagingDirectory)/cypress
+          artifactName: e2e

From 6a667ab261d5d21f5dca2383febad4a442e48aeb Mon Sep 17 00:00:00 2001
From: Andy Brown <asbrown002@gmail.com>
Date: Mon, 25 Nov 2019 15:52:28 -0800
Subject: [PATCH 2/3] remove cli flags

---
 Composer/scripts/e2e.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Composer/scripts/e2e.sh b/Composer/scripts/e2e.sh
index 2b9ccc2c27..148fac5b2e 100755
--- a/Composer/scripts/e2e.sh
+++ b/Composer/scripts/e2e.sh
@@ -5,7 +5,7 @@ set -e
 yarn start &
 SERVER_PID=$!
 
-npx cypress run --browser chrome --record --parallel --ci-build-id $BUILD_BUILDNUMBER --group "Azure CI"
+npx cypress run --browser chrome
 cleanup
 
 function cleanup {

From 2b1e27ea45f6ced578207c2ee730e74dafd9d23f Mon Sep 17 00:00:00 2001
From: Andy Brown <asbrown002@gmail.com>
Date: Mon, 25 Nov 2019 16:10:13 -0800
Subject: [PATCH 3/3] do not fail build if cypress artifacts are not present

---
 azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 11ee4b2cb8..5cbf7b7cae 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -55,6 +55,7 @@ jobs:
           TERM: xterm
       - task: PublishPipelineArtifact@1
         condition: in(variables['Agent.JobStatus'], 'SucceededWithIssues', 'Failed')
+        continueOnError: true
         inputs:
           targetPath: $(Build.ArtifactStagingDirectory)/cypress
           artifactName: e2e