[arvados] created: 2.6.0-524-ga0c328d4e

[git repository hosting]

        at  a0c328d4eaa19a05f1d9028c0d21cf8657229bf7 (commit)


commit a0c328d4eaa19a05f1d9028c0d21cf8657229bf7
Author: Brett Smith <brett.smith at curii.com>
Date:   Thu Aug 17 18:28:17 2023 -0400

    20878: Improve processed RPM check style
    
    This is nicer bash style that makes it more consistent with the
    preceding download code.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 6d5d0b653..12fb34f65 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -468,7 +468,7 @@ test_package_presence() {
       if curl -fs -o "$WORKSPACE/packages/$TARGET/$full_pkgname" "$rpm_url"; then
         echo "Package $full_pkgname exists upstream, not rebuilding, downloading instead!"
         return 1
-      elif test -f "$WORKSPACE/packages/$TARGET/processed/${full_pkgname}" ; then
+      elif [[ -f "$WORKSPACE/packages/$TARGET/processed/$full_pkgname" ]]; then
         echo "Package $full_pkgname exists, not rebuilding!"
         return 1
       else

commit 8498811f21bad0972db735d633ea4bf15af36418
Author: Brett Smith <brett.smith at curii.com>
Date:   Thu Aug 17 18:27:12 2023 -0400

    20878: Improve RPM download logic
    
    Instead of downloading and parsing a package file listing, just try to
    download the package directly, and check whether that succeeds.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 57fa49cf7..6d5d0b653 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -463,13 +463,10 @@ test_package_presence() {
           return 0
           ;;
       esac
-      local centos_repo="http://rpm.arvados.org/$rpm_root/$arch/"
+      local rpm_url="http://rpm.arvados.org/$rpm_root/$arch/$full_pkgname"
 
-      repo_pkg_list=$(curl -s -o - ${centos_repo})
-      echo ${repo_pkg_list} |grep -q ${full_pkgname}
-      if [ $? -eq 0 ]; then
+      if curl -fs -o "$WORKSPACE/packages/$TARGET/$full_pkgname" "$rpm_url"; then
         echo "Package $full_pkgname exists upstream, not rebuilding, downloading instead!"
-        curl -s -o "$WORKSPACE/packages/$TARGET/${full_pkgname}" ${centos_repo}${full_pkgname}
         return 1
       elif test -f "$WORKSPACE/packages/$TARGET/processed/${full_pkgname}" ; then
         echo "Package $full_pkgname exists, not rebuilding!"

commit 9c58422ecfd63291972fae7a00e3a4f683c2d1b4
Author: Brett Smith <brett.smith at curii.com>
Date:   Thu Aug 17 18:20:37 2023 -0400

    20878: Parameterize URL for RPM package builds
    
    * Add support for rocky8.
    * Prevent future errors by refusing to attempt a download for unknown
      targets.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 0766b7364..57fa49cf7 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -454,7 +454,16 @@ test_package_presence() {
         return 0
       fi
     else
-      centos_repo="http://rpm.arvados.org/CentOS/7/dev/x86_64/"
+      local rpm_root
+      case "TARGET" in
+        centos7) rpm_root="CentOS/7/dev" ;;
+        rocky8) rpm_root="CentOS/8/dev" ;;
+        *)
+          echo "FIXME: Don't know RPM URL path for $TARGET, building"
+          return 0
+          ;;
+      esac
+      local centos_repo="http://rpm.arvados.org/$rpm_root/$arch/"
 
       repo_pkg_list=$(curl -s -o - ${centos_repo})
       echo ${repo_pkg_list} |grep -q ${full_pkgname}

-----------------------------------------------------------------------


hooks/post-receive
--