From b08f8e54ded658e5ff250873956d7411d38ce919 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 28 Nov 2017 15:15:23 +0100 Subject: [PATCH] Fixed LXD image generation Change-Id: Ia77f6af50a726ebb50dc0432c2ef7189735980d6 Signed-off-by: garciadeblas --- tools/gen-lxdimages.sh | 11 ++++++----- tools/update.sh | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/gen-lxdimages.sh b/tools/gen-lxdimages.sh index 10c59b9a..0ad99659 100755 --- a/tools/gen-lxdimages.sh +++ b/tools/gen-lxdimages.sh @@ -67,19 +67,20 @@ echo "Exporting images as targz" TEMPDIR="$(mktemp -d -q --tmpdir "osmlxd.XXXXXX")" trap 'rm -rf "$TEMPDIR"' EXIT RELEASE_DIR="${TEMPDIR}/${RELEASE}" +mkdir -p ${RELEASE_DIR} [ -n "$GEN_RO" ] && lxc image export ${OSM_RO_IMAGE} $RELEASE_DIR/${OSM_RO_IMAGE} [ -n "$GEN_VCA" ] && lxc image export ${OSM_VCA_IMAGE} $RELEASE_DIR/${OSM_VCA_IMAGE} [ -n "$GEN_SOUI" ] && lxc image export ${OSM_SOUI_IMAGE} $RELEASE_DIR/${OSM_SOUI_IMAGE} #[ -n "$GEN_MON" ] && lxc image export ${OSM_MON_IMAGE} $RELEASE_DIR/${OSM_MON_IMAGE} -[ -n "$GEN_RO" ] && chmod +r $RELEASE_DIR/${OSM_RO_IMAGE} -[ -n "$GEN_VCA" ] && chmod +r $RELEASE_DIR/${OSM_VCA_IMAGE} -[ -n "$GEN_SOUI" ] && chmod +r $RELEASE_DIR/${OSM_SOUI_IMAGE} -#[ -n "$GEN_MON" ] && chmod +r $RELEASE_DIR/${OSM_MON_IMAGE} +[ -n "$GEN_RO" ] && chmod +r $RELEASE_DIR/${OSM_RO_IMAGE}.tar.gz +[ -n "$GEN_VCA" ] && chmod +r $RELEASE_DIR/${OSM_VCA_IMAGE}.tar.gz +[ -n "$GEN_SOUI" ] && chmod +r $RELEASE_DIR/${OSM_SOUI_IMAGE}.tar.gz +#[ -n "$GEN_MON" ] && chmod +r $RELEASE_DIR/${OSM_MON_IMAGE}.tar.gz echo "Pushing images to ETSI FTP server" RSYNC_USER_HOST=osmusers@osm-download.etsi.org -RSYNC_OPTIONS="--delete --password-file rsync.pass" +RSYNC_OPTIONS="--delete --progress" cd $TEMPDIR && rsync -avR $RSYNC_OPTIONS $RELEASE rsync://$RSYNC_USER_HOST/repos/osm/lxd diff --git a/tools/update.sh b/tools/update.sh index 79602266..8aa2886a 100755 --- a/tools/update.sh +++ b/tools/update.sh @@ -9,7 +9,7 @@ if [ $# -ge 2 ]; then BRANCH=$2 fi -modules="juju-charms devops descriptor-packages openvim RO SO UI osmclient" +modules="juju-charms devops descriptor-packages openvim RO SO UI osmclient IM N2VC MON vim-emu" list="" for i in $modules; do if [ "$1" == "$i" -o "$1" == "all" ]; then -- 2.25.1