[arvados-dev] updated: 29f9ab1514c1873f39b71f97e0efc5267424a4d8

[git repository hosting]

Summary of changes:
 jenkins/testing_to_stable_publish_packages.sh | 11 +++++++----
 jenkins/upload_packages_testing_to_stable.sh  |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

       via  29f9ab1514c1873f39b71f97e0efc5267424a4d8 (commit)
      from  54f0b908edbf2fbdc8c83cb9ca46eff62d1ec452 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 29f9ab1514c1873f39b71f97e0efc5267424a4d8
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Sep 21 12:57:02 2023 -0400

    Add rocky8 to publish package script
    
    refs #20769
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/jenkins/testing_to_stable_publish_packages.sh b/jenkins/testing_to_stable_publish_packages.sh
index dcc8f41..a06a920 100755
--- a/jenkins/testing_to_stable_publish_packages.sh
+++ b/jenkins/testing_to_stable_publish_packages.sh
@@ -32,13 +32,12 @@ done
 if [ -z "${packages}" ]; then
   echo "You must provide a comma-separated list of packages to publish, ie."
   echo "* Debian: --packages=arvados-ws:0.1.20170906144951.22418ed6e-1,keep-exercise:1.2.3-1"
-  echo "* Centos: --packages=arvados-ws:0.1.20170906144951.22418ed6e-1,keep-exercise:1.2.3-1"
   exit 254
 fi
 if [ -z "${distros}" ]; then
   echo "You must provide a space-separated list of LSB distribution codenames to which you want to publish to, ie."
   echo "* Debian: --distros=jessie,xenial,stretch,etc."
-  echo "* Centos: --distros=centos7,etc."
+  echo "* CentOS/Rocky: --distros=centos7,etc."
   exit 255
 fi
 
@@ -46,15 +45,19 @@ DIST_LIST=$(echo ${distros} | sed s/,/' '/g |tr '[:upper:]' '[:lower:]')
 CENTOS_PACKAGES=$(echo ${packages} | sed 's/\([a-z-]*\):[[:blank:]]*\([0-9.-]*\)/\1*\2*/g; s/,/ /g;')
 DEBIAN_PACKAGES=$(echo ${packages} | sed 's/\([a-z-]*\):[[:blank:]]*\([0-9.-]*\)/\1 (= \2)/g;')
 
-if ( echo ${DIST_LIST} |grep -q centos ); then
+if ( echo ${DIST_LIST} |grep -q -E '(centos|rocky)' ); then
   for DISTNAME in ${DIST_LIST}; do
     case ${DISTNAME} in
       'centos7')
         DIST_DIR_TEST='7/testing/x86_64'
         DIST_DIR_PROD='7/os/x86_64'
+	;;
+      'rocky8')
+        DIST_DIR_TEST='8/testing/x86_64'
+        DIST_DIR_PROD='8/os/x86_64'
       ;;
       *)
-        echo "Only centos7 is accepted right now"
+        echo "Only centos7 and rocky8 are accepted right now"
         exit 253
       ;;
     esac
diff --git a/jenkins/upload_packages_testing_to_stable.sh b/jenkins/upload_packages_testing_to_stable.sh
index e22487c..b7cff37 100755
--- a/jenkins/upload_packages_testing_to_stable.sh
+++ b/jenkins/upload_packages_testing_to_stable.sh
@@ -46,7 +46,7 @@ PACKAGES_LIST=$(echo ${PACKAGES_TO_PUBLISH} | sed 's/versions://g; s/\([a-z-]*\)
 
 DISTROS=$(echo "${LSB_DISTRIB_CODENAMES}"|sed s/[[:space:]]/,/g |tr '[:upper:]' '[:lower:]')
 
-if ( echo ${LSB_DISTRIB_CODENAMES} |grep -q centos ); then
+if ( echo ${LSB_DISTRIB_CODENAMES} |grep -q -E '(centos|rocky)' ); then
   REPO_SERVER=${RPM_REPO_SERVER}
 else
   REPO_SERVER=${APT_REPO_SERVER}

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


hooks/post-receive
--