Add support for zuul-web

Zuulv3 created a new zuul-web process, update our playbooks to start
using it.

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

.zuul.d/jobs.yaml

@@ -61,6 +61,7 @@
             - zk01
             - zm01
             - zs01
+            - zw01
           label: fedora-27
       groups:
         - name: gear
@@ -84,6 +85,9 @@
         - name: zuul-scheduler
           nodes:
             - zs01
+        - name: zuul-web
+          nodes:
+            - zw01
 
 - job:
     name: windmill-ubuntu-bionic
@@ -99,6 +103,7 @@
             - zk01
             - zm01
             - zs01
+            - zw01
           label: ubuntu-bionic
       groups:
         - name: gear
@@ -122,6 +127,9 @@
         - name: zuul-scheduler
           nodes:
             - zs01
+        - name: zuul-web
+          nodes:
+            - zw01
 
 - job:
     name: windmill-ubuntu-xenial
@@ -137,6 +145,7 @@
             - zk01
             - zm01
             - zs01
+            - zw01
           label: ubuntu-xenial
       groups:
         - name: gear
@@ -160,3 +169,6 @@
         - name: zuul-scheduler
           nodes:
             - zs01
+        - name: zuul-web
+          nodes:
+            - zw01

playbooks/group_vars/zuul-executor.yaml

@@ -24,6 +24,9 @@ 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_merger_enabled: no
 zuul_service_zuul_merger_manage: false
 zuul_service_zuul_merger_state: stopped
@@ -32,6 +35,10 @@ 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

@@ -24,6 +24,9 @@ zuul_file_zuul_executor_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
@@ -32,6 +35,10 @@ 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-scheduler.yaml

@@ -24,6 +24,9 @@ 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_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
@@ -32,6 +35,10 @@ zuul_service_zuul_merger_enabled: no
 zuul_service_zuul_merger_manage: false
 zuul_service_zuul_merger_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-web.yaml

@@ -0,0 +1,44 @@
+# 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_web_service_config_src: zuul/etc/systemd/system/zuul-web.service.d/override.conf.j2
+
+zuul_pip_virtualenv_python: python3
+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_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_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_user_name: zuul-test
+zuul_user_group: zuul-test
+zuul_user_home: /var/lib/zuul

playbooks/roles/test.zuul-web/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-web
+  stat:
+    path: /opt/venv/zuul-web
+  register: test_zuul_pip_virtualenv_stat
+
+- name: Assert /opt/venv/zuul-web tests
+  assert:
+    that:
+      - test_zuul_pip_virtualenv_stat.stat.exists
+      - test_zuul_pip_virtualenv_stat.stat.isdir
+
+- name: Ensure zuul-web is running
+  become: yes
+  shell: /usr/sbin/service zuul-web status
+  tags: skip_ansible_lint

playbooks/site.yaml

@@ -20,3 +20,4 @@
 - include: zuul-executor.yaml
 - include: zuul-merger.yaml
 - include: zuul-scheduler.yaml
+- include: zuul-web.yaml

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

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

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

@@ -30,3 +30,7 @@ git_dir = {{ zuul_user_home }}/git
 log_config = /etc/zuul/merger-logging.conf
 pidfile = /var/run/zuul-merger/zuul-merger.pid
 zuul_url = {{ hostvars['zs01'].ansible_host }}
+
+[web]
+log_config = /etc/zuul/web-logging.conf
+listen_address = {{ hostvars['zw01'].ansible_host }}

playbooks/zuul-web.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-web.
+  hosts: zuul-web
+
+  tasks:
+    - name: Setup openstack.zuul role.
+      include_role:
+        name: openstack.zuul
+
+  post_tasks:
+    - name: Run zuul-web validation.
+      include_role:
+        name: test.zuul-web
+
+  vars_files:
+    - vars/zuul.yaml

tests/collect-logs.yaml

@@ -102,3 +102,20 @@
         - /etc/zuul/zuul.conf
         - /var/log/zuul/scheduler-debug.log
         - /var/log/zuul/scheduler.log
+
+- hosts: zw01
+  tasks:
+    - name: Collect zw01 log files
+      synchronize:
+        dest: "{{ zuul.executor.log_root }}/logs/zw01"
+        mode: pull
+        rsync_opts:
+          - "--relative"
+        src: "{{ item }}"
+        verify_host: true
+      with_items:
+        - /etc/zuul/config
+        - /etc/zuul/web-logging.conf
+        - /etc/zuul/zuul.conf
+        - /var/log/zuul/web-debug.log
+        - /var/log/zuul/web.log