diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-04-21 19:41:45 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-04-26 20:01:28 +0200 |
| commit | e0f8cbc50cf7184930a501b0f5452a64f523cd6f (patch) | |
| tree | 1e8f1999a33fc5259eb4a249c16b6f8f4b222d45 /kolla | |
| parent | af17cc180e40cc19fb08fb3186de43d5a6c7d83d (diff) | |
| download | kolla-e0f8cbc50cf7184930a501b0f5452a64f523cd6f.tar.gz kolla-e0f8cbc50cf7184930a501b0f5452a64f523cd6f.zip | |
move to Debian 'bullseye'
Bullseye is now in hard freeze cycle and goes for release.
https://release.debian.org/bullseye/freeze_policy.html
Co-Authored-By: Michal Nasiadka <mnasiadka@gmail.com>
Change-Id: I543965a2741cebfa759576a4c75669a7bacd4208
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rwxr-xr-x | kolla/image/build.py | 16 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 2 | ||||
| -rw-r--r-- | kolla/tests/test_build.py | 2 |
4 files changed, 9 insertions, 15 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 96701e72d..23e5ead40 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -24,13 +24,13 @@ BASE_ARCH = ['x86_64', 'ppc64le', 'aarch64'] DEFAULT_BASE_TAGS = { 'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream8'}, 'rhel': {'name': 'registry.access.redhat.com/ubi8', 'tag': 'latest'}, - 'debian': {'name': 'debian', 'tag': '10'}, + 'debian': {'name': 'debian', 'tag': 'bullseye'}, 'ubuntu': {'name': 'ubuntu', 'tag': '20.04'}, } DISTRO_RELEASE = { 'centos': '8', 'rhel': '8', - 'debian': '10', + 'debian': 'testing/unstable', 'ubuntu': '20.04', } OPENSTACK_RELEASE = 'wallaby' diff --git a/kolla/image/build.py b/kolla/image/build.py index a148c980f..27006e1ac 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -132,7 +132,7 @@ UNBUILDABLE_IMAGES = { "bifrost-base", # tries to install 'mysql-server' which is not in # Debian 'buster' "monasca-grafana", # FIXME(hrw): some ssl issues to fix - "ovsdpdk", + "ovn-base", # needs more checking "qdrouterd", }, @@ -162,14 +162,10 @@ UNBUILDABLE_IMAGES = { }, 'debian+binary': { - "cloudkitty-base", - "ironic-neutron-agent", - "nova-serialproxy", - "senlin-conductor", # no binary package - "senlin-health-manager", # no binary package - "tacker-base", - "trove-base", # package is not installable - "neutron-mlnx-agent", + "cloudkitty-base", # no support in Dockerfile + "ironic-neutron-agent", # no support in Dockerfile + "nova-serialproxy", # no binary package + "tacker-base", # no binary package }, 'ubuntu+binary': { @@ -697,7 +693,7 @@ class KollaWorker(object): if self.base in rh_base: self.conf.distro_python_version = "3.6" elif self.base in ['debian']: - self.conf.distro_python_version = "3.7" + self.conf.distro_python_version = "3.9" elif self.base in ['ubuntu']: self.conf.distro_python_version = "3.8" else: diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 05fb8bcaf..f522a9e85 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -63,7 +63,6 @@ debian: erlang: "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu bionic main" grafana: "deb https://packages.grafana.com/oss/deb stable main" influxdb: "deb https://repos.influxdata.com/debian buster stable" - libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz:/kolla-wallaby/debian-buster ./" logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" kibana: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/debian/ buster main" @@ -76,7 +75,6 @@ debian-aarch64: influxdb: "deb https://repos.influxdata.com/debian buster stable" logstash: "deb https://artifacts.elastic.co/packages/oss-7.x/apt stable main" kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-7.x/apt stable main" - libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz:/kolla-wallaby/debian-buster ./" rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/debian/ buster main" td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib" diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py index 8dd34f2fd..10d70ce5a 100644 --- a/kolla/tests/test_build.py +++ b/kolla/tests/test_build.py @@ -529,7 +529,7 @@ class KollaWorkerTest(base.TestCase): """check distro_python_version for Debian""" self.conf.set_override('base', 'debian') kolla = build.KollaWorker(self.conf) - self.assertEqual('3.7', kolla.distro_python_version) + self.assertEqual('3.9', kolla.distro_python_version) def test_build_distro_python_version_rhel80(self): """check distro_python_version for RHEL8.0""" |
