projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix default installer to make local cluster pull images from docker proxy
[osm/devops.git]
/
tools
/
gen-repo.sh
diff --git
a/tools/gen-repo.sh
b/tools/gen-repo.sh
index
24646d1
..
f5f586e
100755
(executable)
--- a/
tools/gen-repo.sh
+++ b/
tools/gen-repo.sh
@@
-52,7
+52,7
@@
function dump_vars() {
echo "BUILD_NUMBER: $BUILD_NUMBER"
}
echo "BUILD_NUMBER: $BUILD_NUMBER"
}
-MDG_REPOS="RO osmclient openvim SO UI IM devops MON N2VC NBI common POL PLA LW-UI NG-UI"
+MDG_REPOS="RO osmclient openvim SO UI IM devops MON N2VC NBI common POL PLA LW-UI NG-UI
NG-SA
"
IN_REPO="unstable"
OUT_REPO="stable"
GPGKEY=71C0472C
IN_REPO="unstable"
OUT_REPO="stable"
GPGKEY=71C0472C
@@
-122,10
+122,9
@@
dump_vars
[ -x $JFROG_CLI ] || FATAL "jfrog cli not found. Please install https://www.jfrog.com/getcli/ and use option '-j <jfrog cli location>'"
[ -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"
+$JFROG_CLI rt download
"osm-release/$BUILD_NUMBER/*"
|| FATAL "Failed to download"
-
-[ $PASSPHRASE_FILE ] && GPG_PASSPHRASE="--no-tty --no-use-agent --passphrase \"$(cat $PASSPHRASE_FILE)\""
+[ $PASSPHRASE_FILE ] && GPG_PASSPHRASE="--pinentry-mode=loopback --passphrase \"$(cat $PASSPHRASE_FILE)\""
mkdir -p $BASE_DIR/dists
mkdir -p $BASE_DIR/dists
@@
-154,10
+153,10
@@
apt-ftparchive release dists/$OUT_REPO > dists/$OUT_REPO/Release
#gzip -9fk dists/$OUT_REPO/Release
rm -f dists/$OUT_REPO/InRelease
#gzip -9fk dists/$OUT_REPO/Release
rm -f dists/$OUT_REPO/InRelease
-eval gpg $GPG_PASSPHRASE --
no-tty --
default-key $GPGKEY --clearsign -o dists/$OUT_REPO/InRelease dists/$OUT_REPO/Release
+eval gpg $GPG_PASSPHRASE --default-key $GPGKEY --clearsign -o dists/$OUT_REPO/InRelease dists/$OUT_REPO/Release
rm -f dists/$OUT_REPO/Release.gpg
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
+eval gpg $GPG_PASSPHRASE --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