From: Adam Kraitman <akraitma@redhat.com>
Date: Sun, 22 Aug 2021 12:23:18 +0000 (+0300)
Subject: Changed the folder name used in the signer box
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=80410f52be9853aec529794797864fb5a5ba37b9;p=ceph-build.git

Changed the folder name used in the signer box

Signed-off-by: Adam Kraitman <akraitma@redhat.com>
---

diff --git a/scripts/nfs-ganesha/pull-sign-push b/scripts/nfs-ganesha/pull-sign-push
index 664f2e7c..f891748a 100644
--- a/scripts/nfs-ganesha/pull-sign-push
+++ b/scripts/nfs-ganesha/pull-sign-push
@@ -7,20 +7,20 @@ today_items=$(ssh ubuntu@chacra.ceph.com 'find /opt/repos/nfs-ganesha-stable -ne
 if [ -n "$today_items" ]; then
 echo "pulling nfs-ganesha packages from chacra"
 echo "********************************************"
-[[ -d /opt/new-repos/ ]] | mkdir -p /opt/new-repos/
+[[ -d /opt/nfs-ganesha/new-repos/ ]] | mkdir -p /opt/nfs-ganesha/new-repos/
   for item in $today_items; do
-   sync_cmd="ubuntu@chacra.ceph.com:$item /opt/new-repos/"
+   sync_cmd="ubuntu@chacra.ceph.com:$item /opt/nfs-ganesha/new-repos/"
    rsync -Lavh --progress --relative $sync_cmd
   done
 
   # sign the rpm's that wore pulled today
 
 echo "signing rpms"
-bash ./sign-rpms-auto
+bash /home/ubuntu/ceph-build/scripts/nfs-ganesha/sign-rpms-auto
 
   # syncing the singed rpm's to download.ceph.com
 
 echo "pushing rpms to download.ceph.com"
-bash ./sync-push-auto
+bash /home/ubuntu/ceph-build/scripts/nfs-ganesha/sync-push-auto
 
 fi
diff --git a/scripts/nfs-ganesha/sign-rpm-auto b/scripts/nfs-ganesha/sign-rpm-auto
index 226bdda0..d034ab5f 100644
--- a/scripts/nfs-ganesha/sign-rpm-auto
+++ b/scripts/nfs-ganesha/sign-rpm-auto
@@ -5,7 +5,7 @@
 keyid=460F3994
 GPG_PASSPHRASE=''
 
-path="/opt/new-repos/"
+path="/opt/nfs-ganesha/new-repos/"
 echo $path
 update_repo=0
 cd $path
@@ -38,7 +38,7 @@ if [[ $update_repo -eq 1 ]]; then
 fi
 
 # finally, update the repo metadata
-repodirs=$( find /opt/new-repos/ -type d -name x86_64 | cut -d/ -f 13 --complement )
+repodirs=$( find /opt/nfs-ganesha/new-repos/ -type d -name x86_64 | cut -d/ -f 13 --complement )
 if [ -n "$repodirs" ]; then
   for directory in $repodirs
   do
diff --git a/scripts/nfs-ganesha/sync-push-auto b/scripts/nfs-ganesha/sync-push-auto
index e6702bee..d8871511 100644
--- a/scripts/nfs-ganesha/sync-push-auto
+++ b/scripts/nfs-ganesha/sync-push-auto
@@ -5,7 +5,7 @@
 releases=( V3.5 V2.7 )
 ceph_version=( octopus ceph_pacific )
 
-repodirs=$( find /opt/new-repos/ -type d -name x86_64 | cut -d/ -f 13 --complement )
+repodirs=$( find /opt/nfs-ganesha/new-repos/ -type d -name x86_64 | cut -d/ -f 13 --complement )
 for dir in "$repodirs"; do
    for i in "${releases[@]}"; do
       for v in "${ceph_version[@]}"; do
@@ -14,8 +14,8 @@ for dir in "$repodirs"; do
        if [ $find_release == '1' ] && [ $find_version == '1' ]; then
            release=$i
            version=$v
-           ssh signer@download.ceph.com "mkdir -p /data/download.ceph.com/www/nfs-ganesha-new/rpm-$release-stable/$version/el8" && el8_cmd="$dir/* signer@download.ceph.com:/data/download.ceph.com/www/nfs-ganesha-new/rpm-$release-stable/$version/el8" &&  rsync --progress -avr $el8_cmd
-           rm -rf /opt/new-repos/*
+           ssh signer@download.ceph.com "mkdir -p /data/download.ceph.com/www/nfs-ganesha/rpm-$release-stable/$version/el8" && el8_cmd="$dir/* signer@download.ceph.com:/data/download.ceph.com/www/nfs-ganesha/rpm-$release-stable/$version/el8" &&  rsync --progress -avr $el8_cmd
+           rm -rf /opt/nfs-ganesha/new-repos/*
        fi
       done
    done