From 5fbcc7e0e20c2b710910dadf9ecaa9ed1e2a2295 Mon Sep 17 00:00:00 2001
From: David Moreau-Simard <dms@redhat.com>
Date: Thu, 7 Sep 2017 15:11:20 -0400
Subject: [PATCH] Move openstack-specific jobs to openstack-zuul-jobs

We're in the process of adding jobs to test our base job on different
distributions and ensure there's no regressions.
These are openstack-specific so let's move them from zuul-jobs.

Change-Id: Ic04c48d7a0e15459632b91bce81e777d12622222
Depends-On: Ie29ee24b631f659f3330f5c631e2850f6b8cb463
---
 tests/base.yaml              |  3 +++
 tests/configure-mirrors.yaml | 11 ++++++++
 zuul.yaml                    | 52 ++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 tests/base.yaml
 create mode 100644 tests/configure-mirrors.yaml

diff --git a/tests/base.yaml b/tests/base.yaml
new file mode 100644
index 00000000..0989d039
--- /dev/null
+++ b/tests/base.yaml
@@ -0,0 +1,3 @@
+# Roles that are part of the 'base' job
+
+- include: configure-mirrors.yaml
diff --git a/tests/configure-mirrors.yaml b/tests/configure-mirrors.yaml
new file mode 100644
index 00000000..5e05e3aa
--- /dev/null
+++ b/tests/configure-mirrors.yaml
@@ -0,0 +1,11 @@
+- name: Test the configure-mirrors role
+  hosts: all
+  roles:
+    - role: configure-mirrors
+      mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
+  post_tasks:
+    - name: Install a package to sanity check the mirror configuration
+      package:
+        name: "emacs"
+        state: "present"
+      become: yes
diff --git a/zuul.yaml b/zuul.yaml
index 0ba7e121..ed0ffb9c 100644
--- a/zuul.yaml
+++ b/zuul.yaml
@@ -3,6 +3,58 @@
 #    https://git.openstack.org/cgit/openstack-infra/project-config
 #    https://git.openstack.org/cgit/openstack-infra/zuul-jobs
 
+- job:
+    name: base-integration
+    description: |
+      Runs roles that are included by default in the 'base' job in order to
+      prevent regressions.
+    parent: base-minimal
+    roles:
+      - zuul: openstack-infra/zuul-jobs
+    run: tests/base
+
+- job:
+    name: base-integration-centos-7
+    parent: base-integration
+    nodes:
+      - name: centos-7
+        label: centos-7
+
+- job:
+    name: base-integration-debian-jessie
+    parent: base-integration
+    nodes:
+      - name: debian-jessie
+        label: debian-jessie
+
+- job:
+    name: base-integration-fedora-26
+    parent: base-integration
+    nodes:
+      - name: fedora-26
+        label: fedora-26
+
+- job:
+    name: base-integration-opensuse423
+    parent: base-integration
+    nodes:
+      - name: opensuse-423
+        label: opensuse-423
+
+- job:
+    name: base-integration-ubuntu-trusty
+    parent: base-integration
+    nodes:
+      - name: ubuntu-trusty
+        label: ubuntu-trusty
+
+- job:
+    name: base-integration-ubuntu-xenial
+    parent: base-integration
+    nodes:
+      - name: ubuntu-xenial
+        label: ubuntu-xenial
+
 - job:
     name: openstack-doc-build
     parent: tox-docs