Merge "Migrate gitea-lb to zuul"

This commit is contained in:
Zuul 2020-04-03 13:44:45 +00:00 committed by Gerrit Code Review
commit 72aa41b1fe
2 changed files with 14 additions and 4 deletions

View File

@ -1522,6 +1522,18 @@
- playbooks/templates/clouds/bridge_clouds.yaml.j2 - playbooks/templates/clouds/bridge_clouds.yaml.j2
- playbooks/templates/clouds/bridge_all_clouds.yaml.j2 - playbooks/templates/clouds/bridge_all_clouds.yaml.j2
- job:
name: infra-prod-service-gitea-lb
parent: infra-prod-service-base
description: Run service-gitea-lb.yaml playbook
vars:
playbook_name: service-gitea-lb.yaml
files:
- playbooks/service-gitea-lb.yaml
- playbooks/group_vars/gitea-lb.yaml
- playbooks/roles/install-docker/.*
- playbooks/roles/haproxy/.*
- job: - job:
name: system-config-goaccess-report name: system-config-goaccess-report
description: | description: |
@ -1870,6 +1882,7 @@
- name: infra-prod-install-ansible - name: infra-prod-install-ansible
soft: true soft: true
- infra-prod-service-bridge - infra-prod-service-bridge
- infra-prod-service-gitea-lb
periodic: periodic:
jobs: jobs:
- developer-openstack-goaccess-report - developer-openstack-goaccess-report
@ -1887,3 +1900,4 @@
- infra-prod-install-ansible - infra-prod-install-ansible
- infra-prod-base - infra-prod-base
- infra-prod-service-bridge - infra-prod-service-bridge
- infra-prod-service-gitea-lb

View File

@ -72,10 +72,6 @@ set +e
# Run all the ansible playbooks under timeout to prevent them from getting # Run all the ansible playbooks under timeout to prevent them from getting
# stuck if they are oomkilled # stuck if they are oomkilled
start_timer
timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-gitea-lb.yaml
send_timer gitea-lb
start_timer start_timer
timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-letsencrypt.yaml timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-letsencrypt.yaml
send_timer letsencrypt send_timer letsencrypt