X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=devops-stages%2Fstage-archive.sh;h=cbbc237c6b916270faaf10083fa512ef96815b60;hb=3c3ea19446f994a4b1e97b3ef10a1062a2e3ad21;hp=e87b36f7e64a16b64b53076d72832a9db7a2d468;hpb=a7481785e22f0f0381f1603166dbbbf894bccc78;p=osm%2Fdevops.git

diff --git a/devops-stages/stage-archive.sh b/devops-stages/stage-archive.sh
index e87b36f7..cbbc237c 100755
--- a/devops-stages/stage-archive.sh
+++ b/devops-stages/stage-archive.sh
@@ -14,36 +14,38 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-PKG_DIRECTORIES="jenkins installers systest juju-charms descriptor-packages tools"
-MDG_NAME=osm-devops
-DEB_INSTALL=debian/$MDG_NAME.install
+PKG_DIRECTORIES="common jenkins installers systest charms descriptor-packages tools docker robot-systest"
+MDG_NAME=devops
+DEB_INSTALL=debian/osm-$MDG_NAME.install
 export DEBEMAIL="mmarchetti@sandvine.com"
 export DEBFULLNAME="Michael Marchetti"
 
-PKG_VERSION=$(git describe --tags --abbrev=0)
+PKG_VERSION=$(git describe --match "v*" --tags --abbrev=0)
 PKG_VERSION_PREFIX=$(echo $PKG_VERSION | sed -e 's/v//g')
 PKG_VERSION_POST=$(git rev-list $PKG_VERSION..HEAD | wc -l)
 if [ "$PKG_VERSION_POST" -eq 0 ]; then
-    PKG_DIR="${MDG_NAME}-${PKG_VERSION_PREFIX}"
+    PKG_DIR="osm-${MDG_NAME}-${PKG_VERSION_PREFIX}"
 else
-    PKG_DIR="${MDG_NAME}-$PKG_VERSION_PREFIX.post${PKG_VERSION_POST}"
+    PKG_DIR="osm-${MDG_NAME}-$PKG_VERSION_PREFIX.post${PKG_VERSION_POST}"
 fi
 
 rm -rf $PKG_DIR
 rm -f *.orig.tar.xz
 rm -f *.deb
-rm $DEB_INSTALL
+rm -f $DEB_INSTALL
 mkdir -p $PKG_DIR
 
 for dir in $PKG_DIRECTORIES; do
     ln -s $PWD/$dir $PKG_DIR/.
-    echo "$dir/* usr/share/$MDG_NAME/$dir" >> $DEB_INSTALL
+    echo "$dir/* usr/share/osm-$MDG_NAME/$dir" >> $DEB_INSTALL
 done
+cp LICENSE $PKG_DIR/.
+echo "LICENSE usr/share/osm-$MDG_NAME" >> $DEB_INSTALL
 cp -R debian $PKG_DIR/.
 
 cd $PKG_DIR
 dh_make -y --indep --createorig --a -c apache
-dpkg-buildpackage -uc -us -tc -rfakeroot 
+dpkg-buildpackage -uc -us -tc -rfakeroot
 cd -
 
 rm -rf pool