From a9feeae6b2fc2c402fae7f9c2a5e12a0b49b6268 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Thu, 30 May 2019 16:40:58 -0600
Subject: [PATCH] Add multinode minion job

Depends-On: https://review.opendev.org/#/c/662343/
Depends-On: https://review.opendev.org/#/c/662349/
Depends-On: https://review.opendev.org/#/c/672380/
Change-Id: I7902c285bcf4574624b7ad50bb953aeb2af74a9e
---
 .../config/testenv/multinode-rdocloud.yml          |  2 ++
 toci-quickstart/config/testenv/multinode.yml       |  2 ++
 zuul.d/layout.yaml                                 |  3 +++
 zuul.d/multinode-jobs.yaml                         | 14 ++++++++++++++
 4 files changed, 21 insertions(+)

diff --git a/toci-quickstart/config/testenv/multinode-rdocloud.yml b/toci-quickstart/config/testenv/multinode-rdocloud.yml
index eff0d2c57..ae0df2fa8 100644
--- a/toci-quickstart/config/testenv/multinode-rdocloud.yml
+++ b/toci-quickstart/config/testenv/multinode-rdocloud.yml
@@ -18,12 +18,14 @@ hostname_correction: true # workaround restriction on toci images
 
 mtu: "{{ vxlan_mtu }}"
 undercloud_local_mtu: "{{ mtu }}"
+minion_local_mtu: "{{ mtu }}"
 overcloud_neutron_global_physnet_mtu: "{{ mtu }}"
 
 ceph_use_fqdn: true
 
 # environment settings, not TRIPLEO-CI specific
 undercloud_local_interface: "br-ex" # related to osinfra network configuration
+minion_local_interface: "br-ex" # related to osinfra network configuration
 flavor_args: ""
 undercloud_conf_extras: "net_config_override = /opt/stack/new/tripleo-ci/undercloud-configs/net-config-multinode.json.template"
 generate_pingtest_subunit: true
diff --git a/toci-quickstart/config/testenv/multinode.yml b/toci-quickstart/config/testenv/multinode.yml
index 97f36c73c..9bd5d5af5 100644
--- a/toci-quickstart/config/testenv/multinode.yml
+++ b/toci-quickstart/config/testenv/multinode.yml
@@ -21,10 +21,12 @@ hostname_correction: true # workaround restriction on toci images
 vxlan_mtu: 1350
 mtu: "{{ vxlan_mtu }}"
 undercloud_local_mtu: "{{ mtu }}"
+minion_local_mtu: "{{ mtu }}"
 overcloud_neutron_global_physnet_mtu: "{{ mtu }}"
 
 # environment settings, not TRIPLEO-CI specific
 undercloud_local_interface: "br-ex" # related to osinfra network configuration
+minion_local_interface: "br-ex" # related to osinfra network configuration
 flavor_args: ""
 undercloud_conf_extras: "net_config_override = /opt/stack/new/tripleo-ci/undercloud-configs/net-config-multinode.json.template"
 generate_pingtest_subunit: true
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 5bf54950f..77d19398f 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -61,6 +61,9 @@
               - ^playbooks/tripleo-ci/.*$
         - tripleo-ci-centos-7-standalone-upgrade-stein:
             branches: master
+        - tripleo-ci-centos-7-containers-undercloud-minion:
+            files:
+                - ^zuul.d/multinode-jobs.yaml$
 
     gate:
       queue: tripleo
diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml
index aa74fed5b..fd6a05ca9 100644
--- a/zuul.d/multinode-jobs.yaml
+++ b/zuul.d/multinode-jobs.yaml
@@ -95,6 +95,20 @@
       playbooks:
         - multinode.yml
 
+- job:
+    name: tripleo-ci-centos-7-containers-undercloud-minion
+    parent: tripleo-ci-base-multinode
+    branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
+    voting: false
+    vars:
+      nodes: 1minion
+      featureset: '061'
+      playbooks:
+        - multinode-minion.yml
+      extra_tags:
+        - undercloud-minion-setup
+        - undercloud-minion-deploy
+
 - job:
     name: tripleo-ci-centos-7-containers-multinode-stein
     parent: tripleo-ci-base-multinode