Remove Real Svc Tests From Client Pipeline and Fix Test Results in Re…

…al Svc Test Pipeline (#5061)
microsoft · Feb 5, 2021 · 3c7d7c9 · 3c7d7c9
1 parent d02bf26
commit 3c7d7c9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/tools/pipelines/build-client.yml b/tools/pipelines/build-client.yml
@@ -99,16 +99,3 @@ extends:
           cp repo-package.json packages/package.json
           cp repo-package-lock.json packages/package-lock.json
 
-    additionalTests:
-      - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
-        - task: Npm@1
-          displayName: '[end-to-end tests] npm run ci:test:realsvc'
-          env:
-            fluid__webpack__bearerSecret: $(fluid-webpack-bearerSecret)
-            fluid__webpack__fluidHost: $(fluid-webpack-fluidHost)
-            fluid__webpack__tenantId: $(fluid-webpack-tenantId)
-            fluid__webpack__tenantSecret: $(fluid-webpack-tenantSecret)
-          inputs:
-            command: 'custom'
-            workingDir: packages/test/end-to-end-tests
-            customCommand: 'run ci:test:realsvc' # This script ends with 'exit 0' so this task should never fail
diff --git a/tools/pipelines/test-real-service.yml b/tools/pipelines/test-real-service.yml
@@ -22,7 +22,6 @@ parameters:
   type: boolean
   default: false
 
-trigger: none
 pr: none
 
 variables:
@@ -70,6 +69,7 @@ jobs:
     # Run End-to-end Tests
     - task: Npm@1
       displayName: '[end-to-end tests] npm run ci:test:realsvc'
+      continueOnError: true
       env:
         fluid__webpack__bearerSecret: $(fluid-webpack-bearerSecret)
         fluid__webpack__fluidHost: $(fluid-webpack-fluidHost)
@@ -78,11 +78,12 @@ jobs:
       inputs:
         command: 'custom'
         workingDir: packages/test/end-to-end-tests
-        customCommand: 'run ci:test:realsvc' # This script ends with 'exit 0' so this task should never fail
+        customCommand: 'run ci:test:realsvc'
 
     # Run Stress Tests
     - task: Npm@1
       displayName: '[stress tests] npm run start'
+      continueOnError: true
       env:
         login__microsoft__clientId: $(login-microsoft-clientId)
         login__microsoft__secret: $(login-microsoft-secret)
@@ -92,6 +93,14 @@ jobs:
         workingDir: packages/test/service-load-test
         customCommand: 'run start'
 
+    # Run Copy Test Results
+    - task: Npm@1
+      displayName: npm run test:copyresults'
+      inputs:
+        command: 'custom'
+        workingDir: ${{ parameters.buildDirectory }}
+        customCommand: 'run test:copyresults'
+
     # Upload results
     - task: PublishTestResults@2
       displayName: Publish Test Results