X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=tools%2Fgen-lxdimages.sh;h=80d7ec42cc76a533fd8390ca65d920147644c64f;hb=9a51086452eaf7ee39c485246c7bcc4a4481efae;hp=10c59b9a80e2cc3871d2a080f1bbb5443ae1f778;hpb=cb43020cbf757bfd2fa2bd0291224ca8bcf99f64;p=osm%2Fdevops.git

diff --git a/tools/gen-lxdimages.sh b/tools/gen-lxdimages.sh
index 10c59b9a..80d7ec42 100755
--- a/tools/gen-lxdimages.sh
+++ b/tools/gen-lxdimages.sh
@@ -64,22 +64,18 @@ OSM_MON_IMAGE="osm-mon"
 #[ -n "$GEN_MON" ] && lxc image copy ${OSM_MON_IMAGE} remote:
 
 echo "Exporting images as targz"
-TEMPDIR="$(mktemp -d -q --tmpdir "osmlxd.XXXXXX")"
-trap 'rm -rf "$TEMPDIR"' EXIT
-RELEASE_DIR="${TEMPDIR}/${RELEASE}"
+mkdir -p "${RELEASE}"
+#trap 'rm -rf "$RELEASE"' EXIT
 
-[ -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" ] && lxc image export "${OSM_RO_IMAGE}" "${RELEASE}"/"${OSM_RO_IMAGE}" || echo "Failed to export RO"
+[ -n "$GEN_VCA" ] && lxc image export "${OSM_VCA_IMAGE}" "${RELEASE}"/"${OSM_VCA_IMAGE}" || echo "Failed to export VCA"
+[ -n "$GEN_SOUI" ] && lxc image export "${OSM_SOUI_IMAGE}" "${RELEASE}"/"${OSM_SOUI_IMAGE}" || echo "Failed to export SOUI"
+#[ -n "$GEN_MON" ] && lxc image export "${OSM_MON_IMAGE}" "${RELEASE}"/"${OSM_MON_IMAGE}" || echo "Failed to export MON"
+chmod 664 "${RELEASE}"/*.tar.gz
 
 echo "Pushing images to ETSI FTP server"
 RSYNC_USER_HOST=osmusers@osm-download.etsi.org
-RSYNC_OPTIONS="--delete --password-file rsync.pass"
-cd $TEMPDIR && rsync -avR $RSYNC_OPTIONS $RELEASE rsync://$RSYNC_USER_HOST/repos/osm/lxd
+RSYNC_OPTIONS="--delete --progress --password-file rsync.pass"
+rsync -avR "$RSYNC_OPTIONS" "$RELEASE" rsync://$RSYNC_USER_HOST/repos/osm/lxd