diff --git a/gerrit/acls/osf/edge-computing-group.config b/gerrit/acls/openinfra/edge-computing-group.config similarity index 100% rename from gerrit/acls/osf/edge-computing-group.config rename to gerrit/acls/openinfra/edge-computing-group.config diff --git a/gerrit/acls/osf/four-opens.config b/gerrit/acls/openinfra/four-opens.config similarity index 100% rename from gerrit/acls/osf/four-opens.config rename to gerrit/acls/openinfra/four-opens.config diff --git a/gerrit/acls/osf/groups-static-pages.config b/gerrit/acls/openinfra/groups-static-pages.config similarity index 100% rename from gerrit/acls/osf/groups-static-pages.config rename to gerrit/acls/openinfra/groups-static-pages.config diff --git a/gerrit/acls/osf/groups.config b/gerrit/acls/openinfra/groups.config similarity index 100% rename from gerrit/acls/osf/groups.config rename to gerrit/acls/openinfra/groups.config diff --git a/gerrit/acls/osf/interop.config b/gerrit/acls/openinfra/interop.config similarity index 100% rename from gerrit/acls/osf/interop.config rename to gerrit/acls/openinfra/interop.config diff --git a/gerrit/acls/osf/odsreg.config b/gerrit/acls/openinfra/odsreg.config similarity index 100% rename from gerrit/acls/osf/odsreg.config rename to gerrit/acls/openinfra/odsreg.config diff --git a/gerrit/acls/osf/openstack-map.config b/gerrit/acls/openinfra/openstack-map.config similarity index 100% rename from gerrit/acls/osf/openstack-map.config rename to gerrit/acls/openinfra/openstack-map.config diff --git a/gerrit/acls/osf/openstackid-resources.config b/gerrit/acls/openinfra/openstackid-resources.config similarity index 100% rename from gerrit/acls/osf/openstackid-resources.config rename to gerrit/acls/openinfra/openstackid-resources.config diff --git a/gerrit/acls/osf/openstackid.config b/gerrit/acls/openinfra/openstackid.config similarity index 100% rename from gerrit/acls/osf/openstackid.config rename to gerrit/acls/openinfra/openstackid.config diff --git a/gerrit/acls/osf/openstackweb.config b/gerrit/acls/openinfra/openstackweb.config similarity index 100% rename from gerrit/acls/osf/openstackweb.config rename to gerrit/acls/openinfra/openstackweb.config diff --git a/gerrit/acls/osf/refstack.config b/gerrit/acls/openinfra/refstack.config similarity index 100% rename from gerrit/acls/osf/refstack.config rename to gerrit/acls/openinfra/refstack.config diff --git a/gerrit/acls/osf/transparency-policy.config b/gerrit/acls/openinfra/transparency-policy.config similarity index 100% rename from gerrit/acls/osf/transparency-policy.config rename to gerrit/acls/openinfra/transparency-policy.config diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index db240440a5..1e3aff55d8 100644 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -787,6 +787,70 @@ - openstack-ci - zuul description: Zone file for zuul-ci.org +- project: openinfra/edge-computing-group + description: General repository for the OpenInfra Edge Computing Group + use-storyboard: true +- project: openinfra/four-opens + description: A handbook on The Four Opens and how they are applied in the OpenStack + community. + use-storyboard: true +- project: openinfra/groups + use-storyboard: true + groups: + - groups-portal + description: OpenStack Groups community portal +- project: openinfra/groups-static-pages + use-storyboard: true + groups: + - groups-portal + description: Community portal static pages +- project: openinfra/interop + description: Data and documentation maintained by the Interop Working Group + use-storyboard: true + groups: + - interop +- project: openinfra/odsreg + use-storyboard: true + description: OpenStack Design Summit session management system +- project: openinfra/openstack-map + description: Base data to generate the OpenStack map and the Software section + of the www.openstack.org website. +- project: openinfra/openstackid + use-storyboard: true + description: Authentication system for the OpenStack Foundation site + groups: + - openstack-org +- project: openinfra/openstackid-resources + use-storyboard: true + description: Resource service for the OpenStack Foundation site + groups: + - openstack-org +- project: openinfra/openstackweb + use-storyboard: true + description: OpenStack Foundation web site software + groups: + - openstack-org +- project: openinfra/python-tempestconf + description: Automatic Tempest Configuration Generator + groups: + - refstack + use-storyboard: true + acl-config: /home/gerrit2/acls/openinfra/refstack.config +- project: openinfra/refstack + description: Vendor-facing API for registration of interop-compliance + groups: + - interop + - refstack + use-storyboard: true +- project: openinfra/refstack-client + description: Testing and result upload client for refstack + groups: + - interop + - refstack + use-storyboard: true + acl-config: /home/gerrit2/acls/openinfra/refstack.config +- project: openinfra/transparency-policy + description: OpenStack Foundation Transparency Policy. - project: openinfralabs/contrib description: Code Samples Contributed to OpenInfraLabs.org - project: openstack-attic/akanda @@ -5726,70 +5790,6 @@ - project: openstack/zuul-packaging description: RETIRED, Zuul packaging acl-config: /home/gerrit2/acls/openstack/retired.config -- project: osf/edge-computing-group - description: General repository for the OSF Edge Computing Group - use-storyboard: true -- project: osf/four-opens - description: A handbook on The Four Opens and how they are applied in the OpenStack - community. - use-storyboard: true -- project: osf/groups - use-storyboard: true - groups: - - groups-portal - description: OpenStack Groups community portal -- project: osf/groups-static-pages - use-storyboard: true - groups: - - groups-portal - description: Community portal static pages -- project: osf/interop - description: Data and documentation maintained by the Interop Working Group - use-storyboard: true - groups: - - interop -- project: osf/odsreg - use-storyboard: true - description: OpenStack Design Summit session management system -- project: osf/openstack-map - description: Base data to generate the OpenStack map and the Software section - of the www.openstack.org website. -- project: osf/openstackid - use-storyboard: true - description: Authentication system for the OpenStack Foundation site - groups: - - openstack-org -- project: osf/openstackid-resources - use-storyboard: true - description: Resource service for the OpenStack Foundation site - groups: - - openstack-org -- project: osf/openstackweb - use-storyboard: true - description: OpenStack Foundation web site software - groups: - - openstack-org -- project: osf/python-tempestconf - description: Automatic Tempest Configuration Generator - groups: - - refstack - use-storyboard: true - acl-config: /home/gerrit2/acls/osf/refstack.config -- project: osf/refstack - description: Vendor-facing API for registration of interop-compliance - groups: - - interop - - refstack - use-storyboard: true -- project: osf/refstack-client - description: Testing and result upload client for refstack - groups: - - interop - - refstack - use-storyboard: true - acl-config: /home/gerrit2/acls/osf/refstack.config -- project: osf/transparency-policy - description: OpenStack Foundation Transparency Policy. - project: performa/os-faults description: An OpenStack fault injection library - project: performa/shaker diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index babbb92f8c..5e9568b057 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -670,7 +670,7 @@ openstack-interop: - patchset-created - change-merged projects: - - osf/interop + - openinfra/interop branches: - master @@ -1662,9 +1662,9 @@ refstack: - change-merged projects: - opendev/puppet-refstack - - osf/python-tempestconf - - osf/refstack - - osf/refstack-client + - openinfra/python-tempestconf + - openinfra/refstack + - openinfra/refstack-client branches: - master diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 85ae917115..756823a26f 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -6,7 +6,7 @@ # run merge-check on third-party things like ansible # Add for former OpenStack repos that got renamed as part of # OpenDev change the system-required template as well: - name: ^(airship|jjb|starlingx|opendev|osf|performa|starlingx|ttygroup|windmill|x|zuul)/.* + name: ^(airship|jjb|starlingx|opendev|openinfra|performa|starlingx|ttygroup|windmill|x|zuul)/.* templates: - system-required @@ -1069,6 +1069,62 @@ files: zones/.* dependencies: [] +- project: + name: openinfra/groups + check: + jobs: + - legacy-groups-unittests + gate: + jobs: + - legacy-groups-unittests + post: + jobs: + - legacy-groups-release-branch + release: + jobs: + - legacy-groups-release-master + +- project: + name: openinfra/groups-static-pages + templates: + - noop-jobs + +- project: + name: openinfra/odsreg + templates: + - noop-jobs + +- project: + name: openinfra/openstackid + release: + jobs: + - openstackid-release-master + +- project: + name: openinfra/openstackid-resources + templates: + - noop-jobs + +- project: + name: openinfra/openstackweb + templates: + - noop-jobs + +- project: + name: openinfra/python-tempestconf + templates: + - publish-to-pypi + +- project: + name: openinfra/refstack + templates: + - publish-to-pypi + +- project: + name: openinfra/transparency-policy + templates: + - build-openstack-docs-pti + - project: name: openstack/adjutant templates: @@ -6174,62 +6230,6 @@ - translation-jobs-master-stable - publish-to-pypi -- project: - name: osf/groups - check: - jobs: - - legacy-groups-unittests - gate: - jobs: - - legacy-groups-unittests - post: - jobs: - - legacy-groups-release-branch - release: - jobs: - - legacy-groups-release-master - -- project: - name: osf/groups-static-pages - templates: - - noop-jobs - -- project: - name: osf/odsreg - templates: - - noop-jobs - -- project: - name: osf/openstackid - release: - jobs: - - openstackid-release-master - -- project: - name: osf/openstackid-resources - templates: - - noop-jobs - -- project: - name: osf/openstackweb - templates: - - noop-jobs - -- project: - name: osf/python-tempestconf - templates: - - publish-to-pypi - -- project: - name: osf/refstack - templates: - - publish-to-pypi - -- project: - name: osf/transparency-policy - templates: - - build-openstack-docs-pti - - project: name: performa/os-faults templates: diff --git a/zuul/main.yaml b/zuul/main.yaml index 7d616a98f1..a737c15a08 100644 --- a/zuul/main.yaml +++ b/zuul/main.yaml @@ -243,6 +243,20 @@ - opendev/zone-gating.dev - opendev/zone-opendev.org - opendev/zone-zuul-ci.org + - openinfra/edge-computing-group + - openinfra/four-opens + - openinfra/groups + - openinfra/groups-static-pages + - openinfra/interop + - openinfra/odsreg + - openinfra/openstack-map + - openinfra/openstackid + - openinfra/openstackid-resources + - openinfra/openstackweb + - openinfra/python-tempestconf + - openinfra/refstack + - openinfra/refstack-client + - openinfra/transparency-policy - openstack/adjutant - openstack/adjutant-ui - openstack/ansible-collections-openstack @@ -978,20 +992,6 @@ - openstack/zun - openstack/zun-tempest-plugin - openstack/zun-ui - - osf/edge-computing-group - - osf/four-opens - - osf/groups - - osf/groups-static-pages - - osf/interop - - osf/odsreg - - osf/openstack-map - - osf/openstackid - - osf/openstackid-resources - - osf/openstackweb - - osf/python-tempestconf - - osf/refstack - - osf/refstack-client - - osf/transparency-policy - performa/os-faults - performa/shaker - sardonic/sardonic