From c21b0452dfc33d751b98f369e013e38d26d19758 Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 30 Aug 2018 11:22:59 -0700
Subject: [PATCH 01/22] only run integration tests in integration tests block

---
 .vsts-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index ac38d5d8..1b5e8833 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -33,7 +33,7 @@ phases:
       displayName: unit tests
 
     - script: |
-        pytest --numprocesses=75
+        pytest --numprocesses=75 tests/integration_tests
       condition: succeeded()
       displayName: integration tests
     

From dedce8f11430aaaf365183dc1616a7b99c870355 Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 30 Aug 2018 11:39:46 -0700
Subject: [PATCH 02/22] update vsts build

---
 .vsts-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 1b5e8833..c0409791 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -1,5 +1,4 @@
-trigger:
-  - master
+name: $(SourceBranchName)$(Rev:.r)
 
 phases:
   - phase: Test
@@ -34,7 +33,7 @@ phases:
 
     - script: |
         pytest --numprocesses=75 tests/integration_tests
-      condition: succeeded()
+      condition: and(succeeded(), or(startsWith($(SourceBranchName), 'release/'), eq($(SourceBranchName, 'master')))
       displayName: integration tests
     
     - script: |

From 9088e0960050b945724a281bd36bece4663629f5 Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 30 Aug 2018 12:43:37 -0700
Subject: [PATCH 03/22] whitespace

---
 .vsts-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index c0409791..bf706b8f 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -6,8 +6,8 @@ phases:
     steps:
     - task: UsePythonVersion@0
       inputs:
-        versionSpec: '3.6 >= 3.5' 
-        addToPath: true 
+        versionSpec: '3.6 >= 3.5'
+        addToPath: true
         architecture: 'x64'
 
     - script: |
@@ -25,7 +25,7 @@ phases:
         pylint --jobs 2 --errors-only aztk aztk_cli
       condition: succeeded()
       displayName: pylint error check
-    
+
     - script: |
         pytest --ignore=tests/integration_tests
       condition: succeeded()
@@ -35,7 +35,7 @@ phases:
         pytest --numprocesses=75 tests/integration_tests
       condition: and(succeeded(), or(startsWith($(SourceBranchName), 'release/'), eq($(SourceBranchName, 'master')))
       displayName: integration tests
-    
+
     - script: |
         pylint --jobs 2 --disable=fixme aztk aztk_cli
       continueOnError: true

From 65cea3b0910b0f8e7915c03fa44d3a604b5578c6 Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 30 Aug 2018 12:45:46 -0700
Subject: [PATCH 04/22] whitespace

---
 .vsts-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index bf706b8f..fd47b4d4 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -41,3 +41,4 @@ phases:
       continueOnError: true
       condition: succeeded()
       displayName: pylint report
+

From 2754bef2bfe12af0772fecc2798a809ef7376c17 Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 30 Aug 2018 12:56:34 -0700
Subject: [PATCH 05/22] syntax

---
 .vsts-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index fd47b4d4..9277ac13 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -33,7 +33,7 @@ phases:
 
     - script: |
         pytest --numprocesses=75 tests/integration_tests
-      condition: and(succeeded(), or(startsWith($(SourceBranchName), 'release/'), eq($(SourceBranchName, 'master')))
+      condition: and(succeeded(), or(startsWith($(SourceBranchName), 'release/'), eq($(SourceBranchName), 'master')))
       displayName: integration tests
 
     - script: |

From fddb8f68e997529ed0f55858b5bac554aa97d373 Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 30 Aug 2018 12:58:47 -0700
Subject: [PATCH 06/22] syntax

---
 .vsts-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 9277ac13..96af0de5 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -1,4 +1,4 @@
-name: $(SourceBranchName)$(Rev:.r)
+name: $(Build.SourceBranchName)$(Rev:.r)
 
 phases:
   - phase: Test
@@ -33,7 +33,7 @@ phases:
 
     - script: |
         pytest --numprocesses=75 tests/integration_tests
-      condition: and(succeeded(), or(startsWith($(SourceBranchName), 'release/'), eq($(SourceBranchName), 'master')))
+      condition: and(succeeded(), or(startsWith($(Build.SourceBranchName), 'release/'), eq($(SourceBranchName), 'master')))
       displayName: integration tests
 
     - script: |
@@ -41,4 +41,3 @@ phases:
       continueOnError: true
       condition: succeeded()
       displayName: pylint report
-

From b59a0962d9df76001e64a3eeaf43eb0db4429d94 Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 30 Aug 2018 13:40:21 -0700
Subject: [PATCH 07/22] fix condition variable reference

---
 .vsts-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 96af0de5..add32342 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -33,7 +33,7 @@ phases:
 
     - script: |
         pytest --numprocesses=75 tests/integration_tests
-      condition: and(succeeded(), or(startsWith($(Build.SourceBranchName), 'release/'), eq($(SourceBranchName), 'master')))
+      condition: and(succeeded(), or(startsWith(variables['Build.SourceBranchName'], 'release/'), eq(variables[Build.SourceBranchName'],master')))
       displayName: integration tests
 
     - script: |

From 1227f264a209b34491e4924ea7cfc4393d1a71be Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 30 Aug 2018 13:43:07 -0700
Subject: [PATCH 08/22] fix

---
 .vsts-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index add32342..dd1174e4 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -33,7 +33,7 @@ phases:
 
     - script: |
         pytest --numprocesses=75 tests/integration_tests
-      condition: and(succeeded(), or(startsWith(variables['Build.SourceBranchName'], 'release/'), eq(variables[Build.SourceBranchName'],master')))
+      condition: and(succeeded(), or(startsWith(variables['Build.SourceBranchName'], 'release'), eq(variables['Build.SourceBranchName'], 'master')))
       displayName: integration tests
 
     - script: |

From 18f28610e161d4698a98809f86c58fe0ecf6c6bd Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 30 Aug 2018 13:52:48 -0700
Subject: [PATCH 09/22] update name and trigger

---
 .vsts-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index dd1174e4..f3221c3d 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -1,4 +1,7 @@
-name: $(Build.SourceBranchName)$(Rev:.r)
+name: $(Build.SourceBranch)$(Rev:.r)
+
+trigger:
+  - master
 
 phases:
   - phase: Test

From 6170dc83af56dc8e792881c5aa49f95f6b21895e Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 30 Aug 2018 13:56:27 -0700
Subject: [PATCH 10/22] change from preview queue to ga

---
 .vsts-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index f3221c3d..5d7f121f 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -5,7 +5,7 @@ trigger:
 
 phases:
   - phase: Test
-    queue: Hosted Linux Preview
+    queue: Hosted Ubuntu 1604
     steps:
     - task: UsePythonVersion@0
       inputs:

From 28c4827695b5c5dff85373b46b5cd85bbe2525ac Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 30 Aug 2018 14:03:13 -0700
Subject: [PATCH 11/22] upgrade pip

---
 .vsts-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 5d7f121f..524807cd 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -14,6 +14,7 @@ phases:
         architecture: 'x64'
 
     - script: |
+        pip install --upgrade pip
         pip install -r requirements.txt
         pip install -e .
       condition: succeeded()

From 399e5a759c5f86073310ca8cca01a247277e27e7 Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 30 Aug 2018 14:05:37 -0700
Subject: [PATCH 12/22] add setuptools

---
 .vsts-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 524807cd..ead30fe5 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -14,7 +14,7 @@ phases:
         architecture: 'x64'
 
     - script: |
-        pip install --upgrade pip
+        pip install --upgrade pip setuptools
         pip install -r requirements.txt
         pip install -e .
       condition: succeeded()

From fdff17938b037313d923113ec3e0ca1ffe352b3b Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 30 Aug 2018 14:14:03 -0700
Subject: [PATCH 13/22] add pip upgrade step

---
 .vsts-ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index ead30fe5..6f1fb0b5 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -14,7 +14,11 @@ phases:
         architecture: 'x64'
 
     - script: |
-        pip install --upgrade pip setuptools
+        pip install --upgrade pip==18.0
+      condition: succeeded()
+      displayName: upgrade pip
+
+    - script: |
         pip install -r requirements.txt
         pip install -e .
       condition: succeeded()

From ee27cf5e2c52a46121ad87d14697603e9085e848 Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 30 Aug 2018 14:17:06 -0700
Subject: [PATCH 14/22] debug statement

---
 .vsts-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 6f1fb0b5..71880691 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -19,6 +19,7 @@ phases:
       displayName: upgrade pip
 
     - script: |
+        pip --version
         pip install -r requirements.txt
         pip install -e .
       condition: succeeded()

From 925cb0aa24a76265416e1a9392ab87626c380acd Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 30 Aug 2018 14:20:40 -0700
Subject: [PATCH 15/22] debug

---
 .vsts-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 71880691..35f0d4b7 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -15,6 +15,7 @@ phases:
 
     - script: |
         pip install --upgrade pip==18.0
+        pip --version
       condition: succeeded()
       displayName: upgrade pip
 

From 52b36aaf825b2da733d7fcae2bb7ec75f201daf4 Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 30 Aug 2018 14:22:14 -0700
Subject: [PATCH 16/22] revert to preview

---
 .vsts-ci.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 35f0d4b7..f3221c3d 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -5,7 +5,7 @@ trigger:
 
 phases:
   - phase: Test
-    queue: Hosted Ubuntu 1604
+    queue: Hosted Linux Preview
     steps:
     - task: UsePythonVersion@0
       inputs:
@@ -14,13 +14,6 @@ phases:
         architecture: 'x64'
 
     - script: |
-        pip install --upgrade pip==18.0
-        pip --version
-      condition: succeeded()
-      displayName: upgrade pip
-
-    - script: |
-        pip --version
         pip install -r requirements.txt
         pip install -e .
       condition: succeeded()

From 6c00a6ff83bb617509e158ea1785530af69013b8 Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Fri, 7 Sep 2018 12:30:22 -0700
Subject: [PATCH 17/22] change how env vars are referenced

---
 .vsts-ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index f3221c3d..9a300b75 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -35,6 +35,12 @@ phases:
       displayName: unit tests
 
     - script: |
+        export BATCH_ACCOUNT_RESOURCE_ID=$(BATCH_ACCOUNT_RESOURCE_ID)
+        export CLIENT_ID=$(CLIENT_ID)
+        export CREDENTIAL=$(CREDENTIAL)
+        export ID_RSA=$(ID_RSA)
+        export STORAGE_ACCOUNT_RESOURCE_ID=$(STORAGE_ACCOUNT_RESOURCE_ID)
+        export TENANT_ID=$(TENANT_ID)
         pytest --numprocesses=75 tests/integration_tests
       condition: and(succeeded(), or(startsWith(variables['Build.SourceBranchName'], 'release'), eq(variables['Build.SourceBranchName'], 'master')))
       displayName: integration tests

From e4a9c7b71a63ff28661bf6f7131df6e23fcb9188 Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Fri, 7 Sep 2018 14:41:52 -0700
Subject: [PATCH 18/22] debug statement

---
 .vsts-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 9a300b75..bbbdbed3 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -42,7 +42,7 @@ phases:
         export STORAGE_ACCOUNT_RESOURCE_ID=$(STORAGE_ACCOUNT_RESOURCE_ID)
         export TENANT_ID=$(TENANT_ID)
         pytest --numprocesses=75 tests/integration_tests
-      condition: and(succeeded(), or(startsWith(variables['Build.SourceBranchName'], 'release'), eq(variables['Build.SourceBranchName'], 'master')))
+      condition: succeeded() #and(succeeded(), or(startsWith(variables['Build.SourceBranchName'], 'release'), eq(variables['Build.SourceBranchName'], 'master')))
       displayName: integration tests
 
     - script: |

From 038ff326d6e63e8130abae57ebdef29f578d4a14 Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 20 Sep 2018 10:09:00 -0700
Subject: [PATCH 19/22] add missing key

---
 .vsts-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index bbbdbed3..391f9428 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -39,6 +39,7 @@ phases:
         export CLIENT_ID=$(CLIENT_ID)
         export CREDENTIAL=$(CREDENTIAL)
         export ID_RSA=$(ID_RSA)
+        export ID_RSA_PUB=$(ID_RSA_PUB)
         export STORAGE_ACCOUNT_RESOURCE_ID=$(STORAGE_ACCOUNT_RESOURCE_ID)
         export TENANT_ID=$(TENANT_ID)
         pytest --numprocesses=75 tests/integration_tests

From 3651d36f4a09e0313bb351d56f49fdb7a47ed1ba Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 20 Sep 2018 12:21:18 -0700
Subject: [PATCH 20/22] support multiline env vars

---
 .vsts-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 391f9428..4c2738a6 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -38,8 +38,8 @@ phases:
         export BATCH_ACCOUNT_RESOURCE_ID=$(BATCH_ACCOUNT_RESOURCE_ID)
         export CLIENT_ID=$(CLIENT_ID)
         export CREDENTIAL=$(CREDENTIAL)
-        export ID_RSA=$(ID_RSA)
-        export ID_RSA_PUB=$(ID_RSA_PUB)
+        export ID_RSA=`$(ID_RSA)`
+        export ID_RSA_PUB=`$(ID_RSA_PUB)`
         export STORAGE_ACCOUNT_RESOURCE_ID=$(STORAGE_ACCOUNT_RESOURCE_ID)
         export TENANT_ID=$(TENANT_ID)
         pytest --numprocesses=75 tests/integration_tests

From 1e7f1eb9aad9e76d459046a693e1894ca2189013 Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 20 Sep 2018 12:35:08 -0700
Subject: [PATCH 21/22] change process value to 70

---
 .vsts-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 4c2738a6..2676c07b 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -42,7 +42,7 @@ phases:
         export ID_RSA_PUB=`$(ID_RSA_PUB)`
         export STORAGE_ACCOUNT_RESOURCE_ID=$(STORAGE_ACCOUNT_RESOURCE_ID)
         export TENANT_ID=$(TENANT_ID)
-        pytest --numprocesses=75 tests/integration_tests
+        pytest --numprocesses=70 tests/integration_tests
       condition: succeeded() #and(succeeded(), or(startsWith(variables['Build.SourceBranchName'], 'release'), eq(variables['Build.SourceBranchName'], 'master')))
       displayName: integration tests
 

From 84f02644ea796547faff89e5789d4437907f2fc6 Mon Sep 17 00:00:00 2001
From: Jake Freck <jafreck@microsoft.com>
Date: Thu, 20 Sep 2018 12:40:19 -0700
Subject: [PATCH 22/22] only run integration on master or release

---
 .vsts-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 2676c07b..3fb72b0e 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -43,7 +43,7 @@ phases:
         export STORAGE_ACCOUNT_RESOURCE_ID=$(STORAGE_ACCOUNT_RESOURCE_ID)
         export TENANT_ID=$(TENANT_ID)
         pytest --numprocesses=70 tests/integration_tests
-      condition: succeeded() #and(succeeded(), or(startsWith(variables['Build.SourceBranchName'], 'release'), eq(variables['Build.SourceBranchName'], 'master')))
+      condition: and(succeeded(), or(startsWith(variables['Build.SourceBranchName'], 'release'), eq(variables['Build.SourceBranchName'], 'master')))
       displayName: integration tests
 
     - script: |