diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2022-05-18 09:40:18 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2022-05-18 08:05:08 +0000 |
| commit | 0e3b29c5fdfccd80a8951f38f015103359d24783 (patch) | |
| tree | 17a5a5742dbc2356379b25399f18ab7e224ce1ed /kolla | |
| parent | 9edcdb0a7ab57764b6e8622e5a75d4a1ecce2515 (diff) | |
| download | kolla-0e3b29c5fdfccd80a8951f38f015103359d24783.tar.gz kolla-0e3b29c5fdfccd80a8951f38f015103359d24783.zip | |
[bifrost] Force Bifrost to use the correct git branch
Bifrost decides on the branches to use by itself.
Early in the cycle, they are often not set correctly and may
break our CI.
This patch ensures we force Bifrost to use the expected branches,
making us independent of Bifrost getting fixed.
Change-Id: I33dbca927062284fd7a06ab6db732dd5e2219c40
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/image/build.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index a186ba4b8..1a28a2695 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -618,6 +618,8 @@ class KollaWorker(object): self.debian_arch = 'amd64' self.images = list() self.openstack_release = conf.openstack_release + self.openstack_branch = conf.openstack_branch + self.openstack_branch_slashed = conf.openstack_branch_slashed self.docker_healthchecks = conf.docker_healthchecks rpm_setup_config = ([repo_file for repo_file in conf.rpm_setup_config if repo_file is not None]) @@ -837,6 +839,9 @@ class KollaWorker(object): 'image_prefix': self.image_prefix, 'namespace': self.namespace, 'openstack_release': self.openstack_release, + 'openstack_branch': self.openstack_branch, + 'openstack_branch_slashed': + self.openstack_branch_slashed, 'tag': self.tag, 'maintainer': self.maintainer, 'kolla_version': kolla_version, |