From dadff68c8d1e1d1e2e658cd1ff47a0d6588b4d10 Mon Sep 17 00:00:00 2001
From: Scott Andrews <sandrews@pivotal.io>
Date: Wed, 1 May 2019 09:45:39 -0400
Subject: [PATCH] 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
---
 azure-pipelines.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c33b42677..99d259a47 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -26,6 +26,7 @@ jobs:
     matrix:
       minikube:
         imageName: ubuntu-16.04
+        qualifier: minikube
         cluster: minikube
         registry: minikube
   pool:
@@ -33,7 +34,7 @@ jobs:
   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,14 +74,17 @@ 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:
@@ -88,7 +92,7 @@ jobs:
   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: