Change in osmo-ci[master]: contrib/obs-mirror: adjust includelist path

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/26623 )

Change subject: contrib/obs-mirror: adjust includelist path
......................................................................

contrib/obs-mirror: adjust includelist path

Point at obs-mirror-include.txt from this git repository.

Related: OS#4862
Change-Id: I4c6a6e424fd727de4e8058c916aa7eb43e7eb4b2
---
M contrib/obs-mirror/obs-mirror.sh
M contrib/obs-mirror/test-include-list.sh
2 files changed, 4 insertions(+), 2 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/contrib/obs-mirror/obs-mirror.sh b/contrib/obs-mirror/obs-mirror.sh
index 76317c4..8d25c2d 100755
--- a/contrib/obs-mirror/obs-mirror.sh
+++ b/contrib/obs-mirror/obs-mirror.sh
@@ -10,6 +10,7 @@
 # See also: OS#4862
 
 set -e -x
+SCRIPT_DIR="$(realpath "$(dirname "$(realpath "$0")")")"
 
 # base directory on the local side
 BASE_DIR="/downloads/obs-mirror/"
@@ -19,7 +20,7 @@
 cd "$BASE_DIR"
 
 RSYNC_ARGS="-av --delete"
-RSYNC_ARGS="$RSYNC_ARGS --files-from /home/pkgmirror/obs-mirror-include.txt --recursive"
+RSYNC_ARGS="$RSYNC_ARGS --files-from $SCRIPT_DIR/obs-mirror-include.txt --recursive"
 DATE=`date +%Y%m%d-%H%M%S`
 
 # create output directory
diff --git a/contrib/obs-mirror/test-include-list.sh b/contrib/obs-mirror/test-include-list.sh
index 6766403..829e8f7 100755
--- a/contrib/obs-mirror/test-include-list.sh
+++ b/contrib/obs-mirror/test-include-list.sh
@@ -1,4 +1,5 @@
 #!/bin/sh -ex
+SCRIPT_DIR="$(realpath "$(dirname "$(realpath "$0")")")"
 BASE_DIR="/downloads/obs-mirror/"
 
 cd "$BASE_DIR"
@@ -6,7 +7,7 @@
 rsync \
         -a \
         --list-only \
-        --files-from /home/pkgmirror/obs-mirror-include.txt \
+        --files-from "$SCRIPT_DIR"/obs-mirror-include.txt \
         --recursive \
         "$(realpath .previous)"/ \
         new-backup-dir/

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/26623
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I4c6a6e424fd727de4e8058c916aa7eb43e7eb4b2
Gerrit-Change-Number: 26623
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211220/2d39ded6/attachment.htm>