Option to override version length in convert_version.py
Fuel projects use release segment consisting of 2 components rather than 3. So for example 10.0.0b1 will be released as 10.0. This patch adds option to convert_version.py to define number of components in release segment. It also adds a list of fuel projects and overrides version list for them during build. Change-Id: I0b519e620ee0e7f3173b126e9e6c9766d87cea4e
This commit is contained in:
parent
9e271728b3
commit
149396710c
@ -38,8 +38,14 @@ main () {
|
|||||||
# Deal with PyPi versions like 2015.1.0rc1
|
# Deal with PyPi versions like 2015.1.0rc1
|
||||||
# It breaks version comparison
|
# It breaks version comparison
|
||||||
# Change it to 2015.1.0~rc1
|
# Change it to 2015.1.0~rc1
|
||||||
local convert_version_py="$(dirname $(readlink -e $0))/convert_version.py"
|
local script_dir=$(dirname $(readlink -e $0))
|
||||||
version=$(python ${convert_version_py} --tag ${release_tag})
|
local convert_version_py="$script_dir/convert_version.py"
|
||||||
|
if grep -qE "^${SRC_PROJECT}\$" "$script_dir/fuel-projects-list"
|
||||||
|
then
|
||||||
|
local version_length=2
|
||||||
|
fi
|
||||||
|
version=$(python ${convert_version_py} --tag ${release_tag} \
|
||||||
|
${version_length:+ -l $version_length})
|
||||||
if [ "${version}" != "${pkg_version}" ] ; then
|
if [ "${version}" != "${pkg_version}" ] ; then
|
||||||
echo -e "ERROR: Version mismatch. Latest version from Gerrit tag: $version, and from changelog: $pkg_version. Build aborted."
|
echo -e "ERROR: Version mismatch. Latest version from Gerrit tag: $version, and from changelog: $pkg_version. Build aborted."
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -44,8 +44,14 @@ This package provides the %{-n*} kernel modules
|
|||||||
# Deal with PyPi versions like 2015.1.0rc1
|
# Deal with PyPi versions like 2015.1.0rc1
|
||||||
# It breaks version comparison
|
# It breaks version comparison
|
||||||
# Change it to 2015.1.0~rc1
|
# Change it to 2015.1.0~rc1
|
||||||
local convert_version_py="$(dirname $(readlink -e $0))/convert_version.py"
|
local script_dir=$(dirname $(readlink -e $0))
|
||||||
version=$(python ${convert_version_py} --tag ${release_tag})
|
local convert_version_py="$script_dir/convert_version.py"
|
||||||
|
if grep -qE "^${SRC_PROJECT}\$" "$script_dir/fuel-projects-list"
|
||||||
|
then
|
||||||
|
local version_length=2
|
||||||
|
fi
|
||||||
|
version=$(python ${convert_version_py} --tag ${release_tag} \
|
||||||
|
${version_length:+ -l $version_length})
|
||||||
if [ "${version}" != "${pkg_version}" ] ; then
|
if [ "${version}" != "${pkg_version}" ] ; then
|
||||||
echo -e "ERROR: Version mismatch. Latest version from Gerrit tag: $version, and from changelog: $pkg_version. Build aborted."
|
echo -e "ERROR: Version mismatch. Latest version from Gerrit tag: $version, and from changelog: $pkg_version. Build aborted."
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -24,15 +24,17 @@ def main():
|
|||||||
'-t', '--tag', dest='tag', action='store', type=str,
|
'-t', '--tag', dest='tag', action='store', type=str,
|
||||||
help='PyPi version tag', required=True, default='0'
|
help='PyPi version tag', required=True, default='0'
|
||||||
)
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
'-l', '--version-length', type=int, default=3,
|
||||||
|
help="Number of version components"
|
||||||
|
)
|
||||||
|
|
||||||
params, other_params = parser.parse_known_args()
|
params, other_params = parser.parse_known_args()
|
||||||
|
|
||||||
pip_ver = params.tag
|
print(convert_version(params.tag, params.version_length))
|
||||||
|
|
||||||
print(convert_version(pip_ver))
|
|
||||||
|
|
||||||
|
|
||||||
def convert_version(pip_ver):
|
def convert_version(pip_ver, version_length):
|
||||||
# drop dashed part from version string because
|
# drop dashed part from version string because
|
||||||
# it represents a patch level of given version
|
# it represents a patch level of given version
|
||||||
pip_ver = pip_ver.split('-')[0]
|
pip_ver = pip_ver.split('-')[0]
|
||||||
@ -68,7 +70,7 @@ def convert_version(pip_ver):
|
|||||||
pkg_alpha = pkg_alpha.replace('@', 'dev')
|
pkg_alpha = pkg_alpha.replace('@', 'dev')
|
||||||
|
|
||||||
# expand version to three items
|
# expand version to three items
|
||||||
while (len(pkg_ver_part) < 3):
|
while (len(pkg_ver_part) < version_length):
|
||||||
pkg_ver_part.append('0')
|
pkg_ver_part.append('0')
|
||||||
|
|
||||||
return '.'.join(pkg_ver_part) + pkg_alpha + '.'.join(pkg_rev_part)
|
return '.'.join(pkg_ver_part) + pkg_alpha + '.'.join(pkg_rev_part)
|
||||||
|
12
perestroika/fuel-projects-list
Normal file
12
perestroika/fuel-projects-list
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
fuel-agent
|
||||||
|
fuel-astute
|
||||||
|
fuel-library
|
||||||
|
fuel-main
|
||||||
|
fuel-menu
|
||||||
|
fuel-nailgun-agent
|
||||||
|
fuel-octane
|
||||||
|
fuel-ostf
|
||||||
|
fuel-ui
|
||||||
|
fuel-web
|
||||||
|
network-checker
|
||||||
|
shotgun
|
Loading…
Reference in New Issue
Block a user