diff options
| author | Zuul <zuul@review.opendev.org> | 2022-07-01 09:36:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-07-01 09:36:30 +0000 |
| commit | ea5d95d3f26c5d95a8084d59233692ce9cdd65f3 (patch) | |
| tree | 5b187bc0dd047f33215a71ba424ec6877de274aa | |
| parent | 5f94e53bea9fb81786595cb8b452879afe436e26 (diff) | |
| parent | ad7b9054ca5ebc53031a10dc3f03675c88845b11 (diff) | |
| download | kolla-ea5d95d3f26c5d95a8084d59233692ce9cdd65f3.tar.gz kolla-ea5d95d3f26c5d95a8084d59233692ce9cdd65f3.zip | |
Merge "Change kolla_version LABEL to git sha-1"
| -rwxr-xr-x | kolla/image/build.py | 3 | ||||
| -rw-r--r-- | kolla/version.py | 5 | ||||
| -rw-r--r-- | releasenotes/notes/add-kolla-git-commit-label-aab06fb8c8df1873.yaml | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 5139e4ab2..4390af9b9 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -816,7 +816,8 @@ class KollaWorker(object): return ret def create_dockerfiles(self): - kolla_version = version.version_info.cached_version_string() + kolla_version = version.git_info if len(version.git_info) != 0 else \ + version.version_info.cached_version_string() supported_distro_name = common_config.DISTRO_PRETTY_NAME.get( self.base) for path in self.docker_build_paths: diff --git a/kolla/version.py b/kolla/version.py index 4430b70c5..edd74a8fb 100644 --- a/kolla/version.py +++ b/kolla/version.py @@ -10,6 +10,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +import os +import pbr.git import pbr.version +kolla_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + version_info = pbr.version.VersionInfo('kolla') +git_info = pbr.git.get_git_short_sha(git_dir=os.path.join(kolla_path, ".git")) diff --git a/releasenotes/notes/add-kolla-git-commit-label-aab06fb8c8df1873.yaml b/releasenotes/notes/add-kolla-git-commit-label-aab06fb8c8df1873.yaml new file mode 100644 index 000000000..9e38d5d5a --- /dev/null +++ b/releasenotes/notes/add-kolla-git-commit-label-aab06fb8c8df1873.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Change ``kolla_version`` label to git sha-1 if images + are built with kolla from git. |