Merge branch 'master' into consolidate_api_test_timeout

azure-pipelines.yml

@@ -22,11 +22,6 @@ jobs:
   - script: |
       yarn mocha
     displayName: 'Unit tests'
-  - script: |
-      yarn start &
-      sleep 5
-      yarn test-api --headless
-    displayName: 'Integration tests'
   - script: |
       yarn lint
     displayName: 'Lint'
@@ -71,13 +66,35 @@ jobs:
   - script: |
       yarn lint
     displayName: 'Lint'
+    
+- job: IntegrationTests
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: '8.x'
+    displayName: 'Install Node.js'
+  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+    inputs:
+      versionSpec: "1.9.4"
+    displayName: 'Install Yarn'
+  - script: |
+      yarn
+    displayName: 'Install dependencies and build'
+  - script: |
+      yarn start &
+      sleep 10
+      yarn test-api --headless
+    displayName: 'Integration tests'
 
 - job: Release
   dependsOn:
   - Linux
   - macOS
   - Windows
-  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+  - IntegrationTests
+  condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(variables['Build.SourceBranch'], 'refs/heads/release/*')))
   pool:
     vmImage: 'ubuntu-16.04'
   steps: