Merge pull request #1915 from fluxcd/azure-e2e-fixes

Improve Azure e2e failure tracing

.github/workflows/e2e-azure.yaml

@@ -5,7 +5,7 @@ on:
   schedule:
     - cron:  '0 6 * * *'
   push:
-    branches: [ azure/e2e ]
+    branches: [ azure* ]
 
 jobs:
   e2e:
@@ -63,4 +63,4 @@ jobs:
           ls $HOME/.local/bin
           az login --service-principal -u ${ARM_CLIENT_ID} -p ${ARM_CLIENT_SECRET} -t ${ARM_TENANT_ID}
           cd ./tests/azure
-          go test -timeout 60m .
+          go test -v -coverprofile cover.out -timeout 60m .

tests/azure/azure_test.go

@@ -808,20 +808,21 @@ func TestEventHubNotification(t *testing.T) {
 			event := &events.Event{}
 			err := json.Unmarshal([]byte(eventJson), event)
 			if err != nil {
-				fmt.Println(err)
+				t.Logf("the received event type does not match Flux format, error: %v", err)
 				return false
 			}
-			if event.InvolvedObject.Kind != "Kustomization" {
-				return false
-			}
-			if strings.Contains(event.Message, "Health check passed") {
-				return false
+
+			if event.InvolvedObject.Kind == kustomizev1.KustomizationKind &&
+				strings.Contains(event.Message, "Health check passed") {
+				return true
 			}
-			return true
+
+			t.Logf("event received from '%s/%s': %s",
+				event.InvolvedObject.Kind, event.InvolvedObject.Name, event.Message)
+			return false
 		default:
 			return false
 		}
-		//}, 700*time.Second, 10*time.Second)
 	}, 60*time.Second, 1*time.Second)
 	err = listenerHandler.Close(ctx)
 	require.NoError(t, err)