From: David Galloway <dgallowa@redhat.com>
Date: Thu, 11 Aug 2022 01:04:54 +0000 (-0400)
Subject: scripts: Update signing scripts for el9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=56bc1a288fe998de33d6bd3758493a76ae998e7f;p=ceph-build.git

scripts: Update signing scripts for el9

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/scripts/sign-rpms b/scripts/sign-rpms
index 8b9ee559..d7f0f7c3 100644
--- a/scripts/sign-rpms
+++ b/scripts/sign-rpms
@@ -32,7 +32,7 @@ distros=( centos rhel )
 
 # Although upstream these might be "el7" or "el8", we just use these since they
 # are the same values used by the build system.
-distro_versions=( 7 8 )
+distro_versions=( 7 8 9 )
 
 # To unlock the gpg keys for the current run, it is requested over STDIN as
 # a password and later passed into GPG directly as a variable.
diff --git a/scripts/sync-pull b/scripts/sync-pull
index c2d436f7..6056b6c1 100644
--- a/scripts/sync-pull
+++ b/scripts/sync-pull
@@ -27,7 +27,7 @@ echo "Found the most packages ($current_highest_count) in $highest_combo."
 # Check the the DEB and RPM chacra endpoints to see if the repos are or need updating.
 # This helps prevent packages from getting missed when signing and pushing.
 need_rerun=false
-for endpoint in https://chacra.ceph.com/repos/$project/$release/$sha1/$highest_combo https://chacra.ceph.com/repos/$project/$release/$sha1/centos/{7,8}; do
+for endpoint in https://chacra.ceph.com/repos/$project/$release/$sha1/$highest_combo https://chacra.ceph.com/repos/$project/$release/$sha1/centos/{7,8,9}; do
   chacra_repo_status=$(curl -s -L $endpoint)
   # python is only used here because jq isn't installed on the signer box
   chacra_needs_update=$(echo $chacra_repo_status | python -mjson.tool | grep needs_update | awk '{ print $2 }' | sed 's/,$//')
@@ -46,7 +46,7 @@ else
   newgen=true
   # Get numerical version number (we only need this with Octopus or later because of the new directory/path scheme).
   version=$(echo $chacra_repo_status | python -mjson.tool | grep \"version\" | awk '{ print $2 }' | sed 's/"//g')
-  [[ -d /opt/repos/$project/$release-$version ]] | mkdir -p /opt/repos/$project/$release-$version/{debian/jessie,centos/{7,8}}
+  [[ -d /opt/repos/$project/$release-$version ]] | mkdir -p /opt/repos/$project/$release-$version/{debian/jessie,centos/{7,8,9}}
 fi
 
 # Replace $highest_combo with your own DISTRO/VERSION if you don't want to sync from the repo with the most packages.
@@ -59,7 +59,7 @@ echo $deb_cmd
 echo "--------------------------------------------"
 rsync -Lavh -e 'ssh -p 2222' --progress --exclude '*lockfile*' $deb_cmd
 
-for el_version in 7 8; do
+for el_version in 7 8 9; do
   if $newgen; then
     el_cmd="ubuntu@chacra.ceph.com:/opt/repos/$project/$release/$sha1/centos/$el_version/flavors/default/* /opt/repos/$project/$release-$version/centos/$el_version/"
   else
diff --git a/scripts/sync-push b/scripts/sync-push
index 7e68fb6b..5ef48919 100644
--- a/scripts/sync-push
+++ b/scripts/sync-push
@@ -34,7 +34,7 @@ ceph_sync() {
     fi
     rsync --progress --exclude '*lockfile*' -avr $deb_cmd
 
-    for el_version in 7 8; do
+    for el_version in 7 8 9; do
       if $newgen; then
         ssh signer@download.ceph.com "mkdir -p /data/download.ceph.com/www/rpm-$version/el$el_version"