Add support for zuul-fingergw

Change-Id: Ifdff6b4130ecc6c1623d7596d158b58d04592536
Depends-On: https://review.openstack.org/550547
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

.zuul.d/jobs.yaml

@@ -67,6 +67,7 @@
             - nb01
             - nl01
             - ze01
+            - zf01
             - zk01
             - zm01
             - zs01
@@ -88,6 +89,9 @@
         - name: zuul-executor
           nodes:
             - ze01
+        - name: zuul-fingergw
+          nodes:
+            - zf01
         - name: zuul-merger
           nodes:
             - zm01
@@ -109,6 +113,7 @@
             - nb01
             - nl01
             - ze01
+            - zf01
             - zk01
             - zm01
             - zs01
@@ -130,6 +135,9 @@
         - name: zuul-executor
           nodes:
             - ze01
+        - name: zuul-fingergw
+          nodes:
+            - zf01
         - name: zuul-merger
           nodes:
             - zm01
@@ -151,6 +159,7 @@
             - nb01
             - nl01
             - ze01
+            - zf01
             - zk01
             - zm01
             - zs01
@@ -172,6 +181,9 @@
         - name: zuul-executor
           nodes:
             - ze01
+        - name: zuul-fingergw
+          nodes:
+            - zf01
         - name: zuul-merger
           nodes:
             - zm01

playbooks/group_vars/zuul-executor.yaml

@@ -18,6 +18,9 @@ zuul_file_zuul_executor_service_config_src: zuul/etc/systemd/system/zuul-executo
 zuul_pip_virtualenv_python: python3
 zuul_pip_virtualenv: /opt/venv/zuul-executor
 
+zuul_file_zuul_fingergw_service_config_manage: false
+zuul_file_zuul_fingergw_service_manage: false
+
 zuul_file_zuul_merger_service_config_manage: false
 zuul_file_zuul_merger_service_manage: false
 
@@ -27,6 +30,10 @@ zuul_file_zuul_scheduler_service_manage: false
 zuul_file_zuul_web_service_config_manage: false
 zuul_file_zuul_web_service_manage: false
 
+zuul_service_zuul_fingergw_enabled: no
+zuul_service_zuul_fingergw_manage: false
+zuul_service_zuul_fingergw_state: stopped
+
 zuul_service_zuul_merger_enabled: no
 zuul_service_zuul_merger_manage: false
 zuul_service_zuul_merger_state: stopped

playbooks/group_vars/zuul-fingergw.yaml

@@ -0,0 +1,51 @@
+# Copyright 2016 Red Hat, 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.
+---
+# windmill.zuul
+zuul_file_zuul_fingergw_service_config_src: zuul/etc/systemd/system/zuul-fingergw.service.d/override.conf.j2
+
+zuul_pip_virtualenv_python: python3
+zuul_pip_virtualenv: /opt/venv/zuul-fingergw
+
+zuul_file_zuul_executor_service_config_manage: false
+zuul_file_zuul_executor_service_manage: false
+
+zuul_file_zuul_merger_service_config_manage: false
+zuul_file_zuul_merger_service_manage: false
+
+zuul_file_zuul_scheduler_service_config_manage: false
+zuul_file_zuul_scheduler_service_manage: false
+
+zuul_file_zuul_web_service_config_manage: false
+zuul_file_zuul_web_service_manage: false
+
+zuul_service_zuul_executor_enabled: no
+zuul_service_zuul_executor_manage: false
+zuul_service_zuul_executor_state: stopped
+
+zuul_service_zuul_merger_enabled: no
+zuul_service_zuul_merger_manage: false
+zuul_service_zuul_merger_state: stopped
+
+zuul_service_zuul_scheduler_enabled: no
+zuul_service_zuul_scheduler_manage: false
+zuul_service_zuul_scheduler_state: stopped
+
+zuul_service_zuul_web_enabled: no
+zuul_service_zuul_web_manage: false
+zuul_service_zuul_web_state: stopped
+
+zuul_user_name: zuul-test
+zuul_user_group: zuul-test
+zuul_user_home: /var/lib/zuul

