commit d591b0ddb954122866ef129453ed56bb8fee30ab Author: Jonathan Rosser Date: Wed Sep 30 15:33:33 2020 +0100 Fix CI jobs Remove centos-7 job Mark centos-8 as non-voting Rename ubuntu vars file to cover focal and bionic Add functional jobs to gate as well as check Fix linter errors Change-Id: Iacdcda303d483617c6e94b815e2c5c1d65145f0d diff --git a/files/lxc-image-fetch-url.py b/files/lxc-image-fetch-url.py index 371c1e6..7da5f98 100644 --- a/files/lxc-image-fetch-url.py +++ b/files/lxc-image-fetch-url.py @@ -116,5 +116,6 @@ def main(): ) print(container_url) + if __name__ == '__main__': main() diff --git a/tests/test.yml b/tests/test.yml index 36dfaaa..15c5c54 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -129,7 +129,7 @@ name: "{{ extra_host_package }}" state: present failed_when: - - extra_host_package_state.changed == true + - extra_host_package_state.changed register: extra_host_package_state - name: Check for extra package installed in lxc cache diff --git a/vars/ubuntu-18.04.yml b/vars/ubuntu-18.04.yml deleted file mode 100644 index 822b14f..0000000 --- a/vars/ubuntu-18.04.yml +++ /dev/null @@ -1,68 +0,0 @@ ---- -# Copyright 2016, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -_nspawn_hosts_container_image_url: "http://cdimage.ubuntu.com/ubuntu-base/releases/18.04/release/ubuntu-base-18.04-base-{{ nspawn_cache_map.arch }}.tar.gz" - -_nspawn_hosts_distro_packages: - - bridge-utils - - btrfs-tools - - dbus - - dnsmasq - - git - - iptables - - irqbalance - - psmisc - - pxz - - systemd-container - -_nspawn_container_distro_required_packages: - - gnupg - -_nspawn_container_distro_packages: - - apt-transport-https - - ca-certificates - - cron - - dbus - - debianutils - - gcc - - iproute2 - - iputils-ping - - libnss-resolve - - libpython2.7 - - libpython3.6 - - locales - - netbase - - openssh-server - - openssl - - python2.7 - - python-apt - - python-dev - - rsync - - sudo - - systemd - - tar - - tzdata - - wget - -_nspawn_cache_map: - distro: ubuntu - arch: "{{ nspawn_architecture_mapping.get(ansible_architecture) }}" - release: bionic - -_nspawn_copy_from_host: - - /etc/apt/sources.list - - /etc/apt/apt.conf.d/ - - /etc/apt/preferences.d/ - - /etc/apt/trusted.gpg.d diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml new file mode 100644 index 0000000..ebf8468 --- /dev/null +++ b/vars/ubuntu.yml @@ -0,0 +1,67 @@ +--- +# Copyright 2016, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +_nspawn_hosts_container_image_url: "http://cdimage.ubuntu.com/ubuntu-base/releases/18.04/release/ubuntu-base-18.04-base-{{ nspawn_cache_map.arch }}.tar.gz" + +_nspawn_hosts_distro_packages: + - bridge-utils + - btrfs-progs + - dbus + - dnsmasq + - git + - iptables + - irqbalance + - psmisc + - systemd-container + +_nspawn_container_distro_required_packages: + - gnupg + +_nspawn_container_distro_packages: + - apt-transport-https + - ca-certificates + - cron + - dbus + - debianutils + - gcc + - iproute2 + - iputils-ping + - libnss-resolve + - libpython2.7 + - libpython3.6 + - locales + - netbase + - openssh-server + - openssl + - python2.7 + - python-apt + - python-dev + - rsync + - sudo + - systemd + - tar + - tzdata + - wget + +_nspawn_cache_map: + distro: ubuntu + arch: "{{ nspawn_architecture_mapping.get(ansible_architecture) }}" + release: bionic + +_nspawn_copy_from_host: + - /etc/apt/sources.list + - /etc/apt/apt.conf.d/ + - /etc/apt/preferences.d/ + - /etc/apt/trusted.gpg.d diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 709cedb..2bc0195 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -23,11 +23,6 @@ osa_test_repo: openstack/openstack-ansible-nspawn_container_create - job: - name: openstack-ansible-nspawn-container-create-centos-7 - parent: openstack-ansible-nspawn-container-create - nodeset: centos-7 - -- job: name: openstack-ansible-nspawn-container-create-debian-buster parent: openstack-ansible-nspawn-container-create nodeset: debian-buster diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 9bcfda0..05c7ac2 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -21,9 +21,16 @@ - release-notes-jobs-python3 check: jobs: - - openstack-ansible-nspawn-container-create-centos-7 - openstack-ansible-nspawn-container-create-debian-buster - openstack-ansible-nspawn-container-create-ubuntu-bionic + - openstack-ansible-functional-centos-8: + voting: false + gate: + jobs: + - openstack-ansible-nspawn-container-create-debian-buster + - openstack-ansible-nspawn-container-create-ubuntu-bionic + - openstack-ansible-functional-centos-8: + voting: false experimental: jobs: