diff --git a/build/pipelines/azure-pipelines.ci.yaml b/build/pipelines/azure-pipelines.ci.yaml index f7ead2a..dca1675 100644 --- a/build/pipelines/azure-pipelines.ci.yaml +++ b/build/pipelines/azure-pipelines.ci.yaml @@ -19,33 +19,42 @@ jobs: - template: ./templates/build-single-architecture.yaml parameters: platform: x64 + isOSSBuild: true - template: ./templates/build-single-architecture.yaml parameters: platform: x86 + isOSSBuild: true condition: not(eq(variables['Build.Reason'], 'PullRequest')) - template: ./templates/build-single-architecture.yaml parameters: platform: ARM + isOSSBuild: true condition: not(eq(variables['Build.Reason'], 'PullRequest')) - template: ./templates/build-single-architecture.yaml parameters: platform: ARM64 + isOSSBuild: true condition: not(eq(variables['Build.Reason'], 'PullRequest')) - template: ./templates/run-ui-tests.yaml parameters: platform: x64 + isOSSBuild: true runsettingsFileName: CalculatorUITests.ci.runsettings - template: ./templates/run-unit-tests.yaml parameters: platform: x64 + isOSSBuild: true - template: ./templates/run-unit-tests.yaml parameters: platform: x86 + isOSSBuild: true - template: ./templates/package-msixbundle.yaml + parameters: + isOSSBuild: true diff --git a/build/pipelines/templates/build-single-architecture.yaml b/build/pipelines/templates/build-single-architecture.yaml index f8dd8fd..65792e7 100644 --- a/build/pipelines/templates/build-single-architecture.yaml +++ b/build/pipelines/templates/build-single-architecture.yaml @@ -2,6 +2,7 @@ parameters: isReleaseBuild: false + isOSSBuild: false useReleaseAppxManifest: false platform: '' condition: '' @@ -11,7 +12,10 @@ jobs: displayName: Build ${{ parameters.platform }} condition: ${{ parameters.condition }} pool: - vmImage: windows-2022 + ${{ if eq(parameters.isOSSBuild, true) }}: + name: EssentialExperiencesOpenSource-windows-2022 + ${{ if eq(parameters.isOSSBuild, false) }}: + name: EssentialExperiences-windows-2022 variables: BuildConfiguration: Release BuildPlatform: ${{ parameters.platform }} diff --git a/build/pipelines/templates/package-msixbundle.yaml b/build/pipelines/templates/package-msixbundle.yaml index 842fd3b..bf6f695 100644 --- a/build/pipelines/templates/package-msixbundle.yaml +++ b/build/pipelines/templates/package-msixbundle.yaml @@ -3,6 +3,7 @@ # this job also signs the bundle and creates StoreBroker packages. parameters: + isOSSBuild: false signBundle: false createStoreBrokerPackages: false @@ -20,7 +21,10 @@ jobs: in(dependencies.BuildARM.result, 'Succeeded', 'SucceededWithIssues', 'Skipped') ) pool: - vmImage: windows-2022 + ${{ if eq(parameters.isOSSBuild, true) }}: + name: EssentialExperiencesOpenSource-windows-2022 + ${{ if eq(parameters.isOSSBuild, false) }}: + name: EssentialExperiences-windows-2022 variables: skipComponentGovernanceDetection: true StoreBrokerMediaRootPath: $(TEMP)\SBMedia diff --git a/build/pipelines/templates/release-store.yaml b/build/pipelines/templates/release-store.yaml index 65ec4ca..551662c 100644 --- a/build/pipelines/templates/release-store.yaml +++ b/build/pipelines/templates/release-store.yaml @@ -4,7 +4,7 @@ jobs: - job: ReleaseStore dependsOn: Package pool: - vmImage: windows-2022 + name: EssentialExperiences-windows-2022 variables: skipComponentGovernanceDetection: true StoreBrokerPackagePath: $(Build.ArtifactStagingDirectory)\storeBrokerPayload diff --git a/build/pipelines/templates/release-vpack.yaml b/build/pipelines/templates/release-vpack.yaml index 699ea9b..2de88a8 100644 --- a/build/pipelines/templates/release-vpack.yaml +++ b/build/pipelines/templates/release-vpack.yaml @@ -5,7 +5,7 @@ jobs: - job: ReleaseVPack dependsOn: Package pool: - vmImage: windows-2022 + name: EssentialExperiences-windows-2022 variables: skipComponentGovernanceDetection: true steps: diff --git a/build/pipelines/templates/run-ui-tests.yaml b/build/pipelines/templates/run-ui-tests.yaml index f542508..4fb27fe 100644 --- a/build/pipelines/templates/run-ui-tests.yaml +++ b/build/pipelines/templates/run-ui-tests.yaml @@ -1,6 +1,7 @@ # This template contains jobs to run UI tests using WinAppDriver. parameters: + isOSSBuild: false platform: '' runsettingsFileName: '' @@ -10,7 +11,10 @@ jobs: dependsOn: Build${{ parameters.platform }} condition: succeeded() pool: - vmImage: windows-2022 + ${{ if eq(parameters.isOSSBuild, true) }}: + name: EssentialExperiencesOpenSource-windows-2022 + ${{ if eq(parameters.isOSSBuild, false) }}: + name: EssentialExperiences-windows-2022 variables: skipComponentGovernanceDetection: true steps: diff --git a/build/pipelines/templates/run-unit-tests.yaml b/build/pipelines/templates/run-unit-tests.yaml index 5a0ff53..6411e24 100644 --- a/build/pipelines/templates/run-unit-tests.yaml +++ b/build/pipelines/templates/run-unit-tests.yaml @@ -1,6 +1,7 @@ # This template contains jobs to run unit tests. parameters: + isOSSBuild: false platform: '' runsettingsFileName: '' @@ -10,7 +11,10 @@ jobs: dependsOn: Build${{ parameters.platform }} condition: succeeded() pool: - vmImage: windows-2022 + ${{ if eq(parameters.isOSSBuild, true) }}: + name: EssentialExperiencesOpenSource-windows-2022 + ${{ if eq(parameters.isOSSBuild, false) }}: + name: EssentialExperiences-windows-2022 variables: skipComponentGovernanceDetection: true steps: