From 1987f86a9ab9f5f4579b27bb89569131de400e15 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 2 Dec 2021 19:10:59 +0000 Subject: [PATCH] Revert "infra-prod: clone source once" This reverts commit 42df57b545d6f8dd314678174c281c249171c1d0. This reverts commit 9cccb02bb09671fc98e42b335e649589610b33cf. Change-Id: I56be9bcf54b634b7403e71af8b4d08d234cbb91a Depends-On: https://review.opendev.org/820251 --- .../zuul/setup-production-workspace.yaml | 6 ------ zuul.d/infra-prod.yaml | 20 +------------------ zuul.d/project.yaml | 7 +------ 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 playbooks/zuul/setup-production-workspace.yaml diff --git a/playbooks/zuul/setup-production-workspace.yaml b/playbooks/zuul/setup-production-workspace.yaml deleted file mode 100644 index 3d78705c48..0000000000 --- a/playbooks/zuul/setup-production-workspace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- hosts: bridge.openstack.org - become: true - tasks: - - name: Placeholder - debug: - msg: 'Setup production workspace tasks running' diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml index c6625e7a11..6d1a505ddb 100644 --- a/zuul.d/infra-prod.yaml +++ b/zuul.d/infra-prod.yaml @@ -7,27 +7,9 @@ name: infra-prod-playbook max: 1 -# This job is intended to run first and setup the bridge source repo -# to the state of the current buildset. After this, deployment jobs -# can run in parallel using this source checkout. -- job: - name: infra-prod-setup-src - parent: opendev-infra-prod-setup-src - description: | - Replicate Zuul source repos to bridge - - This replicates the Zuul source state to the bridge node. This - should be run once per buildset. - semaphores: infra-prod-playbook - # The action actually happens in opendev-infra-prod-setup-src - # because it's a trusted playbook. But this might be a handy - # place to hook in things such as writing out secrets from Zuul in - # the future? - run: playbooks/zuul/setup-production-workspace.yaml - - job: name: infra-prod-playbook - parent: opendev-infra-prod-setup-keys + parent: opendev-infra-prod-base description: | Run specified playbook against productions hosts. diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index e2ef5e7567..6ef1a7b55e 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -353,15 +353,10 @@ # dependencies here rather than job definitions to help keep # these relationships clear. - # This job replicates the system-config from this buildset - # onto bridge - - infra-prod-setup-src - # This installs the ansible on bridge that all the infra-prod # jobs will run with. Note the jobs use this ansible to then # run against zuul's checkout of system-config. - - infra-prod-install-ansible: - dependencies: infra-prod-setup-src + - infra-prod-install-ansible # From now on, all jobs should depend on base - infra-prod-base: &infra-prod-base