playbooks/group_vars/zuul-merger.yaml

@@ -21,6 +21,9 @@ zuul_pip_virtualenv: /opt/venv/zuul-merger
 zuul_file_zuul_executor_service_config_manage: false
 zuul_file_zuul_executor_service_manage: false
 
+zuul_file_zuul_fingergw_service_config_manage: false
+zuul_file_zuul_fingergw_service_manage: false
+
 zuul_file_zuul_scheduler_service_config_manage: false
 zuul_file_zuul_scheduler_service_manage: false
 
@@ -31,6 +34,10 @@ zuul_service_zuul_executor_enabled: no
 zuul_service_zuul_executor_manage: false
 zuul_service_zuul_executor_state: stopped
 
+zuul_service_zuul_fingergw_enabled: no
+zuul_service_zuul_fingergw_manage: false
+zuul_service_zuul_fingergw_state: stopped
+
 zuul_service_zuul_scheduler_enabled: no
 zuul_service_zuul_scheduler_manage: false
 zuul_service_zuul_scheduler_state: stopped

playbooks/group_vars/zuul-scheduler.yaml

@@ -21,6 +21,9 @@ zuul_pip_virtualenv: /opt/venv/zuul-scheduler
 zuul_file_zuul_executor_service_config_manage: false
 zuul_file_zuul_executor_service_manage: false
 
+zuul_file_zuul_fingergw_service_config_manage: false
+zuul_file_zuul_fingergw_service_manage: false
+
 zuul_file_zuul_merger_service_config_manage: false
 zuul_file_zuul_merger_service_manage: false
 
@@ -31,6 +34,10 @@ zuul_service_zuul_executor_enabled: no
 zuul_service_zuul_executor_manage: false
 zuul_service_zuul_executor_state: stopped
 
+zuul_service_zuul_fingergw_enabled: no
+zuul_service_zuul_fingergw_manage: false
+zuul_service_zuul_fingergw_state: stopped
+
 zuul_service_zuul_merger_enabled: no
 zuul_service_zuul_merger_manage: false
 zuul_service_zuul_merger_state: stopped

playbooks/group_vars/zuul-web.yaml

@@ -21,6 +21,9 @@ zuul_pip_virtualenv: /opt/venv/zuul-web
 zuul_file_zuul_executor_service_config_manage: false
 zuul_file_zuul_executor_service_manage: false
 
+zuul_file_zuul_fingergw_service_config_manage: false
+zuul_file_zuul_fingergw_service_manage: false
+
 zuul_file_zuul_merger_service_config_manage: false
 zuul_file_zuul_merger_service_manage: false
 
@@ -31,6 +34,10 @@ zuul_service_zuul_executor_enabled: no
 zuul_service_zuul_executor_manage: false
 zuul_service_zuul_executor_state: stopped
 
+zuul_service_zuul_fingergw_enabled: no
+zuul_service_zuul_fingergw_manage: false
+zuul_service_zuul_fingergw_state: stopped
+
 zuul_service_zuul_merger_enabled: no
 zuul_service_zuul_merger_manage: false
 zuul_service_zuul_merger_state: stopped

playbooks/roles/test.zuul-fingergw/tasks/main.yaml

@@ -0,0 +1,29 @@
+# Copyright 2016 Red Hat, 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.
+---
+- name: Register /opt/venv/zuul-fingergw
+  stat:
+    path: /opt/venv/zuul-fingergw
+  register: test_zuul_pip_virtualenv_stat
+
+- name: Assert /opt/venv/zuul-fingergw tests
+  assert:
+    that:
+      - test_zuul_pip_virtualenv_stat.stat.exists
+      - test_zuul_pip_virtualenv_stat.stat.isdir
+
+- name: Ensure zuul-fingergw is running
+  become: yes
+  shell: /usr/sbin/service zuul-fingergw status
+  tags: skip_ansible_lint

