projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make sure that the UI is installed from an OSM repo
[osm/devops.git]
/
tools
/
gen-repo.sh
diff --git
a/tools/gen-repo.sh
b/tools/gen-repo.sh
index
b7bb2f5
..
6fb2ad8
100755
(executable)
--- a/
tools/gen-repo.sh
+++ b/
tools/gen-repo.sh
@@
-33,6
+33,8
@@
function dump_vars() {
echo "RSYNC_USER_HOST $RSYNC_USER_HOST"
echo "RSYNC_OPTIONS $RSYNC_OPTIONS"
echo "PUBLIC_KEY_FILE $PUBLIC_KEY_FILE"
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"
}
IN_REPO="unstable"
@@
-87,17
+89,18
@@
while getopts ":p:i:o:k:j::d:b:r:h:R:P:" 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)\""
@@
-108,7
+111,7
@@
cp -R $BUILD_NUMBER/pool $BASE_DIR/
cd $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
# gpg sign the packages
dpkg-sig -g "$GPG_PASSPHRASE" -k $GPGKEY --sign builder pool/$i/*.deb