From 3b03acabf422570ab8b068b1310a113099ec299f Mon Sep 17 00:00:00 2001
From: Matthew Thode <mthode@mthode.org>
Date: Thu, 13 Sep 2018 15:20:56 -0500
Subject: [PATCH] add Gentoo jobs and vars and also fix install test

Based them on fedora-latest jobs

Depends-On: https://review.openstack.org/604677
Depends-On: https://review.openstack.org/604688
Change-Id: I45622ac18685b809a091edba2df96fc8040138a8
---
 tests/configure-mirrors.yaml                  |  6 ++++-
 tests/multi-node-firewall-persistence.yaml    |  4 ++--
 .../Gentoo.yaml                               |  3 +++
 zuul.d/jobs.yaml                              | 22 +++++++++++++++++++
 zuul.d/nodesets.yaml                          |  6 +++++
 zuul.d/project.yaml                           |  4 ++++
 6 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 tests/multinode_firewall_persistence_vars/Gentoo.yaml

diff --git a/tests/configure-mirrors.yaml b/tests/configure-mirrors.yaml
index acc3e504..1efedb8f 100644
--- a/tests/configure-mirrors.yaml
+++ b/tests/configure-mirrors.yaml
@@ -5,8 +5,12 @@
       mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
       set_apt_mirrors_trusted: True
   post_tasks:
+    - name: Set emacs package fact for gentoo
+      set_fact:
+        emacs_package: app-editors/emacs
+      when: ansible_distribution == 'Gentoo'
     - name: Install a package to sanity check the mirror configuration
       package:
-        name: "emacs"
+        name: "{{ emacs_package | default('emacs') }}"
         state: "present"
       become: yes
diff --git a/tests/multi-node-firewall-persistence.yaml b/tests/multi-node-firewall-persistence.yaml
index f3828666..48d6cbe8 100644
--- a/tests/multi-node-firewall-persistence.yaml
+++ b/tests/multi-node-firewall-persistence.yaml
@@ -24,8 +24,8 @@
         - iptables --flush
         - ip6tables --flush
 
-    # NOTE (dmsimard): We're using with_items here because RedHat needs to
-    # restart both iptables and ip6tables.
+    # NOTE (dmsimard): We're using with_items here because RedHat and Gentoo
+    # need to restart both iptables and ip6tables.
     - name: Restart iptables
       become: yes
       service:
diff --git a/tests/multinode_firewall_persistence_vars/Gentoo.yaml b/tests/multinode_firewall_persistence_vars/Gentoo.yaml
new file mode 100644
index 00000000..0d81a5b7
--- /dev/null
+++ b/tests/multinode_firewall_persistence_vars/Gentoo.yaml
@@ -0,0 +1,3 @@
+iptables_service:
+  - iptables-restore
+  - ip6tables-restore
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 0a4da62e..a56c252b 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -44,6 +44,11 @@
     parent: openstack-infra-base-integration
     nodeset: fedora-latest
 
+- job:
+    name: openstack-infra-base-integration-gentoo-17-0-systemd
+    parent: openstack-infra-base-integration
+    nodeset: gentoo-17-0-systemd
+
 - job:
     name: openstack-infra-base-integration-opensuse423
     parent: openstack-infra-base-integration
@@ -153,6 +158,23 @@
           nodes:
             - secondary
 
+- job:
+    name: openstack-infra-multinode-integration-gentoo-17-0-systemd
+    parent: openstack-infra-multinode-integration
+    nodeset:
+      nodes:
+        - name: primary
+          label: gentoo-17-0-systemd
+        - name: secondary
+          label: gentoo-17-0-systemd
+      groups:
+        - name: switch
+          nodes:
+            - primary
+        - name: peers
+          nodes:
+            - secondary
+
 - job:
     name: openstack-infra-multinode-integration-opensuse423
     parent: openstack-infra-multinode-integration
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 781d68e1..c38afe77 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -17,6 +17,12 @@
       - name: fedora-28
         label: fedora-28
 
+- nodeset:
+    name: gentoo-17-0-systemd
+    nodes:
+      - name: gentoo-17-0-systemd
+        label: gentoo-17-0-systemd
+
 - nodeset:
     name: opensuse-423
     nodes:
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 45fe3839..8e30a8eb 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -7,6 +7,7 @@
         - openstack-infra-base-integration-centos-7
         - openstack-infra-base-integration-debian-stable
         - openstack-infra-base-integration-fedora-latest
+        - openstack-infra-base-integration-gentoo-17-0-systemd
         - openstack-infra-base-integration-ubuntu-bionic
         - openstack-infra-base-integration-ubuntu-trusty
         - openstack-infra-base-integration-ubuntu-xenial
@@ -16,6 +17,7 @@
         - openstack-infra-multinode-integration-centos-7
         - openstack-infra-multinode-integration-debian-stable
         - openstack-infra-multinode-integration-fedora-latest
+        - openstack-infra-multinode-integration-gentoo-17-0-systemd
         - openstack-infra-multinode-integration-ubuntu-bionic
         - openstack-infra-multinode-integration-ubuntu-trusty
         - openstack-infra-multinode-integration-ubuntu-xenial
@@ -28,6 +30,7 @@
         - openstack-infra-base-integration-centos-7
         - openstack-infra-base-integration-debian-stable
         - openstack-infra-base-integration-fedora-latest
+        - openstack-infra-base-integration-gentoo-17-0-systemd
         - openstack-infra-base-integration-ubuntu-bionic
         - openstack-infra-base-integration-ubuntu-trusty
         - openstack-infra-base-integration-ubuntu-xenial
@@ -35,6 +38,7 @@
         - openstack-infra-multinode-integration-centos-7
         - openstack-infra-multinode-integration-debian-stable
         - openstack-infra-multinode-integration-fedora-latest
+        - openstack-infra-multinode-integration-gentoo-17-0-systemd
         - openstack-infra-multinode-integration-ubuntu-bionic
         - openstack-infra-multinode-integration-ubuntu-trusty
         - openstack-infra-multinode-integration-ubuntu-xenial