diff --git a/eng/common/templates/stages/dotnet/build-test-publish-repo.yml b/eng/common/templates/stages/dotnet/build-test-publish-repo.yml index 564531254..656bc367f 100644 --- a/eng/common/templates/stages/dotnet/build-test-publish-repo.yml +++ b/eng/common/templates/stages/dotnet/build-test-publish-repo.yml @@ -14,7 +14,7 @@ parameters: windowsAmdBuildJobTimeout: 60 windowsAmdTestJobTimeout: 60 linuxAmdBuildJobTimeout: 60 - linuxAmd64Pool: "" + linuxAmd64Pool: null buildMatrixType: platformDependencyGraph testMatrixType: platformVersionedOs @@ -62,7 +62,7 @@ stages: - group: DotNet-AllOrgs-Darc-Pats linuxAmd64Pool: - ${{ if ne(parameters.linuxAmd64Pool, '') }}: + ${{ if parameters.linuxAmd64Pool }}: ${{ parameters.linuxAmd64Pool }} ${{ elseif eq(variables['System.TeamProject'], parameters.publicProjectName) }}: vmImage: $(defaultLinuxAmd64PoolImage) diff --git a/eng/pipelines/dotnet-buildtools-prereqs-all-pr.yml b/eng/pipelines/dotnet-buildtools-prereqs-all-pr.yml index 12acdbe7b..f200baf8a 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-all-pr.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-all-pr.yml @@ -15,7 +15,7 @@ variables: - template: variables/common.yml stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-all.yml b/eng/pipelines/dotnet-buildtools-prereqs-all.yml index 1ba78908f..e3db456ac 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-all.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-all.yml @@ -15,7 +15,7 @@ variables: - template: variables/common.yml stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-almalinux-pr.yml b/eng/pipelines/dotnet-buildtools-prereqs-almalinux-pr.yml index 31315b708..36dfc3392 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-almalinux-pr.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-almalinux-pr.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/almalinux/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-almalinux.yml b/eng/pipelines/dotnet-buildtools-prereqs-almalinux.yml index 3ca971604..252484876 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-almalinux.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-almalinux.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/almalinux/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-alpine-pr.yml b/eng/pipelines/dotnet-buildtools-prereqs-alpine-pr.yml index 80c94899f..22315a660 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-alpine-pr.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-alpine-pr.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/alpine/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-alpine.yml b/eng/pipelines/dotnet-buildtools-prereqs-alpine.yml index ee2aaa736..51c7dd21e 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-alpine.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-alpine.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/alpine/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-centos-pr.yml b/eng/pipelines/dotnet-buildtools-prereqs-centos-pr.yml index 9d1825c6e..aab3c1dd0 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-centos-pr.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-centos-pr.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/centos/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-centos.yml b/eng/pipelines/dotnet-buildtools-prereqs-centos.yml index 6a833fe75..b931f1d21 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-centos.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-centos.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/centos/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-debian-pr.yml b/eng/pipelines/dotnet-buildtools-prereqs-debian-pr.yml index 006504ec3..515b1e701 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-debian-pr.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-debian-pr.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/debian/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-debian.yml b/eng/pipelines/dotnet-buildtools-prereqs-debian.yml index ab832204b..787f13aec 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-debian.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-debian.yml @@ -21,7 +21,7 @@ variables: value: --path 'src/debian/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-eng.yml b/eng/pipelines/dotnet-buildtools-prereqs-eng.yml index 0e4e992f8..83f4f1184 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-eng.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-eng.yml @@ -21,7 +21,7 @@ variables: value: --path '*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-fedora-pr.yml b/eng/pipelines/dotnet-buildtools-prereqs-fedora-pr.yml index 676572256..b838d3a43 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-fedora-pr.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-fedora-pr.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/fedora/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-fedora.yml b/eng/pipelines/dotnet-buildtools-prereqs-fedora.yml index 3c49c1465..98f511163 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-fedora.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-fedora.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/fedora/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-mariner-pr.yml b/eng/pipelines/dotnet-buildtools-prereqs-mariner-pr.yml index f86edb835..e2c536832 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-mariner-pr.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-mariner-pr.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/cbl-mariner/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-mariner.yml b/eng/pipelines/dotnet-buildtools-prereqs-mariner.yml index 480468014..af28f26dd 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-mariner.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-mariner.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/cbl-mariner/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-nanoserver-pr.yml b/eng/pipelines/dotnet-buildtools-prereqs-nanoserver-pr.yml index dfc4577cb..c423ccbbe 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-nanoserver-pr.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-nanoserver-pr.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/nanoserver/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-nanoserver.yml b/eng/pipelines/dotnet-buildtools-prereqs-nanoserver.yml index 32ea34e11..0c3bda440 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-nanoserver.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-nanoserver.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/nanoserver/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-opensuse-pr.yml b/eng/pipelines/dotnet-buildtools-prereqs-opensuse-pr.yml index 32bdd4a44..753af9cb9 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-opensuse-pr.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-opensuse-pr.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/opensuse/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-opensuse.yml b/eng/pipelines/dotnet-buildtools-prereqs-opensuse.yml index a59999a7c..7925598c1 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-opensuse.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-opensuse.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/opensuse/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-raspbian-pr.yml b/eng/pipelines/dotnet-buildtools-prereqs-raspbian-pr.yml index bccc5aa8a..dfaf258fa 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-raspbian-pr.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-raspbian-pr.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/raspbian/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-raspbian.yml b/eng/pipelines/dotnet-buildtools-prereqs-raspbian.yml index 19900ba3b..9920b6076 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-raspbian.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-raspbian.yml @@ -21,7 +21,7 @@ variables: value: --path 'src/raspbian/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-ubuntu-pr.yml b/eng/pipelines/dotnet-buildtools-prereqs-ubuntu-pr.yml index 408efcd06..b2071adfe 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-ubuntu-pr.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-ubuntu-pr.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/ubuntu/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-ubuntu.yml b/eng/pipelines/dotnet-buildtools-prereqs-ubuntu.yml index 43e308ef1..ba04370c6 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-ubuntu.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-ubuntu.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/ubuntu/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-windowsservercore-pr.yml b/eng/pipelines/dotnet-buildtools-prereqs-windowsservercore-pr.yml index 3c0aea68e..129193d05 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-windowsservercore-pr.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-windowsservercore-pr.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/windowsservercore/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/dotnet-buildtools-prereqs-windowsservercore.yml b/eng/pipelines/dotnet-buildtools-prereqs-windowsservercore.yml index 5c3222004..c03ee9cd5 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-windowsservercore.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-windowsservercore.yml @@ -20,7 +20,7 @@ variables: value: --path 'src/windowsservercore/*' stages: -- template: ../common/templates/stages/dotnet/build-test-publish-repo.yml +- template: stages/build-test-publish-repo.yml parameters: internalProjectName: ${{ variables.internalProjectName }} publicProjectName: ${{ variables.publicProjectName }} diff --git a/eng/pipelines/stages/build-test-publish-repo.yml b/eng/pipelines/stages/build-test-publish-repo.yml new file mode 100644 index 000000000..dc05b89d4 --- /dev/null +++ b/eng/pipelines/stages/build-test-publish-repo.yml @@ -0,0 +1,29 @@ +parameters: + noCache: false + internalProjectName: null + publicProjectName: null + linuxAmdBuildJobTimeout: null + linuxArmBuildJobTimeout: null + customBuildInitSteps: [] + customCopyBaseImagesInitSteps: [] + +stages: +- template: ../../common/templates/stages/dotnet/build-test-publish-repo.yml + parameters: + noCache: ${{ parameters.noCache }} + internalProjectName: ${{ variables.internalProjectName }} + publicProjectName: ${{ variables.publicProjectName }} + + linuxAmd64Pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals build.ubuntu.2204.amd64 + ${{ else }}: + name: NetCore-Public + demands: ImageOverride -equals build.ubuntu.2204.amd64.open + + linuxAmdBuildJobTimeout: ${{ parameters.linuxAmdBuildJobTimeout }} + linuxArmBuildJobTimeout: ${{ parameters.linuxArmBuildJobTimeout }} + + customBuildInitSteps: ${{ parameters.customBuildInitSteps }} + customCopyBaseImagesInitSteps: ${{ parameters.customCopyBaseImagesInitSteps }} diff --git a/src/cbl-mariner/2.0/cross/android/amd64/Dockerfile b/src/cbl-mariner/2.0/cross/android/amd64/Dockerfile new file mode 100644 index 000000000..944cc93e4 --- /dev/null +++ b/src/cbl-mariner/2.0/cross/android/amd64/Dockerfile @@ -0,0 +1,6 @@ +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64-local AS crossrootx64 + +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-android-local + +# Copy crossrootfs from AMD64 build image, so we can build Android-targeting code for that arch +COPY --from=crossrootx64 /crossrootfs/x64 /crossrootfs/x64 \ No newline at end of file diff --git a/src/cbl-mariner/manifest.json b/src/cbl-mariner/manifest.json index e6097cbd4..7870b2d27 100644 --- a/src/cbl-mariner/manifest.json +++ b/src/cbl-mariner/manifest.json @@ -292,6 +292,19 @@ } ] }, + { + "platforms": [ + { + "dockerfile": "src/cbl-mariner/2.0/cross/android/amd64", + "os": "linux", + "osVersion": "cbl-mariner2.0", + "tags": { + "cbl-mariner-2.0-cross-android-amd64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}, + "cbl-mariner-2.0-cross-android-amd64$(FloatingTagSuffix)": {} + } + } + ] + }, { "platforms": [ {