[plugin] Change versioning scheme for plugins flow

- Use `.dev` instead of `+dev` in version string because of pbr
     failures
   - Use `git archive` for pristine tarball generation

Change-Id: I437ee18b03c39483c4ed325e49846513d9443917
This commit is contained in:
Dmitry Burmistrov 2016-08-16 17:52:05 +03:00
parent bd8107a598
commit 3abbdda97a
1 changed files with 7 additions and 2 deletions

View File

@ -66,7 +66,7 @@ main () {
&& _rev=$(get_extra_revision security ${_srcpath} ${release_tag})
if [ "$IS_PLUGIN" = "true" ]
then
version=${version}+dev${_rev}
version=${version}.dev${_rev}
local release=$(dpkg-parsechangelog --show-field Version -l${_debianpath}/debian/changelog | awk -F'-' '{print $NF}')
local ditribution_string=$(dpkg-parsechangelog --show-field Distribution -l${_debianpath}/debian/changelog)
else
@ -90,7 +90,12 @@ main () {
# Prepare source tarball
pushd $_srcpath &>/dev/null
local ignore_list="rally horizon-vendor-theme fuel-astute fuel-library fuel-main fuel-nailgun-agent fuel-ui fuel-web fuel-agent"
if [ $(echo $ignore_list | grep -Eo "(^| )$PACKAGENAME( |$)") ]; then
if [ "$IS_PLUGIN" = "true" ]
then
git -C ${_srcpath} archive --format tar.gz \
--prefix "${srcpackagename}-${version}/" \
--worktree-attributes -o ${BUILDDIR}/${TAR_NAME} HEAD
elif [ $(echo $ignore_list | grep -Eo "(^| )$PACKAGENAME( |$)") ]; then
# Do not perform `setup.py sdist` for rally packages
tar -czf ${BUILDDIR}/$TAR_NAME $EXCLUDES .
else