commit 3548698dc4559ed74996444cbc33f5a75b59d793 Author: Jonathan Rosser Date: Wed Oct 7 14:01:09 2020 +0100 Ensure that libpython is present. This is required to run our uwsgi applications. On centos libpython3 is a dependancy of uwsgi-plugin-python3. Also mark linters as non voting as fixing linters in this repo is currently a circular dependancy Change-Id: I56d130c242b440c02a54f9971bfb4e0866dbbc3d diff --git a/tasks/main.yml b/tasks/main.yml index 7a258d0..b9bcd4f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -17,7 +17,11 @@ include_vars: "{{ item }}" when: uwsgi_services | length > 0 with_first_found: + - "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml" + - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml" + - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml" - "{{ ansible_distribution | lower }}.yml" + - "{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yml" - "{{ ansible_os_family | lower }}.yml" tags: - always diff --git a/vars/debian-10.yml b/vars/debian-10.yml new file mode 100644 index 0000000..5782e4e --- /dev/null +++ b/vars/debian-10.yml @@ -0,0 +1,24 @@ +--- +# Copyright 2019, VEXXHOST, 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. + +## APT Cache options +cache_timeout: 600 + +uwsgi_bin: '/usr/bin' + +uwsgi_distro_packages: + - libpython3.7 + - uwsgi + - uwsgi-plugin-python3 diff --git a/vars/debian.yml b/vars/debian.yml deleted file mode 100644 index e35924c..0000000 --- a/vars/debian.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -# Copyright 2019, VEXXHOST, 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. - -## APT Cache options -cache_timeout: 600 - -uwsgi_bin: '/usr/bin' - -uwsgi_distro_packages: - - uwsgi - - uwsgi-plugin-python3 diff --git a/vars/ubuntu-20.04.yml b/vars/ubuntu-20.04.yml new file mode 100644 index 0000000..fbe6619 --- /dev/null +++ b/vars/ubuntu-20.04.yml @@ -0,0 +1,24 @@ +--- +# Copyright 2019, VEXXHOST, 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. + +## APT Cache options +cache_timeout: 600 + +uwsgi_bin: '/usr/bin' + +uwsgi_distro_packages: + - libpython3.8 + - uwsgi + - uwsgi-plugin-python3 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 84da5b4..749748b 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -21,3 +21,11 @@ - openstack-ansible-linters-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 + check: + jobs: + - openstack-ansible-linters-ubuntu-bionic: + voting: false + gate: + jobs: + - openstack-ansible-linters-ubuntu-bionic: + voting: false