From 301bed34f79c5820f68b31b1f485da198d1b9070 Mon Sep 17 00:00:00 2001
From: Alexey Rivkin <arivkin@nvidia.com>
Date: Wed, 18 Jan 2023 18:18:11 +0200
Subject: [PATCH] AZP/RELEASE: Fixes for v1.14 release

---
 buildlib/az-distro-release.yml       | 2 ++
 buildlib/az-helpers.sh               | 2 ++
 buildlib/azure-pipelines-release.yml | 4 ++++
 buildlib/jucx/jucx-publish.yml       | 6 ++++++
 4 files changed, 14 insertions(+)

diff --git a/buildlib/az-distro-release.yml b/buildlib/az-distro-release.yml
index e1f0d04d259..0ad0e5d7c7b 100644
--- a/buildlib/az-distro-release.yml
+++ b/buildlib/az-distro-release.yml
@@ -65,6 +65,8 @@ jobs:
       - bash: |
           set -eEx
           cd pkg-build
+          echo 10 > debian/compat   # https://www.debian.org/doc/manuals/maint-guide/dother.en.html#compat
+          sed -i 's|./contrib|../contrib|' debian/rules  # Hack
           dpkg-buildpackage -us -uc
           find .. -name '*.deb'
           find .. -name '*.deb' -exec cp {} "../${AZ_ARTIFACT_NAME}" \;
diff --git a/buildlib/az-helpers.sh b/buildlib/az-helpers.sh
index 4b524e680ed..639c3ea5f9d 100644
--- a/buildlib/az-helpers.sh
+++ b/buildlib/az-helpers.sh
@@ -98,6 +98,8 @@ function add_timestamp() {
 function az_init_modules() {
     . /etc/profile.d/modules.sh
     export MODULEPATH="/hpc/local/etc/modulefiles:$MODULEPATH"
+    # Read module files (W/A if there're some network instabilities lead to autofs issues)
+    find /hpc/local/etc/modulefiles > /dev/null || true
 }
 
 #
diff --git a/buildlib/azure-pipelines-release.yml b/buildlib/azure-pipelines-release.yml
index cbe9d2ed195..9133f270d8d 100644
--- a/buildlib/azure-pipelines-release.yml
+++ b/buildlib/azure-pipelines-release.yml
@@ -9,10 +9,14 @@ pr:
   - master
   - v*.*.x
 
+variables:
+  DOCKER_OPT_VOLUMES: -v /hpc/local:/hpc/local
+
 resources:
   containers:
     - container: centos7_cuda11
       image: rdmz-harbor.rdmz.labs.mlnx/ucx/centos7-mofed5-cuda11:2
+      options: $(DOCKER_OPT_VOLUMES)
     - container: centos8_cuda11
       image: rdmz-harbor.rdmz.labs.mlnx/ucx/centos8-mofed5-cuda11:2
     - container: ubuntu16_cuda11
diff --git a/buildlib/jucx/jucx-publish.yml b/buildlib/jucx/jucx-publish.yml
index fc1d16adc61..7af582178b4 100644
--- a/buildlib/jucx/jucx-publish.yml
+++ b/buildlib/jucx/jucx-publish.yml
@@ -56,6 +56,12 @@ jobs:
         name: publicKey
 
       - bash: |
+          source buildlib/az-helpers.sh
+          az_init_modules
+          az_module_load dev/mvn
+          # use the lowest supported Java version for compatibility:
+          az_module_load dev/jdk-1.8
+          mvn --version
           mkdir ${{ parameters.gpg_dir }}
           export GPG_TTY=`tty`
           chmod 700 ${{ parameters.gpg_dir }}