From 9853fcfbee5a9df8ae81af86f073c19ea194c203 Mon Sep 17 00:00:00 2001 From: Rick Bartra Date: Mon, 21 Sep 2020 08:24:44 -0500 Subject: [PATCH] fix - pep8 and image build gates This commit updates the Pegleg pep8 gate to use Ubuntu 18.04 (bionic) as the base Ubuntu image for the job. Upstream CI has a community goal to use Ubuntu 20.04 (focal) which defaults to python3.8. By moving to python3.8, some of the pip packages need to be updated but until pip conflicts are resolved, it is difficult to do so. Additionally, update the deb-docker path to fix the docker image build jobs. Change-Id: I263c646f9fbf14cb65267df586c524de3da2878f --- .zuul.yaml | 4 ++-- tools/zuul/playbooks/docker-image-build.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 174875a5..041ddde2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -18,7 +18,7 @@ rtd_project_name: 'airship-promenade' check: jobs: - - openstack-tox-pep8 + - openstack-tox-pep8-bionic - airship-promenade-lint-ws - airship-promenade-docker-build-gate-ubuntu_xenial - airship-promenade-docker-build-gate-ubuntu_bionic @@ -30,7 +30,7 @@ gate: jobs: - - openstack-tox-pep8 + - openstack-tox-pep8-bionic - airship-promenade-lint-ws - airship-promenade-docker-build-gate-ubuntu_xenial - airship-promenade-docker-build-gate-ubuntu_bionic diff --git a/tools/zuul/playbooks/docker-image-build.yaml b/tools/zuul/playbooks/docker-image-build.yaml index bccd4f80..0858038d 100644 --- a/tools/zuul/playbooks/docker-image-build.yaml +++ b/tools/zuul/playbooks/docker-image-build.yaml @@ -27,7 +27,7 @@ - apt_key: url: https://download.docker.com/linux/ubuntu/gpg - apt_repository: - repo: deb http://{{ zuul_site_mirror_fqdn }}/deb-docker xenial stable + repo: deb http://{{ zuul_site_mirror_fqdn }}/deb-docker/{{ ansible_distribution_release }} {{ ansible_distribution_release }} stable - apt: name: "{{ item }}" allow_unauthenticated: True