Merge "Run service-bridge in zuul and semaphore everything"
This commit is contained in:
commit
b255ea9436
46
.zuul.yaml
46
.zuul.yaml
|
@ -1395,6 +1395,11 @@
|
||||||
'/etc/apache2/': logs
|
'/etc/apache2/': logs
|
||||||
'/var/log/apache2/': logs
|
'/var/log/apache2/': logs
|
||||||
|
|
||||||
|
# Make sure only one run of a system-config playbook happens at a time
|
||||||
|
- semaphore:
|
||||||
|
name: infra-prod-playbook
|
||||||
|
max: 1
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: infra-prod-playbook
|
name: infra-prod-playbook
|
||||||
description: |
|
description: |
|
||||||
|
@ -1405,6 +1410,7 @@
|
||||||
specify the playbook relative to
|
specify the playbook relative to
|
||||||
bridge.openstack.org:/opt/system-config/playbooks
|
bridge.openstack.org:/opt/system-config/playbooks
|
||||||
abstract: true
|
abstract: true
|
||||||
|
semaphore: infra-prod-playbook
|
||||||
run: playbooks/zuul/run-production-playbook.yaml
|
run: playbooks/zuul/run-production-playbook.yaml
|
||||||
vars:
|
vars:
|
||||||
ansible_forks: 5
|
ansible_forks: 5
|
||||||
|
@ -1423,10 +1429,6 @@
|
||||||
vars:
|
vars:
|
||||||
playbook_name: zuul_reconfigure.yaml
|
playbook_name: zuul_reconfigure.yaml
|
||||||
|
|
||||||
# Make sure only one run of manage-projects happens at a time
|
|
||||||
- semaphore:
|
|
||||||
name: infra-prod-manage-projects-runs
|
|
||||||
max: 1
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: infra-prod-update-system-config
|
name: infra-prod-update-system-config
|
||||||
|
@ -1485,10 +1487,40 @@
|
||||||
allowed-projects:
|
allowed-projects:
|
||||||
- opendev/system-config
|
- opendev/system-config
|
||||||
- openstack/project-config
|
- openstack/project-config
|
||||||
semaphore: infra-prod-manage-projects-runs
|
|
||||||
vars:
|
vars:
|
||||||
playbook_name: manage-projects.yaml
|
playbook_name: manage-projects.yaml
|
||||||
ansible_forks: 50
|
ansible_forks: 10
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: infra-prod-service-base
|
||||||
|
parent: infra-prod-playbook
|
||||||
|
description: Base job for most service playbooks
|
||||||
|
abstract: true
|
||||||
|
dependencies:
|
||||||
|
- name: infra-prod-update-system-config
|
||||||
|
- name: infra-prod-install-ansible
|
||||||
|
soft: true
|
||||||
|
- name: infra-prod-base
|
||||||
|
soft: true
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: infra-prod-service-bridge
|
||||||
|
parent: infra-prod-service-base
|
||||||
|
description: Run service-bridge.yaml playbook
|
||||||
|
semaphore: infra-prod-service-bridge
|
||||||
|
vars:
|
||||||
|
playbook_name: service-bridge.yaml
|
||||||
|
files:
|
||||||
|
- playbooks/service-bridge.yaml
|
||||||
|
- playbooks/host_vars/bridge.openstack.org.yaml
|
||||||
|
- playbooks/roles/ansible-cron/.*
|
||||||
|
- playbooks/roles/cloud-launcher-cron/.*
|
||||||
|
- playbooks/roles/edit-secrets-script/.*
|
||||||
|
- playbooks/roles/install-kubectl/.*
|
||||||
|
- playbooks/roles/configure-kubectl/.*
|
||||||
|
- playbooks/roles/configure-openstacksdk/.*
|
||||||
|
- playbooks/templates/clouds/bridge_clouds.yaml.j2
|
||||||
|
- playbooks/templates/clouds/bridge_all_clouds.yaml.j2
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: system-config-goaccess-report
|
name: system-config-goaccess-report
|
||||||
|
@ -1837,6 +1869,7 @@
|
||||||
- name: infra-prod-update-system-config
|
- name: infra-prod-update-system-config
|
||||||
- name: infra-prod-install-ansible
|
- name: infra-prod-install-ansible
|
||||||
soft: true
|
soft: true
|
||||||
|
- infra-prod-service-bridge
|
||||||
periodic:
|
periodic:
|
||||||
jobs:
|
jobs:
|
||||||
- developer-openstack-goaccess-report
|
- developer-openstack-goaccess-report
|
||||||
|
@ -1853,3 +1886,4 @@
|
||||||
- infra-prod-update-system-config
|
- infra-prod-update-system-config
|
||||||
- infra-prod-install-ansible
|
- infra-prod-install-ansible
|
||||||
- infra-prod-base
|
- infra-prod-base
|
||||||
|
- infra-prod-service-bridge
|
||||||
|
|
|
@ -72,11 +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
|
||||||
|
|
||||||
# Service playbooks
|
|
||||||
start_timer
|
|
||||||
timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-bridge.yaml
|
|
||||||
send_timer service-bridge
|
|
||||||
|
|
||||||
start_timer
|
start_timer
|
||||||
timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-gitea-lb.yaml
|
timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-gitea-lb.yaml
|
||||||
send_timer gitea-lb
|
send_timer gitea-lb
|
||||||
|
|
Loading…
Reference in New Issue