From 0c6ab6f33d00b6f924e430ecd9709f0e8e983487 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Tue, 30 Aug 2022 13:52:45 -0700
Subject: [PATCH] Fix up integration yml

---
 azure-pipelines-integration-lsp.yml | 48 +++++++++++++++--------------
 azure-pipelines-integration.yml     | 25 +++++++--------
 2 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/azure-pipelines-integration-lsp.yml b/azure-pipelines-integration-lsp.yml
index 5df446893bea6..657f7519d8ad0 100644
--- a/azure-pipelines-integration-lsp.yml
+++ b/azure-pipelines-integration-lsp.yml
@@ -2,35 +2,37 @@
 
 # Branches that trigger a build on commit
 trigger:
-  include:
-  - main
-  - main-vs-deps
-  - release/*
-  - features/*
-  - demos/*
-  exclude:
-  # Since the version of VS on the integration VM images are a moving target,
-  # we are unable to reliably run integration tests on servicing branches.
-  - release/dev17.0-vs-deps
-  - release/dev17.2
-  - release/dev17.3
+  branches:
+    include:
+    - main
+    - main-vs-deps
+    - release/*
+    - features/*
+    - demos/*
+    exclude:
+    # Since the version of VS on the integration VM images are a moving target,
+    # we are unable to reliably run integration tests on servicing branches.
+    - release/dev17.0-vs-deps
+    - release/dev17.2
+    - release/dev17.3
 
 # Branches that are allowed to trigger a build via /azp run.
 # Automatic building of all PRs is disabled in the pipeline's trigger page.
 # See https://docs.microsoft.com/en-us/azure/devops/pipelines/repos/github?view=azure-devops&tabs=yaml#comment-triggers
 pr:
+  branches:
   include:
-  - main
-  - main-vs-deps
-  - release/*
-  - features/*
-  - demos/*
-  exclude:
-  # Since the version of VS on the integration VM images are a moving target,
-  # we are unable to reliably run integration tests on servicing branches.
-  - release/dev17.0-vs-deps
-  - release/dev17.2
-  - release/dev17.3
+    - main
+    - main-vs-deps
+    - release/*
+    - features/*
+    - demos/*
+    exclude:
+    # Since the version of VS on the integration VM images are a moving target,
+    # we are unable to reliably run integration tests on servicing branches.
+    - release/dev17.0-vs-deps
+    - release/dev17.2
+    - release/dev17.3
 
 variables:
   - name: XUNIT_LOGS
diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml
index cedc7c459c93b..9ac652efbcd9a 100644
--- a/azure-pipelines-integration.yml
+++ b/azure-pipelines-integration.yml
@@ -1,17 +1,18 @@
 # Branches that trigger a build on commit
 trigger:
-  include:
-  - main
-  - main-vs-deps
-  - release/*
-  - features/*
-  - demos/*
-  exclude:
-  # Since the version of VS on the integration VM images are a moving target,
-  # we are unable to reliably run integration tests on servicing branches.
-  - release/dev17.0-vs-deps
-  - release/dev17.2
-  - release/dev17.3
+  branches:
+    include:
+      - main
+      - main-vs-deps
+      - release/*
+      - features/*
+      - demos/*
+      exclude:
+      # Since the version of VS on the integration VM images are a moving target,
+      # we are unable to reliably run integration tests on servicing branches.
+      - release/dev17.0-vs-deps
+      - release/dev17.2
+      - release/dev17.3
 
 # Branches that trigger builds on PR
 pr: