From 724c2d3b8c8476388e1c4da5f69e3011009c3ef2 Mon Sep 17 00:00:00 2001 From: Devdatta Kulkarni Date: Mon, 13 Jul 2015 13:29:12 -0500 Subject: [PATCH] Rename stackforge/solum -> openstack/solum The TC voted to let Solum join the big tent. So changing locations of solum repositories from stackforge to openstack Depends-On: Id74222381910f006a5a69f9e3746101bd4a32e12 Change-Id: I6508b0ec0ce2f58b991285987e6e5861c8b5ceb3 --- .../{stackforge => openstack}/solum.config | 0 .../acls/stackforge/python-solumclient.config | 14 --- gerrit/acls/stackforge/solum-dashboard.config | 14 --- .../stackforge/solum-infra-guestagent.config | 14 --- gerrit/acls/stackforge/solum-specs.config | 11 -- gerrit/projects.yaml | 27 ++-- gerritbot/channels.yaml | 10 +- jenkins/jobs/projects.yaml | 5 +- jenkins/jobs/solum.yaml | 4 +- zuul/layout.yaml | 118 +++++++++--------- 10 files changed, 85 insertions(+), 132 deletions(-) rename gerrit/acls/{stackforge => openstack}/solum.config (100%) delete mode 100644 gerrit/acls/stackforge/python-solumclient.config delete mode 100644 gerrit/acls/stackforge/solum-dashboard.config delete mode 100644 gerrit/acls/stackforge/solum-infra-guestagent.config delete mode 100644 gerrit/acls/stackforge/solum-specs.config diff --git a/gerrit/acls/stackforge/solum.config b/gerrit/acls/openstack/solum.config similarity index 100% rename from gerrit/acls/stackforge/solum.config rename to gerrit/acls/openstack/solum.config diff --git a/gerrit/acls/stackforge/python-solumclient.config b/gerrit/acls/stackforge/python-solumclient.config deleted file mode 100644 index 8977d23a4e..0000000000 --- a/gerrit/acls/stackforge/python-solumclient.config +++ /dev/null @@ -1,14 +0,0 @@ -[access "refs/heads/*"] -abandon = group solum-core -label-Code-Review = -2..+2 group solum-core -label-Workflow = -1..+1 group solum-core - -[access "refs/tags/*"] -pushSignedTag = group solum-release - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/stackforge/solum-dashboard.config b/gerrit/acls/stackforge/solum-dashboard.config deleted file mode 100644 index 8977d23a4e..0000000000 --- a/gerrit/acls/stackforge/solum-dashboard.config +++ /dev/null @@ -1,14 +0,0 @@ -[access "refs/heads/*"] -abandon = group solum-core -label-Code-Review = -2..+2 group solum-core -label-Workflow = -1..+1 group solum-core - -[access "refs/tags/*"] -pushSignedTag = group solum-release - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/stackforge/solum-infra-guestagent.config b/gerrit/acls/stackforge/solum-infra-guestagent.config deleted file mode 100644 index 8977d23a4e..0000000000 --- a/gerrit/acls/stackforge/solum-infra-guestagent.config +++ /dev/null @@ -1,14 +0,0 @@ -[access "refs/heads/*"] -abandon = group solum-core -label-Code-Review = -2..+2 group solum-core -label-Workflow = -1..+1 group solum-core - -[access "refs/tags/*"] -pushSignedTag = group solum-release - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/stackforge/solum-specs.config b/gerrit/acls/stackforge/solum-specs.config deleted file mode 100644 index dd6b723c9c..0000000000 --- a/gerrit/acls/stackforge/solum-specs.config +++ /dev/null @@ -1,11 +0,0 @@ -[access "refs/heads/*"] -abandon = group solum-core -label-Code-Review = -2..+2 group solum-core -label-Workflow = -1..+1 group solum-core - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 102cc0b94e..4d44ed4ff2 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -1596,6 +1596,9 @@ - translate - project: openstack/python-saharaclient description: Python bindings and CLI for Sahara. +- project: openstack/python-solumclient + description: 'Client library to Solum API. See: https://wiki.openstack.org/wiki/Solum' + acl-config: /home/gerrit2/acls/openstack/solum.config - project: openstack/python-swiftclient docimpact-group: openstack-manuals description: OpenStack Storage (Swift) Client @@ -1675,6 +1678,19 @@ - translate - project: openstack/security-specs description: OpenStack Security Specifications +- project: openstack/solum + description: 'An OpenStack project designed to make cloud services easier + to consume and integrate into your application development process. See: https://wiki.openstack.org/wiki/Solum' + acl-config: /home/gerrit2/acls/openstack/solum.config +- project: openstack/solum-dashboard + description: 'Horizon plugin for Solum. See: https://wiki.openstack.org/wiki/Solum' + acl-config: /home/gerrit2/acls/openstack/solum.config +- project: openstack/solum-infra-guestagent + description: 'Guest agent for Solum. See: https://wiki.openstack.org/wiki/Solum' + acl-config: /home/gerrit2/acls/openstack/solum.config +- project: openstack/solum-specs + description: Solum Design Specifications + acl-config: /home/gerrit2/acls/openstack/solum.config - project: openstack/stevedore groups: - python-stevedore @@ -2617,8 +2633,6 @@ - project: stackforge/python-senlinclient description: Client library for Senlin API acl-config: /home/gerrit2/acls/stackforge/senlin.config -- project: stackforge/python-solumclient - description: 'Client library to Solum API. See: https://wiki.openstack.org/wiki/Solum' - project: stackforge/python-sticksclient description: Python client library for sticks API acl-config: /home/gerrit2/acls/stackforge/cerberus.config @@ -2667,15 +2681,6 @@ description: The UI component for Senlin - project: stackforge/shaker description: Distributed data-plane performance testing tool -- project: stackforge/solum - description: 'An OpenStack related project designed to make cloud services easier - to consume and integrate into your application development process. See: https://wiki.openstack.org/wiki/Solum' -- project: stackforge/solum-dashboard - description: 'Horizon plugin for Solum. See: https://wiki.openstack.org/wiki/Solum' -- project: stackforge/solum-infra-guestagent - description: 'Guest agent for Solum. See: https://wiki.openstack.org/wiki/Solum' -- project: stackforge/solum-specs - description: Solum Design Specifications - project: stackforge/sphinxcontrib-docbookrestapi description: Sphinx extension that generates documentation for api-site from RST files. diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index b4fd9a8f8f..9b02ad20db 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -1477,11 +1477,11 @@ solum: - change-merged - x-vrif-minus-2 projects: - - stackforge/solum - - stackforge/python-solumclient - - stackforge/solum-dashboard - - stackforge/solum-infra-guestagent - - stackforge/solum-specs + - openstack/solum + - openstack/python-solumclient + - openstack/solum-dashboard + - openstack/solum-infra-guestagent + - openstack/solum-specs branches: - master diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 34b7c5f133..047c04775a 100755 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -6311,10 +6311,11 @@ name: solum node: 'bare-precise || bare-trusty' tarball-site: tarballs.openstack.org + doc-publisher-site: docs.openstack.org jobs: - python-jobs - - hook-{name}-rtfd + - openstack-publish-jobs - project: name: solum-dashboard @@ -6340,7 +6341,7 @@ tarball-site: tarballs.openstack.org jobs: - - gate-{name}-docs + - specs-jobs - project: name: sphinxcontrib-docbookrestapi diff --git a/jenkins/jobs/solum.yaml b/jenkins/jobs/solum.yaml index 81612a32f0..7b076649a9 100644 --- a/jenkins/jobs/solum.yaml +++ b/jenkins/jobs/solum.yaml @@ -17,7 +17,7 @@ export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_NEUTRON=1 export ENABLED_SERVICES=solum,solum-api,solum-conductor,solum-deployer,solum-worker,tempest,zaqar,barbican,mistral - export PROJECTS="stackforge/solum $PROJECTS" + export PROJECTS="openstack/solum $PROJECTS" # TODO(ravips): Workaround until barbican, mistral gets into devstack export PROJECTS="openstack/barbican openstack/mistral $PROJECTS" @@ -65,7 +65,7 @@ export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_NEUTRON=1 export ENABLED_SERVICES=solum,solum-api,solum-conductor,solum-deployer,solum-worker,tempest,zaqar,barbican,mistral - export PROJECTS="stackforge/solum $PROJECTS" + export PROJECTS="openstack/solum $PROJECTS" # TODO(ravips): Workaround until barbican, mistral gets into devstack export PROJECTS="openstack/barbican openstack/mistral $PROJECTS" diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 393d4c711a..96c50e28cc 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2914,6 +2914,53 @@ projects: - name: check-requirements - name: translation-jobs + - name: openstack/solum + template: + - name: merge-check + - name: python-jobs + - name: check-requirements + - name: openstack-server-publish-jobs + - name: pypy-jobs + check: + - gate-solum-python34 + - gate-solum-devstack-dsvm + - gate-solum-devstack-dsvm-centos7 + gate: + - gate-solum-devstack-dsvm + post: + - solum-coverage + pre-release: + - solum-tarball + release: + - solum-tarball + + - name: openstack/solum-dashboard + template: + - name: merge-check + - name: python-jobs + - name: check-requirements + - name: publish-to-pypi + - name: pypy-jobs + post: + - solum-dashboard-coverage + + - name: openstack/solum-infra-guestagent + template: + - name: merge-check + - name: python-jobs + - name: check-requirements + - name: publish-to-pypi + - name: pypy-jobs + check: + - gate-solum-infra-guestagent-python34 + post: + - solum-infra-guestagent-coverage + + - name: openstack/solum-specs + template: + - name: merge-check + - name: openstack-specs-jobs + - name: openstack/swift template: - name: merge-check @@ -3248,7 +3295,6 @@ projects: experimental: - gate-python-keystoneclient-kerberos-python34 - - name: openstack/python-kiteclient template: - name: merge-check @@ -3395,6 +3441,17 @@ projects: experimental: - gate-python-saharaclient-pypy + - name: openstack/python-solumclient + template: + - name: merge-check + - name: python-jobs + - name: python3-jobs + - name: check-requirements + - name: publish-to-pypi + - name: pypy-jobs + post: + - python-solumclient-coverage + - name: openstack/python-swiftclient template: - name: merge-check @@ -5184,6 +5241,7 @@ projects: post: - security-doc-tox-doc-publishdocs + - name: openstack/training-guides template: - name: merge-check @@ -8334,17 +8392,6 @@ projects: - name: check-requirements - name: publish-to-pypi - - name: stackforge/python-solumclient - template: - - name: merge-check - - name: python-jobs - - name: python3-jobs - - name: check-requirements - - name: publish-to-pypi - - name: pypy-jobs - post: - - python-solumclient-coverage - - name: stackforge/python-sticksclient template: - name: merge-check @@ -8499,53 +8546,6 @@ projects: - name: python3-jobs - name: publish-to-pypi - - name: stackforge/solum - template: - - name: merge-check - - name: python-jobs - - name: check-requirements - - name: docs-on-rtfd - - name: pypy-jobs - check: - - gate-solum-python34 - - gate-solum-devstack-dsvm - - gate-solum-devstack-dsvm-centos7 - gate: - - gate-solum-devstack-dsvm - post: - - solum-coverage - pre-release: - - solum-tarball - release: - - solum-tarball - - - name: stackforge/solum-dashboard - template: - - name: merge-check - - name: python-jobs - - name: check-requirements - - name: publish-to-pypi - - name: pypy-jobs - post: - - solum-dashboard-coverage - - - name: stackforge/solum-infra-guestagent - template: - - name: merge-check - - name: python-jobs - - name: check-requirements - - name: publish-to-pypi - - name: pypy-jobs - check: - - gate-solum-infra-guestagent-python34 - post: - - solum-infra-guestagent-coverage - - - name: stackforge/solum-specs - template: - - name: merge-check - - name: stackforge-specs-jobs - - name: stackforge/sphinxcontrib-docbookrestapi template: - name: merge-check