[1ES] Update 1ES triggers for new branch structure (#10171)

* Update 1ES triggers for new branch structure * Update variables for windows CI * Remove pool declaration from run-unit-tests.yml
Azure · May 16, 2024 · d223fa7 · d223fa7
1 parent abe0327
commit d223fa7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 38 deletions.
diff --git a/eng/ci/code-mirror.yml b/eng/ci/code-mirror.yml
@@ -4,8 +4,7 @@ trigger:
     - dev
     - in-proc
     - release/4.*
-    - release/inproc6/4.*
-    - release/inproc8/4.*
+    - release/in-proc
 
 resources:
   repositories:

diff --git a/eng/ci/official-build.yml b/eng/ci/official-build.yml
@@ -1,14 +1,11 @@
-
-
 trigger:
   batch: true
   branches:
     include:
     - dev
     - in-proc
     - release/4.*
-    - release/inproc6/4.*
-    - release/inproc8/4.*
+    - release/in-proc
 
 # CI only, does not trigger on PRs.
 pr: none
@@ -29,13 +26,6 @@ variables:
   - template: ci/variables/cfs.yml@eng
   - name: buildNumber
     value: $[ counter('build', 23000) ] # 23000 selected to be ahead of current host build
-  - name: minorVersionPrefix
-    ${{ if contains(variables['Build.SourceBranch'], 'release/inproc6/') }}:
-      value: "6"
-    ${{ elseif contains(variables['Build.SourceBranch'], 'release/inproc8/') }}:
-      value: "8"
-    ${{ else }}:
-      value: ""
 
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1es

diff --git a/eng/ci/public-build.yml b/eng/ci/public-build.yml
@@ -1,13 +1,6 @@
 # This build is used for public PR and CI builds.
 
 variables:
-  buildNumber: $[ counter('build', 23000) ] # 23000 selected to be ahead of current host build
-  ${{ if contains(variables['Build.SourceBranch'], 'release/inproc6/') }}:
-    minorVersionPrefix: "6"
-  ${{ elseif contains(variables['Build.SourceBranch'], 'release/inproc8/') }}:
-    minorVersionPrefix: "8"
-  ${{ else }}:
-    minorVersionPrefix: ""
   DOTNET_NOLOGO: 1
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
@@ -19,17 +12,15 @@ trigger:
     - dev
     - in-proc
     - release/4.*
-    - release/inproc6/4.*
-    - release/inproc8/4.*
+    - release/in-proc
 
 pr:
   branches:
     include:
     - dev
     - in-proc
     - release/4.*
-    - release/inproc6/4.*
-    - release/inproc8/4.*
+    - release/in-proc
 
 resources:
   repositories:
@@ -47,13 +38,7 @@ extends:
       os: windows
 
     stages:
-    - stage: Initialize
-
+    - stage: Run Tests
       jobs:
       - template: /eng/ci/templates/jobs/initialize-pipeline.yml@self
-
-    - stage: Test
-      dependsOn: Initialize
-
-      jobs:
       - template: /eng/ci/templates/jobs/run-unit-tests.yml@self
diff --git a/eng/ci/templates/jobs/initialize-pipeline.yml b/eng/ci/templates/jobs/initialize-pipeline.yml
@@ -14,6 +14,5 @@ jobs:
       name: Initialize
       inputs:
         filePath: build/initialize-pipeline.ps1
-        arguments: -minorVersionPrefix "$(minorVersionPrefix)"
         showWarnings: true
         pwsh: true
diff --git a/eng/ci/templates/jobs/run-unit-tests.yml b/eng/ci/templates/jobs/run-unit-tests.yml
@@ -2,11 +2,6 @@ jobs:
 - job: RunUnitTests
   displayName: Run Unit Tests
 
-  pool:
-    name: 1es-pool-azfunc
-    image: 1es-windows-2022 
-    os: windows
-
   steps:
   - task: NuGetAuthenticate@1
     displayName: NuGet Authenticate

diff --git a/eng/ci/templates/official/jobs/build-artifacts-windows.yml b/eng/ci/templates/official/jobs/build-artifacts-windows.yml
@@ -28,7 +28,7 @@ jobs:
     os: windows
 
   variables:
-    ${{ if or( eq( variables['Build.Reason'], 'PullRequest' ), and( not( contains( variables['Build.SourceBranch'], 'release/inproc6/4.' ) ), not( contains( variables['Build.SourceBranch'], 'release/inproc8/4.' ) ), not( contains( variables['Build.SourceBranch'], 'release/4.' ) ), not( contains( variables['Build.SourceBranch'], 'release/ExtensionsMetadataGenerator/' ) ) ) ) }}:
+    ${{ if or( eq( variables['Build.Reason'], 'PullRequest' ), and(not( contains( variables['Build.SourceBranch'], 'release/in-proc.' ) ), not( contains( variables['Build.SourceBranch'], 'release/4.' ) ), not( contains( variables['Build.SourceBranch'], 'release/ExtensionsMetadataGenerator/' ) ) ) ) }}:
         suffixTemp: $(buildNumber)
         packSuffixSwitchTemp: --version-suffix $(buildNumber)
         emgSuffixSwitchTemp: --version-suffix ci$(buildNumber)