Fix FATS for AZP

AZP changed the value of the JobName var for matrix defined jobs. The new defintition breaks FATS. We now use our own value instead of JobName
projectriff · May 1, 2019 · dadff68 · dadff68
1 parent 4ac4aea
commit dadff68
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -26,14 +26,15 @@ jobs:
     matrix:
       minikube:
         imageName: ubuntu-16.04
+        qualifier: minikube
         cluster: minikube
         registry: minikube
   pool:
     vmImage: $(imageName)
   variables:
     CLUSTER:  '$(cluster)'
     REGISTRY: '$(registry)'
-    CLUSTER_NAME: 'riff-$(Build.BuildId)-$(Agent.JobName)'
+    CLUSTER_NAME: 'riff-$(Build.BuildId)-$(qualifier)'
     NAMESPACE: '$(CLUSTER_NAME)'
   condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
   steps:
@@ -73,22 +74,25 @@ jobs:
     matrix:
       minikube:
         imageName: ubuntu-16.04
+        qualifier: minikube
         cluster: minikube
         registry: dockerhub
       gke:
         imageName: ubuntu-16.04
+        qualifier: gke
         cluster: gke
         registry: gcr
       windows:
         imageName: windows-2019
+        qualifier: windows
         cluster: gke
         registry: gcr
   pool:
     vmImage: $(imageName)
   variables:
     CLUSTER:  '$(cluster)'
     REGISTRY: '$(registry)'
-    CLUSTER_NAME: 'riff-$(Build.BuildId)-$(Agent.JobName)'
+    CLUSTER_NAME: 'riff-$(Build.BuildId)-$(qualifier)'
     NAMESPACE: '$(CLUSTER_NAME)'
   condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
   steps: