From 534465797b4aabead7ddd5d20430101c0f64572d Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Thu, 11 Feb 2021 20:39:24 +0100 Subject: [PATCH] CI: Add Ubuntu seed job This commit adds Zuul job for deploying seed services against Ubuntu 20.04 LTS (Focal Fossa). Co-Authored-By: Mark Goddard Story: 2004960 Task: 41807 Depends-On: https://review.opendev.org/c/openstack/kayobe/+/772929 Change-Id: I839cd1b9d63c9bbf3e0c75def76b8bff68637c75 --- playbooks/kayobe-seed-base/overrides.yml.j2 | 5 +++++ playbooks/kayobe-seed-base/pre.yml | 1 + playbooks/kayobe-seed-base/run.yml | 1 + zuul.d/jobs.yaml | 5 +++++ zuul.d/project.yaml | 2 ++ 5 files changed, 14 insertions(+) diff --git a/playbooks/kayobe-seed-base/overrides.yml.j2 b/playbooks/kayobe-seed-base/overrides.yml.j2 index 2f4e620c9..3103c2a30 100644 --- a/playbooks/kayobe-seed-base/overrides.yml.j2 +++ b/playbooks/kayobe-seed-base/overrides.yml.j2 @@ -11,12 +11,17 @@ kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/opensta kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}" kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla-ansible'].src_dir }}" kolla_ansible_source_version: "{{ zuul.projects['opendev.org/openstack/kolla-ansible'].checkout }}" +{% if ansible_os_family == 'Debian' %} +kolla_base_distro: ubuntu +{% endif %} kolla_openstack_logging_debug: True pip_upper_constraints_file: "/tmp/upper-constraints.txt" # Use the CI infra's PyPI mirror. pip_local_mirror: true pip_index_url: "http://{{ zuul_site_mirror_fqdn }}/pypi/simple" +pip_trusted_hosts: + - "{{ zuul_site_mirror_fqdn }}" # NOTE(mgoddard): CentOS 8 removes interfaces from their bridge during ifdown, # and removes the bridge if there are no interfaces left. When Kayobe bounces diff --git a/playbooks/kayobe-seed-base/pre.yml b/playbooks/kayobe-seed-base/pre.yml index 516c376e7..08e2e6281 100644 --- a/playbooks/kayobe-seed-base/pre.yml +++ b/playbooks/kayobe-seed-base/pre.yml @@ -34,3 +34,4 @@ shell: cmd: dev/install.sh &> {{ logs_dir }}/ansible/install chdir: "{{ kayobe_src_dir }}" + executable: /bin/bash diff --git a/playbooks/kayobe-seed-base/run.yml b/playbooks/kayobe-seed-base/run.yml index edd22215d..270081ee4 100644 --- a/playbooks/kayobe-seed-base/run.yml +++ b/playbooks/kayobe-seed-base/run.yml @@ -8,3 +8,4 @@ - name: Ensure seed is deployed shell: cmd: "{{ kayobe_src_dir }}/dev/seed-deploy.sh &> {{ logs_dir }}/ansible/seed-deploy" + executable: /bin/bash diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 8695bd222..b5b9655b4 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -144,6 +144,11 @@ parent: kayobe-seed-base nodeset: kayobe-centos8 +- job: + name: kayobe-seed-ubuntu-focal + parent: kayobe-seed-base + nodeset: kayobe-ubuntu-focal + - job: name: kayobe-overcloud-host-configure-base parent: kayobe-overcloud-base diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 1e84fe161..33c79a361 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -16,6 +16,7 @@ - kayobe-overcloud-host-configure-centos8 - kayobe-overcloud-upgrade-centos8 - kayobe-seed-centos8 + - kayobe-seed-ubuntu-focal - kayobe-seed-upgrade-centos8 - kayobe-seed-vm-centos8 @@ -31,5 +32,6 @@ - kayobe-overcloud-host-configure-centos8 - kayobe-overcloud-upgrade-centos8 - kayobe-seed-centos8 + - kayobe-seed-ubuntu-focal - kayobe-seed-upgrade-centos8 - kayobe-seed-vm-centos8