[Arm64] Enable CI & Official builds (dotnet/core-setup#3855)

Commit migrated from https://github.com/dotnet/core-setup/commit/dfab1cc82ae5b24f92aa64569f8096555255c438

diff --git a/src/installer/buildpipeline/pipeline.json b/src/installer/buildpipeline/pipeline.json
index 5de1e65..696a04a 100644 (file)
--- a/src/installer/buildpipeline/pipeline.json
+++ b/src/installer/buildpipeline/pipeline.json
@@ -78,6 +78,23 @@
           }
         },
         {
+          "Name": "Core-Setup-Linux-Arm-BT",
+          "Parameters": {
+            "PB_DockerTag": "ubuntu-16.04-cross-arm64-a3ae44b-20180316023254",
+            "PB_TargetArchitecture": "arm64",
+            "PB_AdditionalBuildArguments":"-TargetArchitecture=arm64 -DisableCrossgen=true -PortableBuild=true -SkipTests=true -CrossBuild=true -strip-symbols",
+            "PB_AdditionalMSBuildArguments": "/p:DotNetRestoreSources=$(PB_RestoreSource) /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)",
+            "PB_CrossBuildArgs": "-e ROOTFS_DIR=$(ROOTFS_DIR) ",
+            "PB_PortableBuild": "true"
+          },
+          "ReportingParameters": {
+            "SubType": "PortableBuild",
+            "OperatingSystem": "Ubuntu 16.04",
+            "Type": "build/product/",
+            "Platform": "arm64"
+          }
+        },
+        {
           "Name": "Core-Setup-OSX-BT",
           "Parameters": {
             "PB_AdditionalBuildArguments": "-PortableBuild=true -strip-symbols -SkipTests=$(PB_SkipTests)",
@@ -204,4 +221,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}

diff --git a/src/installer/netci.groovy b/src/installer/netci.groovy
index d642b51..b424671 100644 (file)
--- a/src/installer/netci.groovy
+++ b/src/installer/netci.groovy
@@ -10,7 +10,7 @@ def project = GithubProject
 def branch = GithubBranchName
 def isPR = true
 
-def platformList = ['Linux:x64:Release', 'Linux:arm:Release', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'Windows_NT:arm:Debug', 'Tizen:armel:Release']
+def platformList = ['Linux:x64:Release', 'Linux:arm:Release', 'Linux:arm64:Release', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'Windows_NT:arm:Debug', 'Tizen:armel:Release']
 
 def static getBuildJobName(def configuration, def os, def architecture) {
     return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase()
@@ -54,8 +54,13 @@ platformList.each { platform ->
     else if (os == "Linux") {
 
         // Prep for Portable Linux builds take place on Ubuntu 14.04
-        if (architecture == 'arm' || architecture == 'armel') {
-            dockerContainer = "ubuntu-14.04-cross-0cd4667-20172211042239"
+        if (architecture == 'arm' || architecture == 'armel' || architecture == 'arm64') {
+            if (architecture == 'arm64') {
+                dockerContainer = "ubuntu-16.04-cross-arm64-a3ae44b-20180316023254"
+            }
+            else {
+                dockerContainer = "ubuntu-14.04-cross-0cd4667-20172211042239"
+            }
             dockerCommand = "docker run -e ROOTFS_DIR=/crossrootfs/${architecture} --name ${dockerContainer} --rm -v \${WORKSPACE}:${dockerWorkingDirectory} -w=${dockerWorkingDirectory} ${dockerRepository}:${dockerContainer}"
             buildArgs += " -SkipTests=true -DisableCrossgen=true -CrossBuild=true"
             buildCommand = "${dockerCommand} ./build.sh ${buildArgs}"