diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-06-30 14:24:51 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2020-08-07 14:38:02 +0000 |
| commit | d2966452c56c3dee27839a8d277eb069671b51df (patch) | |
| tree | 9253afed21c7b0e82689962409cf7d58a33d4261 /kolla | |
| parent | 53d98f540f3af9972cf3040e529f7d2f14c4bc4b (diff) | |
| download | kolla-d2966452c56c3dee27839a8d277eb069671b51df.tar.gz kolla-d2966452c56c3dee27839a8d277eb069671b51df.zip | |
ubuntu: move to 20.04 Focal
There is a time once every 2 years when ubuntu team releases new LTS
release. And then UCA joins with binary packages for current OpenStack
development cycle.
It is this time for Ubuntu 20.04 'focal'.
Depends-On: https://review.opendev.org/745156
Change-Id: I045aa6b4b4fd83fbe7d1fda89549f0ef1e88ec12
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rwxr-xr-x | kolla/image/build.py | 2 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 19 | ||||
| -rw-r--r-- | kolla/tests/test_build.py | 2 |
4 files changed, 14 insertions, 13 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 76f2fd577..5d8b586a6 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -25,13 +25,13 @@ DEFAULT_BASE_TAGS = { 'centos': '8', 'rhel': '8', 'debian': '10', - 'ubuntu': '18.04', + 'ubuntu': '20.04', } DISTRO_RELEASE = { 'centos': '8', 'rhel': '8', 'debian': '10', - 'ubuntu': '18.04', + 'ubuntu': '20.04', } OPENSTACK_RELEASE = 'master' diff --git a/kolla/image/build.py b/kolla/image/build.py index ca5a0f0cd..70818f60e 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -699,7 +699,7 @@ class KollaWorker(object): elif self.base in ['debian']: self.conf.distro_python_version = "3.7" elif self.base in ['ubuntu']: - self.conf.distro_python_version = "3.6" + self.conf.distro_python_version = "3.8" else: # Assume worst self.conf.distro_python_version = "3.6" diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 769175c55..416b91cef 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -70,26 +70,27 @@ debian-aarch64: ubuntu: elasticsearch: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main" - erlang: "deb https://dl.bintray.com/rabbitmq-erlang/debian/ bionic erlang" + erlang: "deb https://dl.bintray.com/rabbitmq-erlang/debian/ focal erlang" grafana: "deb https://packages.grafana.com/oss/deb stable main" - influxdb: "deb https://repos.influxdata.com/ubuntu bionic stable" + influxdb: "deb https://repos.influxdata.com/ubuntu focal stable" logstash: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main" kibana: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main" - mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main" - qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ bionic main" + mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main" + qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main" + # NOTE(hrw): upstream uses bionic repo for focal rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main" - td-agent: "deb http://packages.treasuredata.com/4/ubuntu/bionic/ bionic contrib" + td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib" ubuntu-aarch64: elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" - erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-bionic ./" + erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-focal ./" grafana: "deb https://packages.grafana.com/oss/deb stable main" - influxdb: "deb https://repos.influxdata.com/ubuntu bionic stable" + influxdb: "deb https://repos.influxdata.com/ubuntu focal stable" logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main" rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main" - td-agent: "deb http://packages.treasuredata.com/4/ubuntu/bionic/ bionic contrib" + td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib" ubuntu-ppc64le: - mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main" + mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main" rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main" diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py index ad5e47600..4b870a73a 100644 --- a/kolla/tests/test_build.py +++ b/kolla/tests/test_build.py @@ -549,7 +549,7 @@ class KollaWorkerTest(base.TestCase): """check distro_python_version for Ubuntu""" self.conf.set_override('base', 'ubuntu') kolla = build.KollaWorker(self.conf) - self.assertEqual('3.6', kolla.distro_python_version) + self.assertEqual('3.8', kolla.distro_python_version) def test_build_distro_python_version_centos(self): """check distro_python_version for CentOS 8.0.1905""" |
