From 6a53ffa3ae67d3be73c8d0617489e349723136af Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 8 May 2020 08:12:37 -0500 Subject: [PATCH] Run accessbot less frequently We already run accessbot in project-config when the accessbot script changes. We don't need to run it whenever any of the puppet or other config on eavesdrop runs, not do we need to run it hourly. Just run it nightly and on changes to the actual accessbot config. Change-Id: Idd47f7c96f677fd1e1c8da3be262a52a70646acd --- zuul.d/infra-prod.yaml | 6 +++++- zuul.d/project.yaml | 9 +++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml index 255b0f8853..f32c459d7b 100644 --- a/zuul.d/infra-prod.yaml +++ b/zuul.d/infra-prod.yaml @@ -505,7 +505,11 @@ - infra-prod-service-eavesdrop vars: playbook_name: run-accessbot.yaml - files: *infra_prod_eavesdrop_files + files: + - accessbot/channels.yaml + - playbooks/run-accessbot.yaml + - playbooks/roles/accessbot + - docker/accessbot/ # Run AFS changes separately so we can make sure to only do one at a time # (turns out quorum is nice to have) diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 295b5d2e32..dccb443cb0 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -224,6 +224,11 @@ - infra-prod-service-gitea - infra-prod-service-codesearch - infra-prod-service-eavesdrop + - infra-prod-run-accessbot: + dependencies: + - infra-prod-service-eavesdrop + - name: system-config-promote-image-accessbot + soft: true - infra-prod-remote-puppet-afs - infra-prod-remote-puppet-else - infra-prod-run-cloud-launcher @@ -288,7 +293,3 @@ dependencies: - name: infra-prod-install-ansible soft: true - - infra-prod-run-accessbot: - dependencies: - - name: infra-prod-install-ansible - soft: true