[Arm64/Ubuntu] Rework official build flow to support bootstrapping (#28289)

2 files changed, 57 insertions, 7 deletions

diff --git a/buildpipeline/DotNet-CoreFx-Trusted-Linux-Crossbuild.json b/buildpipeline/DotNet-CoreFx-Trusted-Linux-Crossbuild.json
index 8822a96405..11f9cf89bb 100644
--- a/buildpipeline/DotNet-CoreFx-Trusted-Linux-Crossbuild.json
+++ b/buildpipeline/DotNet-CoreFx-Trusted-Linux-Crossbuild.json
@@ -163,7 +163,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Run build.sh",
+      "displayName": "Run build-native.sh",
       "timeoutInMinutes": 0,
       "refName": "Task9",
       "task": {
@@ -173,7 +173,7 @@
       },
       "inputs": {
         "filename": "docker",
-        "arguments": "run -e ROOTFS_DIR $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/build.sh -OfficialBuildId=$(OfficialBuildId) $(PB_BuildArguments)",
+        "arguments": "run -e ROOTFS_DIR=$(ROOTFS_DIR) $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/build-native.sh -OfficialBuildId=$(OfficialBuildId) $(PB_BuildNativeArguments)",
         "workingFolder": "",
         "failOnStandardError": "false"
       }
@@ -183,7 +183,7 @@
       "enabled": true,
       "continueOnError": false,
       "alwaysRun": false,
-      "displayName": "Run publish-packages.sh",
+      "displayName": "Run build-managed.sh",
       "timeoutInMinutes": 0,
       "refName": "Task10",
       "task": {
@@ -193,6 +193,46 @@
       },
       "inputs": {
         "filename": "docker",
+        "arguments": "run -e ROOTFS_DIR=$(ROOTFS_DIR) $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/build-managed.sh -OfficialBuildId=$(OfficialBuildId) $(PB_BuildManagedArguments)",
+        "workingFolder": "",
+        "failOnStandardError": "false"
+      }
+    },
+    {
+      "environment": {},
+      "enabled": true,
+      "continueOnError": false,
+      "alwaysRun": false,
+      "displayName": "Run build-packages.sh",
+      "timeoutInMinutes": 0,
+      "refName": "Task11",
+      "task": {
+        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
+        "versionSpec": "1.*",
+        "definitionType": "task"
+      },
+      "inputs": {
+        "filename": "docker",
+        "arguments": "run -e ROOTFS_DIR=$(ROOTFS_DIR) $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/build-packages.sh -OfficialBuildId=$(OfficialBuildId) $(PB_BuildPackagesArguments)",
+        "workingFolder": "",
+        "failOnStandardError": "false"
+      }
+    },
+    {
+      "environment": {},
+      "enabled": true,
+      "continueOnError": false,
+      "alwaysRun": false,
+      "displayName": "Run publish-packages.sh",
+      "timeoutInMinutes": 0,
+      "refName": "Task12",
+      "task": {
+        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
+        "versionSpec": "1.*",
+        "definitionType": "task"
+      },
+      "inputs": {
+        "filename": "docker",
         "arguments": "run $(PB_DockerCommonRunArgs) $(PB_DockerVolumeName)/publish-packages.sh -AzureAccount=$(PB_CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(PB_Label) -verbose -- /p:OverwriteOnPublish=false",
         "workingFolder": "",
         "failOnStandardError": "false"
@@ -252,7 +292,7 @@
       "displayName": "Cleanup Docker",
       "timeoutInMinutes": 0,
       "condition": "always()",
-      "refName": "Task12",
+      "refName": "Task14",
       "task": {
         "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
         "versionSpec": "1.*",
@@ -273,7 +313,7 @@
       "displayName": "Cleanup VSTS Agent",
       "timeoutInMinutes": 0,
       "condition": "always()",
-      "refName": "Task13",
+      "refName": "Task15",
       "task": {
         "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
         "versionSpec": "1.*",
@@ -336,6 +376,15 @@
     "PB_BuildArguments": {
       "value": "-BuildArch=$(PB_Architecture)"
     },
+    "PB_BuildNativeArguments": {
+      "value": "$(PB_BuildArguments)"
+    },
+    "PB_BuildManagedArguments": {
+      "value": "$(PB_BuildArguments)"
+    },
+    "PB_BuildPackagesArguments": {
+      "value": "$(PB_BuildArguments)"
+    },
     "PB_CleanAgent": {
       "value": "true"
     },
@@ -479,4 +528,4 @@
     "revision": 418098432,
     "visibility": "organization"
   }
-}
\ No newline at end of file
+}
diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json
index 9a8b0ca185..897407e186 100644
--- a/buildpipeline/pipeline.json
+++ b/buildpipeline/pipeline.json
@@ -79,7 +79,8 @@
             "PB_DockerTag": "ubuntu-16.04-cross-arm64-a3ae44b-20180315221921",
             "PB_Architecture": "arm64",
             "PB_BuildArguments": "-buildArch=arm64 -$(PB_ConfigurationGroup) -stripSymbols -- /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)",
-            "PB_SyncArguments": "-p -- /p:ArchGroup=arm64 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)"
+            "PB_BuildManagedArguments": "-BuildPackages=false -buildArch=x64 -$(PB_ConfigurationGroup) -stripSymbols -- /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)",
+            "PB_SyncArguments": "-p -BuildTests=false -- /p:ArchGroup=arm64 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)"
           },
           "ReportingParameters": {
             "OperatingSystem": "Linux",