From c6d2d35efcaf38c7ad428b9a3f555ea649cf718b Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 8 May 2020 21:20:47 +0200
Subject: [PATCH] Finish retiring x/pbrx

Depends-On: https://review.opendev.org/726462
Change-Id: I0a5b2a352cdbf443976b18db4e4d210e4c7af581
---
 gerrit/acls/x/pbrx.config     | 14 --------------
 gerrit/projects.yaml          |  4 ++--
 gerritbot/channels.yaml       |  1 -
 playbooks/pbrx-push/post.yaml | 18 ------------------
 zuul.d/projects.yaml          |  5 -----
 zuul/main.yaml                |  1 -
 6 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 gerrit/acls/x/pbrx.config
 delete mode 100644 playbooks/pbrx-push/post.yaml

diff --git a/gerrit/acls/x/pbrx.config b/gerrit/acls/x/pbrx.config
deleted file mode 100644
index a1152d8964..0000000000
--- a/gerrit/acls/x/pbrx.config
+++ /dev/null
@@ -1,14 +0,0 @@
-[access "refs/heads/*"]
-abandon = group pbrx-core
-label-Code-Review = -2..+2 group pbrx-core
-label-Workflow = -1..+1 group pbrx-core
-
-[access "refs/tags/*"]
-pushSignedTag = group pbrx-release
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 3689861e8b..541ea68f66 100644
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -7505,8 +7505,8 @@
 - project: x/pandaman
   description: ITDB Service for OpenStack
 - project: x/pbrx
-  description: Utilities for projects using pbr
-  use-storyboard: true
+  description: RETIRED, Utilities for projects using pbr
+  acl-config: /home/gerrit2/acls/openstack/retired.config
 - project: x/performa
   description: Distributed scenario runner, results processor and report generator
 - project: x/picasso
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index e419f37813..c21abaaf51 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -1923,7 +1923,6 @@ zuul:
     - change-merged
   projects:
     - opendev/zone-zuul-ci.org
-    - x/pbrx
     - zuul/gcp-authdaemon
     - zuul/nodepool
     - zuul/project-config
diff --git a/playbooks/pbrx-push/post.yaml b/playbooks/pbrx-push/post.yaml
deleted file mode 100644
index 50d65f4962..0000000000
--- a/playbooks/pbrx-push/post.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-- hosts: all
-  tasks:
-
-    - name: Docker Hub login
-      command: docker login -u {{ openstackzuul_docker_login.user }} -p {{ openstackzuul_docker_login.password }}
-      no_log: True
-
-    - block:
-
-       - name: Push prefixed container images
-         command: 'pbrx --debug push-images --prefix={{ pbrx_prefix }}'
-         args:
-           chdir: '{{ zuul_work_dir|default(zuul.project.src_dir) }}'
-
-      always:
-
-       - name: Docker Hub logout
-         command: docker logout
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 5211e1aee4..d79e994cf5 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -8026,11 +8026,6 @@
     templates:
       - openstack-python-jobs
 
-- project:
-    name: x/pbrx
-    templates:
-      - noop-jobs
-
 - project:
     name: x/performa
     templates:
diff --git a/zuul/main.yaml b/zuul/main.yaml
index 05d7f9053b..2275a0df0f 100644
--- a/zuul/main.yaml
+++ b/zuul/main.yaml
@@ -1346,7 +1346,6 @@
           - x/packetary-specs
           - x/packstack
           - x/pandaman
-          - x/pbrx
           - x/performa
           - x/picasso
           - x/poppy