From 22b0ed2c4d82eab6c8b3654c042719e3e14852b1 Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Fri, 21 Feb 2020 13:37:01 +0000
Subject: [PATCH] Enable testing of install-docker on multiple platforms

Change-Id: I6b9d4a51ed9966b8f39917783c8649fa3b4bd096
---
 .../tasks/upstream-package-installation.yaml  |  2 +-
 test-playbooks/install-docker.yaml            |  6 ++
 tools/update-test-platforms.py                |  2 +-
 zuul-tests.d/container-roles-jobs.yaml        | 89 ++++++++++++++++++-
 4 files changed, 95 insertions(+), 4 deletions(-)
 create mode 100644 test-playbooks/install-docker.yaml

diff --git a/roles/install-docker/tasks/upstream-package-installation.yaml b/roles/install-docker/tasks/upstream-package-installation.yaml
index 7e83127e8..9e52e2ccf 100644
--- a/roles/install-docker/tasks/upstream-package-installation.yaml
+++ b/roles/install-docker/tasks/upstream-package-installation.yaml
@@ -1,6 +1,6 @@
 ---
 
-- name: Install docker
+- name: Install upstream docker
   package:
     name: "{{ docker_upstream_distro_packages }}"
     state: present
diff --git a/test-playbooks/install-docker.yaml b/test-playbooks/install-docker.yaml
new file mode 100644
index 000000000..0dc05ccea
--- /dev/null
+++ b/test-playbooks/install-docker.yaml
@@ -0,0 +1,6 @@
+- hosts: all
+  tasks:
+
+    - name: Run install-docker role
+      include_role:
+        name: install-docker
diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py
index 825f0b79b..062550471 100755
--- a/tools/update-test-platforms.py
+++ b/tools/update-test-platforms.py
@@ -105,7 +105,7 @@ def handle_file(fn):
                     joblist_check.append(ojob['name'])
                     if voting:
                         joblist_gate.append(ojob['name'])
-            else:
+            elif not job.get('abstract', False):
                 joblist_check.append(job['name'])
                 # don't append non-voting jobs to gate
                 if job.get('voting', True):
diff --git a/zuul-tests.d/container-roles-jobs.yaml b/zuul-tests.d/container-roles-jobs.yaml
index 74b5dbd29..c0c92a94a 100644
--- a/zuul-tests.d/container-roles-jobs.yaml
+++ b/zuul-tests.d/container-roles-jobs.yaml
@@ -1,3 +1,68 @@
+- job:
+    name: zuul-jobs-test-install-docker
+    description: Tests install-docker role
+    abstract: true
+    files:
+      - roles/install-docker/.*
+      - test-requirements.txt
+    run: test-playbooks/install-docker.yaml
+
+- job:
+    name: zuul-jobs-test-install-docker-centos-7
+    description: Tests install-docker role on centos-7
+    parent: zuul-jobs-test-install-docker
+    nodeset:
+      nodes:
+        - name: centos-7
+          label: centos-7
+
+- job:
+    name: zuul-jobs-test-install-docker-centos-8-nv
+    description: Tests install-docker role on centos-8
+    parent: zuul-jobs-test-install-docker
+    # TODO(ssbarnea): fix centos-8 in follow-up and remove nv
+    voting: false
+    nodeset:
+      nodes:
+        - name: centos-8
+          label: centos-8
+
+- job:
+    name: zuul-jobs-test-install-docker-debian-stretch
+    description: Tests install-docker role on debian-stretch
+    parent: zuul-jobs-test-install-docker
+    nodeset:
+      nodes:
+        - name: debian-stretch
+          label: debian-stretch
+
+- job:
+    name: zuul-jobs-test-install-docker-fedora-29
+    description: Tests install-docker role on fedora-29
+    parent: zuul-jobs-test-install-docker
+    nodeset:
+      nodes:
+        - name: fedora-29
+          label: fedora-29
+
+- job:
+    name: zuul-jobs-test-install-docker-ubuntu-bionic
+    description: Tests install-docker role on ubuntu-bionic
+    parent: zuul-jobs-test-install-docker
+    nodeset:
+      nodes:
+        - name: ubuntu-bionic
+          label: ubuntu-bionic
+
+- job:
+    name: zuul-jobs-test-install-docker-ubuntu-xenial
+    description: Tests install-docker role on ubuntu-xenial
+    parent: zuul-jobs-test-install-docker
+    nodeset:
+      nodes:
+        - name: ubuntu-xenial
+          label: ubuntu-xenial
+
 - job:
     name: zuul-jobs-test-registry-docker
     description: |
@@ -212,7 +277,13 @@
 
 - project:
     check:
-      jobs: &id001
+      jobs:
+        - zuul-jobs-test-install-docker-centos-7
+        - zuul-jobs-test-install-docker-centos-8-nv
+        - zuul-jobs-test-install-docker-debian-stretch
+        - zuul-jobs-test-install-docker-fedora-29
+        - zuul-jobs-test-install-docker-ubuntu-bionic
+        - zuul-jobs-test-install-docker-ubuntu-xenial
         - zuul-jobs-test-registry-docker
         - zuul-jobs-test-registry-podman
         - zuul-jobs-test-registry-buildset-registry
@@ -223,4 +294,18 @@
         - zuul-jobs-test-install-kubernetes-crio
         - zuul-jobs-test-install-podman
     gate:
-      jobs: *id001
+      jobs:
+        - zuul-jobs-test-install-docker-centos-7
+        - zuul-jobs-test-install-docker-debian-stretch
+        - zuul-jobs-test-install-docker-fedora-29
+        - zuul-jobs-test-install-docker-ubuntu-bionic
+        - zuul-jobs-test-install-docker-ubuntu-xenial
+        - zuul-jobs-test-registry-docker
+        - zuul-jobs-test-registry-podman
+        - zuul-jobs-test-registry-buildset-registry
+        - zuul-jobs-test-registry-buildset-registry-k8s-docker
+        - zuul-jobs-test-registry-buildset-registry-k8s-crio
+        - zuul-jobs-test-registry-buildset-registry-openshift-docker
+        - zuul-jobs-test-install-kubernetes-docker
+        - zuul-jobs-test-install-kubernetes-crio
+        - zuul-jobs-test-install-podman