From b68c977c0f416f3088b5d7d616ad85f55bfd853b Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Wed, 30 Sep 2020 16:16:01 +0100
Subject: [PATCH] Fix linter errors and add lint skip list

Make centos-8 job non voting, nspawn requries btrfs which is not
available on centos-8

Change-Id: Ib013981138209e56f1a0741d15bfe32dcd48702b
---
 .ansible-lint         |  4 ++++
 meta/main.yml         |  2 +-
 vars/ubuntu-20.04.yml | 19 +++++++++++++++++++
 zuul.d/project.yaml   |  8 ++++++++
 4 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 .ansible-lint
 create mode 100644 vars/ubuntu-20.04.yml

diff --git a/.ansible-lint b/.ansible-lint
new file mode 100644
index 0000000..ce388e9
--- /dev/null
+++ b/.ansible-lint
@@ -0,0 +1,4 @@
+warn_list:
+  - '204'  # Lines should be no longer than 160 chars
+  - '208'  # File permissions unset or incorrect
+  - '701'  # meta/main.yml should contain relevant info
diff --git a/meta/main.yml b/meta/main.yml
index c6b250b..01ae01d 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -30,7 +30,7 @@ galaxy_info:
     - name: EL
       versions:
         - 7
-  categories:
+  galaxy_tags:
     - cloud
     - nspawn
     - container
diff --git a/vars/ubuntu-20.04.yml b/vars/ubuntu-20.04.yml
new file mode 100644
index 0000000..64b6893
--- /dev/null
+++ b/vars/ubuntu-20.04.yml
@@ -0,0 +1,19 @@
+---
+# Copyright 2018, 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_map:
+  distro: ubuntu
+  arch: "{{ nspawn_architecture_mapping[container_architecture] }}"
+  release: focal
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 5691073..4a2f857 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -19,3 +19,11 @@
       - openstack-ansible-role-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
+    check:
+      jobs:
+        - openstack-ansible-functional-centos-8:
+            voting: false
+    gate:
+      jobs:
+        - openstack-ansible-functional-centos-8:
+            voting: false