playbooks/site.yaml

@@ -18,6 +18,7 @@
 - include: nodepool-builder.yaml
 - include: nodepool-launcher.yaml
 - include: zuul-executor.yaml
+- include: zuul-fingergw.yaml
 - include: zuul-merger.yaml
 - include: zuul-scheduler.yaml
 - include: zuul-web.yaml

playbooks/templates/zuul/etc/systemd/system/zuul-fingergw.service.d/override.conf.j2

@@ -0,0 +1,5 @@
+# This file is generated by Ansible
+#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
+#
+[Service]
+Environment="PREFIX={{ zuul_pip_virtualenv }}"

playbooks/templates/zuul/etc/zuul/zuul.conf.j2

@@ -25,6 +25,11 @@ finger_port = 17979
 log_config = /etc/zuul/executor-logging.conf
 workspace_root = {{ zuul_user_home }}/workspace
 
+[fingergw]
+listen_address = 0.0.0.0
+log_config = /etc/zuul/fingergw-logging.conf
+user = {{ zuul_user_name }}
+
 [merger]
 git_dir = {{ zuul_user_home }}/git
 log_config = /etc/zuul/merger-logging.conf

playbooks/zuul-fingergw.yaml

@@ -0,0 +1,29 @@
+# Copyright 2016 Red Hat, 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.
+---
+- name: Install zuul-fingergw.
+  hosts: zuul-fingergw
+
+  tasks:
+    - name: Setup openstack.zuul role.
+      include_role:
+        name: openstack.zuul
+
+  post_tasks:
+    - name: Run zuul-fingergw validation.
+      include_role:
+        name: test.zuul-fingergw
+
+  vars_files:
+    - vars/zuul.yaml

tests/collect-logs.yaml

@@ -10,6 +10,7 @@
         - "{{ zuul.executor.log_root }}/logs/nb01/var/log"
         - "{{ zuul.executor.log_root }}/logs/nl01/var/log"
         - "{{ zuul.executor.log_root }}/logs/ze01/var/log"
+        - "{{ zuul.executor.log_root }}/logs/zf01/var/log"
         - "{{ zuul.executor.log_root }}/logs/zm01/var/log"
         - "{{ zuul.executor.log_root }}/logs/zs01/var/log"
         - "{{ zuul.executor.log_root }}/logs/zw01/var/log"
@@ -158,6 +159,43 @@
         - /var/log/zuul/executor-debug.log
         - /var/log/zuul/executor.log
 
+- hosts: zf01
+  tasks:
+    - name: Ensure journald logs directory exists
+      file:
+        path: "~/logs/{{ inventory_hostname }}/journal"
+        state: directory
+
+    - name: Collect journald logs
+      become: yes
+      shell: "journalctl -u {{ item }}.service > /home/{{ ansible_user }}/logs/{{ inventory_hostname }}/journal/{{ item }}.service.log"
+      args:
+        creates: "/home/{{ ansible_user }}/logs/{{ inventory_hostname }}/journal/{{ item }}.service.log"
+      with_items:
+        - zuul-fingergw
+
+    - name: Collect journald log files
+      synchronize:
+        dest: "{{ zuul.executor.log_root }}/logs/{{ inventory_hostname }}/var/log"
+        mode: pull
+        src: "~/logs/{{ inventory_hostname }}/journal"
+        verify_host: true
+
+    - name: Collect zf01 log files
+      synchronize:
+        dest: "{{ zuul.executor.log_root }}/logs/{{ inventory_hostname}}"
+        mode: pull
+        rsync_opts:
+          - "--relative"
+        src: "{{ item }}"
+        verify_host: true
+      with_items:
+        - /etc/zuul/fingergw-logging.conf
+        - /etc/zuul/config
+        - /etc/zuul/zuul.conf
+        - /var/log/zuul/fingergw-debug.log
+        - /var/log/zuul/fingergw.log
+
 - hosts: zm01
   tasks:
     - name: Ensure journald logs directory exists