Bug 1878 Speed up Artifactory search

[osm/devops.git] / devops-stages / stage-archive.sh

diff --git a/devops-stages/stage-archive.sh b/devops-stages/stage-archive.sh
index 593860b..cbbc237 100755 (executable)
--- a/devops-stages/stage-archive.sh
+++ b/devops-stages/stage-archive.sh
@@ -14,13 +14,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-PKG_DIRECTORIES="jenkins installers systest juju-charms descriptor-packages tools"
+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
@@ -39,11 +39,13 @@ for dir in $PKG_DIRECTORIES; do
     ln -s $PWD/$dir $PKG_DIR/.
     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