Add docker image w/ both Android SDK and an x64 crossroot (#901)

Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
dotnet · Jul 10, 2023 · af78485 · af78485
1 parent 9de0cb6
commit af78485
Show file tree

Hide file tree

Showing 28 changed files with 73 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: ${{ parameters.internalProjectName }}
+    publicProjectName: ${{ parameters.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
@@ -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
diff --git 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": [
             {