DAOS-623 build: Allow deps repo and PR-repo... (#13460)

To update modular RPMs. Fix Launchable analysis workaround. Signed-off-by: Brian J. Murrell <[email protected]>
daos-stack · Dec 8, 2023 · 205ca12 · 205ca12
1 parent 72f6149
commit 205ca12
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 18 deletions.
diff --git a/ci/functional/launchable_analysis b/ci/functional/launchable_analysis
@@ -5,14 +5,21 @@ set -eux
 dir="$1/$STAGE_NAME/"
 if ! mkdir -p "$dir"; then
     echo "Failed to create \"$dir\":"
-    while [ -n "$dir" ]; do
-        ls -ld "$dir" || true
-        dir=${dir%/*}
-        if [ -f "$dir" ]; then
-            cat "$dir"
+    _dir="$dir"
+    while [ -n "$_dir" ]; do
+        ls -ld "$_dir" || true
+        _dir=${_dir%/*}
+        if [ -f "$_dir" ]; then
+            cat "$_dir"
         fi
     done
-    exit 1
+    if [ -f "$1" ]; then
+        mv "$1"{,."$(date +%s)"}
+        if ! mkdir -p "$dir"; then
+            echo "Failed to create \"$dir\""
+            exit 1
+        fi
+    fi
 fi
 
 notify=false

diff --git a/ci/provisioning/post_provision_config_common_functions.sh b/ci/provisioning/post_provision_config_common_functions.sh
@@ -367,10 +367,10 @@ post_provision_config_nodes() {
             fi
         fi
         local repo_url="${ARTIFACTS_URL:-${JENKINS_URL}job/}"daos-stack/job/"$repo"/job/"${branch//\//%252F}"/"$build_number"/artifact/artifacts/$DISTRO_NAME/
-        dnf -y config-manager --add-repo="${repo_url}"
-        # Disable module filtering
-        repo=$(url_to_repo "$repo_url")
-        dnf config-manager --save --setopt "$repo.module_hotfixes=true" "$repo"
+        dnf -y config-manager --add-repo="$repo_url"
+        repo="$(url_to_repo "$repo_url")"
+        # PR-repos: should always be able to upgrade modular packages
+        dnf -y config-manager --save --setopt "$repo.module_hotfixes=true" "$repo"
         disable_gpg_check "$repo_url"
     done
 

diff --git a/utils/scripts/helpers/repo-helper-el8.sh b/utils/scripts/helpers/repo-helper-el8.sh
@@ -97,8 +97,9 @@ for repo in $REPOS; do
 name=$repo:$branch:$build_number\n\
 baseurl=${JENKINS_URL}$daos_base$repo/job/$branch/$build_number$artifacts\n\
 enabled=1\n\
-gpgcheck=False\n" >> /etc/yum.repos.d/$repo:$branch:$build_number.repo
-    cat /etc/yum.repos.d/$repo:$branch:$build_number.repo
+gpgcheck=False\n
+module_hotfixes=true\n" >> /etc/yum.repos.d/"$repo:$branch:$build_number".repo
+    cat /etc/yum.repos.d/"$repo:$branch:$build_number".repo
     save_repos+=("$repo:$branch:$build_number")
 done
 

diff --git a/utils/scripts/helpers/repo-helper-el9.sh b/utils/scripts/helpers/repo-helper-el9.sh
@@ -75,14 +75,18 @@ if [ ! -f /etc/fedora-release ]; then
         PT_REPO=crb
     fi
     dnf install epel-release
-    dnf config-manager --enable $PT_REPO
+    dnf config-manager --enable "$PT_REPO"
 fi
 dnf clean all
 
 daos_base="job/daos-stack/job/"
 artifacts="/artifact/artifacts/el$MAJOR_VER/"
 save_repos=()
 for repo in $REPOS; do
+    # don't install daos@ repos since we are building daos
+    if [[ $repo = daos@* ]]; then
+        continue
+    fi
     branch="master"
     build_number="lastSuccessfulBuild"
     if [[ $repo = *@* ]]; then
@@ -97,8 +101,9 @@ for repo in $REPOS; do
 name=$repo:$branch:$build_number\n\
 baseurl=${JENKINS_URL}$daos_base$repo/job/$branch/$build_number$artifacts\n\
 enabled=1\n\
-gpgcheck=False\n" >> /etc/yum.repos.d/$repo:$branch:$build_number.repo
-    cat /etc/yum.repos.d/$repo:$branch:$build_number.repo
+gpgcheck=False\n
+module_hotfixes=true\n" >> /etc/yum.repos.d/"$repo:$branch:$build_number".repo
+    cat /etc/yum.repos.d/"$repo:$branch:$build_number".repo
     save_repos+=("$repo:$branch:$build_number")
 done
 

diff --git a/utils/scripts/helpers/repo-helper-leap15.sh b/utils/scripts/helpers/repo-helper-leap15.sh
@@ -135,12 +135,13 @@ for repo in $REPOS; do
 name=$repo:$branch:$build_number\n\
 baseurl=${JENKINS_URL}$daos_base$repo/job/$branch/$build_number$artifacts\n\
 enabled=1\n\
-gpgcheck=False\n" >> $repos_dir$repo:$branch:$build_number.repo
-    cat $repos_dir$repo:$branch:$build_number.repo
+gpgcheck=False\n
+module_hotfixes=true\n" >> "$repos_dir$repo:$branch:$build_number".repo
+    cat "$repos_dir$repo:$branch:$build_number".repo
     save_repos+=("$repo:$branch:$build_number")
 done
 
-disable_repos $repos_dir "${save_repos[@]}"
+disable_repos "$repos_dir" "${save_repos[@]}"
 
 if [ -e /etc/profile.d/lmod.sh ]; then
     if ! grep "MODULEPATH=.*/usr/share/modules" /etc/profile.d/lmod.sh; then