projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing cloud-config file in hackfest_simplecharm_vnf
[osm/devops.git]
/
tools
/
gen-repo.sh
diff --git
a/tools/gen-repo.sh
b/tools/gen-repo.sh
index
480ca06
..
e0d1a66
100755
(executable)
--- a/
tools/gen-repo.sh
+++ b/
tools/gen-repo.sh
@@
-13,6
+13,9
@@
function usage() {
echo -e " -r <release dir> "
echo -e " -h <rsync user@host> "
echo -e " -R <rsync options> "
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> "
+ echo -e " -m <MDG repos> "
exit 1
}
exit 1
}
@@
-31,8
+34,12
@@
function dump_vars() {
echo "BUILD: $BUILD"
echo "RSYNC_USER_HOST $RSYNC_USER_HOST"
echo "RSYNC_OPTIONS $RSYNC_OPTIONS"
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"
}
}
+MDG_REPOS="RO osmclient openvim SO UI IM devops MON N2VC NBI common"
IN_REPO="unstable"
OUT_REPO="stable"
GPGKEY=71C0472C
IN_REPO="unstable"
OUT_REPO="stable"
GPGKEY=71C0472C
@@
-41,8
+48,10
@@
REPO_BASE=repo
RELEASE_DIR=ReleaseTWO
RSYNC_USER_HOST=osmusers@osm-download.etsi.org
CURR_DIR=$(pwd)
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:m:
" o; do
case "${o}" in
p)
PASSPHRASE_FILE=${OPTARG}
case "${o}" in
p)
PASSPHRASE_FILE=${OPTARG}
@@
-74,6
+83,15
@@
while getopts ":p:i:o:k:j::d:b:r:h:R:" o; do
R)
RSYNC_OPTIONS=${OPTARG}
;;
R)
RSYNC_OPTIONS=${OPTARG}
;;
+ P)
+ PUBLIC_KEY_FILE=${OPTARG}
+ ;;
+ c)
+ CHANGE_LOG_FILE=${OPTARG}
+ ;;
+ m)
+ MDG_REPOS=${OPTARG}
+ ;;
*)
usage
exit 1
*)
usage
exit 1
@@
-81,17
+99,18
@@
while getopts ":p:i:o:k:j::d:b:r:h:R:" o; do
esac
done
esac
done
-dump_vars
-
BASE_DIR=$REPO_BASE/osm/debian/$RELEASE_DIR
[ -z "$BUILD" ] && FATAL "missing option: -b <build>"
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"
[ -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)\""
[ $PASSPHRASE_FILE ] && GPG_PASSPHRASE="--no-tty --no-use-agent --passphrase \"$(cat $PASSPHRASE_FILE)\""
@@
-100,9
+119,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/
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
cd $BASE_DIR
-for i in
RO osmclient openvim SO UI
; do
+for i in
$MDG_REPOS
; do
# gpg sign the packages
dpkg-sig -g "$GPG_PASSPHRASE" -k $GPGKEY --sign builder pool/$i/*.deb
# gpg sign the packages
dpkg-sig -g "$GPG_PASSPHRASE" -k $GPGKEY --sign builder pool/$i/*.deb
@@
-124,8
+146,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
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
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
rsync -avR $RSYNC_OPTIONS osm/debian/$RELEASE_DIR rsync://$RSYNC_USER_HOST/repos