openstack/charm-ceph-iscsi
Code Issues Proposed changes

Merge pull request #15 from gnuoy/set-pbr-version-for-builds

Browse Source 
Set PBR_VERSION for updates and pinned builds
This commit is contained in:
Frode Nordahl 2020-06-30 13:13:48 +02:00 committed by GitHub
commit 7569f3e598
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
charm-init.sh
View File

@ -9,6 +9,11 @@ done
git submodule update --init git submodule update --init
# pbr seems unable to detect the current tag when installing
# from a local checkout using a git submodule. To work around this
# manually set the version.
export PBR_VERSION=$(cd mod/charm-helpers; git describe --tags)
if [[ -z "$UPDATE" ]]; then if [[ -z "$UPDATE" ]]; then
pip install -t lib -r build-requirements.txt pip install -t lib -r build-requirements.txt
else else
@ -17,10 +22,6 @@ else
git -C mod/ops-interface-ceph-client pull origin master git -C mod/ops-interface-ceph-client pull origin master
git -C mod/ops-interface-tls-certificates pull origin master git -C mod/ops-interface-tls-certificates pull origin master
git -C mod/charm-helpers pull origin master git -C mod/charm-helpers pull origin master
# pbr seems unable to detect the current tag when installing
# from a local checkout using a git submodule. To work around this
# manually set the version.
export PBR_VERSION=$(cd mod/charm-helpers; git describe --tags)
pip install -t lib -r build-requirements.txt --upgrade pip install -t lib -r build-requirements.txt --upgrade
fi fi