diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-09 22:26:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-09 22:26:24 +0000 |
| commit | 031b17226a6a8c91246828764fe74da7c5d364d2 (patch) | |
| tree | f86ede6ddacbc5a5140e9267c1385d9e152a6528 | |
| parent | 9b7b4bbec1a9bc8a48e78392877807db13300bb0 (diff) | |
| parent | a7ba77fa898092bdc6d423391e9478260d476f4c (diff) | |
| download | kolla-031b17226a6a8c91246828764fe74da7c5d364d2.tar.gz kolla-031b17226a6a8c91246828764fe74da7c5d364d2.zip | |
Merge "CentOS 8: Build bifrost image"
| -rw-r--r-- | .zuul.d/centos.yaml | 5 | ||||
| -rwxr-xr-x | kolla/image/build.py | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index ffe077501..1d7743ec9 100644 --- a/.zuul.d/centos.yaml +++ b/.zuul.d/centos.yaml @@ -16,9 +16,8 @@ - ^requirements.txt$ - ^setup.cfg$ - ^setup.py$ - # FIXME(mgoddard): Bifrost deploy jobs not yet passing. - # - kolla-ansible-centos8-source-bifrost: - # files: ^docker\/(base|bifrost|openstack-base)\/.* + - kolla-ansible-centos8-source-bifrost: + files: ^docker\/(base|bifrost|openstack-base)\/.* # Test rabbitmq & mariadb changes in multinode ceph jobs. - kolla-ansible-centos8-source-zun: files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.* diff --git a/kolla/image/build.py b/kolla/image/build.py index 0eddc36d2..f7906dce5 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -154,7 +154,6 @@ UNBUILDABLE_IMAGES = { }, 'centos8+source': { - "bifrost-base", # Bifrost does not support CentOS 8 "cyborg-agent", # opae-sdk does not support CentOS 8 "freezer-base", # Missing package trickle "masakari-monitors", # Missing hacluster repo |