[1ES] Fix Official and PR 1es builds (#10176)

* Fix stage name

* Fix 1es pr and official build issues

* Update integration-tests triggers

* Extract build.yml variables

* Undo template path change

Author: jviau

eng/ci/integration-tests.yml

@@ -1,16 +1,10 @@
-variables:
-  DOTNET_NOLOGO: 1
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
-
 pr:
   branches:
     include:
     - dev
     - in-proc
     - release/4.*
-    - release/inproc6/4.*
-    - release/inproc8/4.*
+    - release/in-proc
 
 resources:
   repositories:
@@ -19,6 +13,9 @@ resources:
     name: 1ESPipelineTemplates/1ESPipelineTemplates
     ref: refs/tags/release
 
+variables:
+  - template: /eng/ci/templates/variables/build.yml@self
+
 extends:
   template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
   parameters:
@@ -30,7 +27,6 @@ extends:
     stages:
     - stage: Test
       jobs:
-
       - template: /eng/ci/templates/jobs/initialize-pipeline.yml@self
       - template: /eng/ci/templates/official/jobs/run-non-e2e-tests.yml@self
       - template: /eng/ci/templates/official/jobs/run-integration-tests.yml@self

eng/ci/official-build.yml

@@ -22,8 +22,8 @@ resources:
     ref: refs/tags/release
 
 variables:
-  - template: ci/variables/build.yml@eng
-  - template: ci/variables/cfs.yml@eng
+  - template: /eng/ci/templates/variables/build.yml@self
+  - template: /ci/variables/cfs.yml@eng
   - name: buildNumber
     value: $[ counter('build', 23000) ] # 23000 selected to be ahead of current host build
 

eng/ci/public-build.yml

@@ -1,10 +1,5 @@
 # This build is used for public PR and CI builds.
 
-variables:
-  DOTNET_NOLOGO: 1
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
-
 trigger:
   batch: true
   branches:
@@ -29,6 +24,9 @@ resources:
     name: 1ESPipelineTemplates/1ESPipelineTemplates
     ref: refs/tags/release
 
+variables:
+  - template: /eng/ci/templates/variables/build.yml@self
+
 extends:
   template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
   parameters:
@@ -38,7 +36,7 @@ extends:
       os: windows
 
     stages:
-    - stage: Run Tests
+    - stage: Test
       jobs:
       - template: /eng/ci/templates/jobs/initialize-pipeline.yml@self
       - template: /eng/ci/templates/jobs/run-unit-tests.yml@self

eng/ci/templates/jobs/run-unit-tests.yml

@@ -3,9 +3,6 @@ jobs:
   displayName: Run Unit Tests
 
   steps:
-  - task: NuGetAuthenticate@1
-    displayName: NuGet Authenticate
-
   - template: /eng/ci/templates/install-dotnet.yml@self
 
   - task: DotNetCoreCLI@2

eng/ci/templates/official/jobs/build-artifacts-linux.yml

@@ -7,7 +7,7 @@ jobs:
     configuration: release
     runtime: linux-x64
     log_dir: $(Build.ArtifactStagingDirectory)/log
-    build_args: '-v m -c $(configuration) -r $(runtime) --self-contained true -p:BuildNumber=$(buildNumber) -p:MinorVersionPrefix=$(minorVersionPrefix) -p:IsPackable=false'
+    build_args: '-v m -c $(configuration) -r $(runtime) --self-contained true -p:BuildNumber=$(buildNumber) -p:IsPackable=false'
     publish_zip_dir: $(Build.ArtifactStagingDirectory)/Linux
 
   templateContext:

eng/ci/templates/official/jobs/build-artifacts-windows.yml

@@ -43,7 +43,7 @@ jobs:
     displayName: Build artifacts
     inputs:
       filePath: build/build-extensions.ps1
-      arguments: '-buildNumber "$(buildNumber)" -suffix "$(suffix)" -minorVersionPrefix "$(minorVersionPrefix)"'
+      arguments: '-buildNumber "$(buildNumber)" -suffix "$(suffix)"'
 
   - task: CopyFiles@2
     inputs:

eng/ci/templates/official/jobs/run-integration-tests.yml

@@ -12,9 +12,6 @@ jobs:
     IsReleaseBranch: $[contains(variables['Build.SourceBranch'], 'release/')]
 
   steps:
-  - task: NuGetAuthenticate@1
-    displayName: NuGet Authenticate
-
   - template: /eng/ci/templates/install-dotnet.yml@self
 
   - task: UseNode@1

eng/ci/templates/official/jobs/run-non-e2e-tests.yml

@@ -11,9 +11,6 @@ jobs:
     IntegrationProject: test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj
 
   steps:
-  - task: NuGetAuthenticate@1
-    displayName: NuGet Authenticate
-
   - template: /eng/ci/templates/install-dotnet.yml@self
 
   - task: UseNode@1

eng/ci/templates/variables/build.yml

@@ -0,0 +1,7 @@
+variables:
+  - name: DOTNET_NOLOGO
+    value: 1
+  - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
+    value: 1
+  - name: DOTNET_CLI_TELEMETRY_OPTOUT
+    value: 1