[ci] Switch .pkg PR build to pipeline script as well (#6092)

2 files changed, 18 insertions, 15 deletions

diff --git a/scripts/ci/pipeline/osx-package.groovy b/scripts/ci/pipeline/osx-package.groovy
index cd4d14a7bd4..5c997a55019 100644
--- a/scripts/ci/pipeline/osx-package.groovy
+++ b/scripts/ci/pipeline/osx-package.groovy
@@ -1,11 +1,13 @@
-def jobName = "build-package-osx-mono"
+def isPr = (env.ghprbPullId && !env.ghprbPullId.empty ? true : false)
+def monoBranch = (isPr ? "pr" : env.BRANCH_NAME)
+def isReleaseJob = (!isPr && monoBranch ==~ /201\d-\d\d/) // check if we're on a 2017-xx branch, i.e. release
+def jobName = (isPr ? "build-package-osx-mono-pullrequest" : "build-package-osx-mono")
 def windowsJobName = "build-package-win-mono"
-def isReleaseJob = (BRANCH_NAME ==~ /201\d-\d\d/) // check if we're on a 2017-xx branch, i.e. release
 def packageFileName = null
 def commitHash = null
 
 node ("osx-amd64") {
-    ws ("workspace/${jobName}/${BRANCH_NAME}") {
+    ws ("workspace/${jobName}/${monoBranch}") {
         timestamps {
             stage('Checkout') {
                 // clone and checkout repo
@@ -19,8 +21,6 @@ node ("osx-amd64") {
                 currentBuild.displayName = "${commitHash.substring(0,7)}"
             }
             stage('Build') {
-                // show which xcode will be used to build
-                sh 'xcodebuild -version'
 
                 // install openssl for .net core (remove once msbuild uses a 2.x version which doesn't rely on openssl)
                 sh 'brew update && brew install openssl'
@@ -37,7 +37,7 @@ node ("osx-amd64") {
 
                 // build the .pkg
                 timeout (time: 420, unit: 'MINUTES') {
-                    withEnv (["MONO_BRANCH=${BRANCH_NAME}"]) {
+                    withEnv (["MONO_BRANCH=${isPr ? '' : monoBranch}"]) {
                         sshagent (credentials: ['mono-extensions-ssh']) {
                             sh "external/bockbuild/bb MacSDKRelease --arch darwin-universal --verbose --package ${isReleaseJob ? '--release' : ''}"
                         }
@@ -64,9 +64,9 @@ node ("osx-amd64") {
                     storageCredentialId: 'fbd29020e8166fbede5518e038544343',
                     uploadArtifactsOnlyIfSuccessful: true,
                     uploadZips: false,
-                    virtualPath: "${BRANCH_NAME}/${BUILD_NUMBER}/"
+                    virtualPath: "${monoBranch}/${env.BUILD_NUMBER}/"
                 ])
-                currentBuild.description = "<hr/><h2>DOWNLOAD: <a href=\"https://xamjenkinsartifact.azureedge.net/${jobName}/${BRANCH_NAME}/${BUILD_NUMBER}/${packageFileName}\">${packageFileName}</a></h2><hr/>"
+                currentBuild.description = "<hr/><h2>DOWNLOAD: <a href=\"https://xamjenkinsartifact.azureedge.net/${jobName}/${monoBranch}/${env.BUILD_NUMBER}/${packageFileName}\">${packageFileName}</a></h2><hr/>"
             }
         }
     }
@@ -85,5 +85,7 @@ else {
     echo "Not a release job, skipping signing."
 }
 
-// trigger the Windows build
-build(job: "${windowsJobName}/${BRANCH_NAME}", wait: false)
+if (!isPr) {
+    // trigger the Windows build
+    build(job: "${windowsJobName}/${monoBranch}", wait: false)
+}
diff --git a/scripts/ci/pipeline/win-package.groovy b/scripts/ci/pipeline/win-package.groovy
index 76d64dd4675..189e63be59e 100644
--- a/scripts/ci/pipeline/win-package.groovy
+++ b/scripts/ci/pipeline/win-package.groovy
@@ -1,10 +1,11 @@
+def monoBranch = env.BRANCH_NAME
+def isReleaseJob = (monoBranch ==~ /201\d-\d\d/) // check if we're on a 2017-xx branch, i.e. release
 def jobName = "build-package-win-mono"
 def macJobName = "build-package-osx-mono"
-def isReleaseJob = (BRANCH_NAME ==~ /201\d-\d\d/) // check if we're on a 2017-xx branch, i.e. release
 def commitHash = null
 
 node ("w64") {
-    ws ("workspace/${jobName}/${BRANCH_NAME}") {
+    ws ("workspace/${jobName}/${monoBranch}") {
         timestamps {
             stage('Checkout') {
                 // clone and checkout repo
@@ -17,7 +18,7 @@ node ("w64") {
             stage('Download Mac .pkg from Azure') {
                 step([
                     $class: 'AzureStorageBuilder',
-                    downloadType: [value: 'project', containerName: '', projectName: "${macJobName}/${BRANCH_NAME}",
+                    downloadType: [value: 'project', containerName: '', projectName: "${macJobName}/${monoBranch}",
                                 buildSelector: [$class: 'TriggeredBuildSelector', upstreamFilterStrategy: 'UseGlobalSetting', allowUpstreamDependencies: false, fallbackToLastSuccessful: false]],
                     includeFilesPattern: '**/*.pkg',
                     excludeFilesPattern: '',
@@ -71,9 +72,9 @@ node ("w64") {
                     storageCredentialId: 'fbd29020e8166fbede5518e038544343',
                     uploadArtifactsOnlyIfSuccessful: true,
                     uploadZips: false,
-                    virtualPath: "${BRANCH_NAME}/${BUILD_NUMBER}/"
+                    virtualPath: "${monoBranch}/${env.BUILD_NUMBER}/"
                 ])
-                currentBuild.description = "<hr/><h2>DOWNLOAD: <a href=\"https://xamjenkinsartifact.azureedge.net/${jobName}/${BRANCH_NAME}/${BUILD_NUMBER}/MonoForWindows-x86.msi\">MonoForWindows-x86.msi</a> -- <a href=\"https://xamjenkinsartifact.azureedge.net/${jobName}/${BRANCH_NAME}/${BUILD_NUMBER}/MonoForWindows-x64.msi\">MonoForWindows-x64.msi</a></h2><hr/>"
+                currentBuild.description = "<hr/><h2>DOWNLOAD: <a href=\"https://xamjenkinsartifact.azureedge.net/${jobName}/${monoBranch}/${env.BUILD_NUMBER}/MonoForWindows-x86.msi\">MonoForWindows-x86.msi</a> -- <a href=\"https://xamjenkinsartifact.azureedge.net/${jobName}/${monoBranch}/${env.BUILD_NUMBER}/MonoForWindows-x64.msi\">MonoForWindows-x64.msi</a></h2><hr/>"
             }
         }
     }