Merge pull request #6477 from avildema/jucx_pool

AZP/RELEASE: launch jucx in lab
openucx · Mar 28, 2021 · c14a404 · c14a404
2 parents 8d17ade + a796a80
commit c14a404
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/buildlib/az-distro-release.yml b/buildlib/az-distro-release.yml
@@ -1,6 +1,6 @@
 jobs:
   - job: distro_release
-    condition: or(eq(variables['Build.Reason'], 'IndividualCI'), and(eq(stageDependencies.Check_Commit.Check.outputs['Commit.Title'], 'Yes'), eq(variables['Build.Reason'], 'PullRequest')))
+    condition: eq(stageDependencies.Check_Commit.Check.outputs['Commit.Launch'], 'Yes')
     displayName: distro
     variables:
       ${{ if eq(variables['Build.Reason'], 'IndividualCI') }}:

diff --git a/buildlib/azure-pipelines-release.yml b/buildlib/azure-pipelines-release.yml
@@ -11,8 +11,6 @@ pr:
 
 resources:
   containers:
-    - container: centos7
-      image: rdmz-harbor.rdmz.labs.mlnx/ucx/centos7-mofed5.x-cuda11.1:1
     - container: centos7_cuda10_1
       image: rdmz-harbor.rdmz.labs.mlnx/ucx/centos7-mofed5.0-cuda10.1:1
     - container: centos7_cuda10_2
@@ -54,22 +52,26 @@ stages:
               set -eEx
               echo "Get commit message target $(system.pullRequest.sourceCommitId)"
               title=`git log -1 --format="%s" $(system.pullRequest.sourceCommitId)`
+              run_by_title=No
               if [[ "$title" == "AZP/RELEASE: "* ]]
               then
-                  echo Yes
-                  echo "##vso[task.setvariable variable=Title;isOutput=true]Yes"
+                  run_by_title=Yes
+              fi
+
+              if [[ "$(Build.Reason)" == "IndividualCI" ]] || [[ "${run_by_title}" == "Yes" && "$(Build.Reason)" == "PullRequest" ]]
+              then
+                  echo "##vso[task.setvariable variable=Launch;isOutput=true]Yes"
               else
-                  echo No
-                  echo "##vso[task.setvariable variable=Title;isOutput=true]No"
+                  echo "##vso[task.setvariable variable=Launch;isOutput=true]No"
               fi
             name: Commit
   # Create an empty draft to avoid race condition in distro releases
   - stage: GitHubDraft
     dependsOn: Check_Commit
     jobs:
       - job: DraftRelease
-        condition: or(eq(variables['Build.Reason'], 'IndividualCI'), and(eq(stageDependencies.Check_Commit.Check.outputs['Commit.Title'], 'Yes'), eq(variables['Build.Reason'], 'PullRequest')))
-        container: centos7
+        condition: eq('Yes', stageDependencies.Check_Commit.Check.outputs['Commit.Launch'])
+        container: centos7_cuda11_2
         pool:
           name: MLNX
           demands:
@@ -109,8 +111,13 @@ stages:
 
   - stage: Release
     dependsOn: Check_Commit
+    variables:
+      ${{ if eq(variables['Build.Reason'], 'IndividualCI') }}:
+        TARGET: publish-release
+      ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+        TARGET: package
     jobs:
       - template: az-distro-release.yml
       - template: jucx-publish.yml
         parameters:
-          target: publish-release
+          target: $(TARGET)
diff --git a/buildlib/jucx-publish.yml b/buildlib/jucx-publish.yml
@@ -5,22 +5,22 @@ parameters:
 
 jobs:
   - job: jucx_release
-    condition: eq(variables['Build.Reason'], 'IndividualCI')
-    container: centos7
-
+    condition: eq(stageDependencies.Check_Commit.Check.outputs['Commit.Launch'], 'Yes')
+    container: ubuntu20_cuda11_2
+    pool:
+      name: MLNX
+      demands:
+      - ucx_docker -equals yes
     steps:
       - checkout: self
+        fetchDepth: 100
         clean: true
 
       - bash: |
-          set -eE
+          set -eEx
           gcc --version
           ./autogen.sh
           ./contrib/configure-release --with-java
-        displayName: Configure
-
-      - bash: |
-          set -eE
           make -s -j`nproc`
         displayName: Build ucx