X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=tools%2Fgen-repo.sh;h=c7e7bc734c804b22782e9501117b975e3032a54a;hb=bdc3128ebdf5eca7aa8df63031319413594f0ac4;hp=480ca06fa8b78f3908dcbdf8834b48e24b01e8ec;hpb=c6d5275d9dabb1e751b03838d4bc015d379479ce;p=osm%2Fdevops.git

diff --git a/tools/gen-repo.sh b/tools/gen-repo.sh
index 480ca06f..c7e7bc73 100755
--- a/tools/gen-repo.sh
+++ b/tools/gen-repo.sh
@@ -13,6 +13,8 @@ function usage() {
     echo -e "  -r  <release dir>        "
     echo -e "  -h  <rsync user@host>    "
     echo -e "  -R  <rsync options>      "
+    echo -e "  -P  <public key file>    "
+    echo -e "  -c  <changelogfile>      "
     exit 1
 }
 
@@ -31,6 +33,9 @@ function dump_vars() {
     echo "BUILD:          $BUILD"
     echo "RSYNC_USER_HOST $RSYNC_USER_HOST"
     echo "RSYNC_OPTIONS   $RSYNC_OPTIONS"
+    echo "PUBLIC_KEY_FILE $PUBLIC_KEY_FILE"
+    echo "BUILD:          $BUILD"
+    echo "BUILD_NUMBER:   $BUILD_NUMBER"
 }
 
 IN_REPO="unstable"
@@ -41,8 +46,10 @@ REPO_BASE=repo
 RELEASE_DIR=ReleaseTWO
 RSYNC_USER_HOST=osmusers@osm-download.etsi.org
 CURR_DIR=$(pwd)
+PUBLIC_KEY_FILE=~/OSM\ ETSI\ Release\ Key.gpg
+CHANGE_LOG_FILE=
 
-while getopts ":p:i:o:k:j::d:b:r:h:R:" o; do
+while getopts ":p:i:o:k:j::d:b:r:h:R:P:c:" o; do
     case "${o}" in
         p)
             PASSPHRASE_FILE=${OPTARG}
@@ -74,6 +81,12 @@ while getopts ":p:i:o:k:j::d:b:r:h:R:" o; do
         R)
             RSYNC_OPTIONS=${OPTARG}
             ;;
+        P)
+            PUBLIC_KEY_FILE=${OPTARG}
+            ;;
+        c)
+            CHANGE_LOG_FILE=${OPTARG}
+            ;;
         *)
             usage
             exit 1
@@ -81,17 +94,18 @@ while getopts ":p:i:o:k:j::d:b:r:h:R:" o; do
     esac
 done
 
-dump_vars
-
 BASE_DIR=$REPO_BASE/osm/debian/$RELEASE_DIR
 
 [ -z "$BUILD" ] && FATAL "missing option: -b <build>"
 
+BUILD_NUMBER=$(echo "$BUILD" | sed -e 's/.*:: //g')
+
+dump_vars
+
 [ -x $JFROG_CLI ] || FATAL "jfrog cli not found. Please install https://www.jfrog.com/getcli/ and use option '-j <jfrog cli location>'"
 
 $JFROG_CLI rt download --build "$BUILD" osm-release || FATAL "Failed to download"
 
-BUILD_NUMBER=$(basename "$BUILD")
 
 [ $PASSPHRASE_FILE ] && GPG_PASSPHRASE="--no-tty --no-use-agent --passphrase \"$(cat $PASSPHRASE_FILE)\""
 
@@ -100,9 +114,12 @@ mkdir -p $BASE_DIR/dists
 cp -R $BUILD_NUMBER/dists/$IN_REPO $BASE_DIR/dists/$OUT_REPO
 cp -R $BUILD_NUMBER/pool $BASE_DIR/
 
+echo "copy changelog from $BUILD_NUMBER/changelog to $BASE_DIR/"
+cp -R $BUILD_NUMBER/changelog $BASE_DIR/
+
 cd $BASE_DIR
 
-for i in RO osmclient openvim SO UI; do
+for i in RO osmclient openvim SO UI IM; do
 
     # gpg sign the packages
     dpkg-sig -g "$GPG_PASSPHRASE" -k $GPGKEY --sign builder pool/$i/*.deb
@@ -124,8 +141,13 @@ eval gpg $GPG_PASSPHRASE --no-tty --default-key $GPGKEY --clearsign -o dists/$OU
 rm -f dists/$OUT_REPO/Release.gpg
 eval gpg $GPG_PASSPHRASE --no-tty --default-key $GPGKEY -abs -o dists/$OUT_REPO/Release.gpg dists/$OUT_REPO/Release
 
-
 echo "performing rsync of repo $RELEASE_DIR/dist/$OUT_REPO to osm-download.etsi.org:/repos/"
 cd $CURR_DIR/$REPO_BASE
 
+# copy over the public key file
+[ "$PUBLIC_KEY_FILE" ] && cp "$PUBLIC_KEY_FILE" osm/debian/$RELEASE_DIR
+
+# copy over the changelog file
+[ "$CHANGE_LOG_FILE" ] && cp "$CHANGE_LOG_FILE" osm/debian/$RELEASE_DIR
+
 rsync -avR $RSYNC_OPTIONS osm/debian/$RELEASE_DIR rsync://$RSYNC_USER_HOST/repos