From 9c7aec82ea6749d58beef0eb1b9af4df70e4f6b3 Mon Sep 17 00:00:00 2001 From: Serg Melikyan Date: Thu, 26 Mar 2015 12:18:02 +0300 Subject: [PATCH] Rename stackforge/murano to openstack/murano * Move Murano related projects to openstack namespace * Move murano-docs to stackforge-attics Repository murano-docs is moved to attics cause we don't use this repo for storing documentation, our documentation is stored in stackforge/murano repo. Approved commit to governance repository: https://review.openstack.org/162745 Change-Id: I56dd0fe97b6aec7026e7ff605f2893cd7521ffcf --- .../murano-specs.config | 0 .../{stackforge => openstack}/murano.config | 0 .../acls/stackforge-attic/murano-docs.config | 2 + gerrit/acls/stackforge/puppet-murano.config | 14 ++ gerrit/projects.yaml | 64 ++++--- gerritbot/channels.yaml | 15 +- jenkins/jobs/murano.yaml | 12 +- jenkins/jobs/rally.yaml | 6 +- zuul/layout.yaml | 159 ++++++++---------- 9 files changed, 134 insertions(+), 138 deletions(-) rename gerrit/acls/{stackforge => openstack}/murano-specs.config (100%) rename gerrit/acls/{stackforge => openstack}/murano.config (100%) create mode 100644 gerrit/acls/stackforge-attic/murano-docs.config create mode 100644 gerrit/acls/stackforge/puppet-murano.config diff --git a/gerrit/acls/stackforge/murano-specs.config b/gerrit/acls/openstack/murano-specs.config similarity index 100% rename from gerrit/acls/stackforge/murano-specs.config rename to gerrit/acls/openstack/murano-specs.config diff --git a/gerrit/acls/stackforge/murano.config b/gerrit/acls/openstack/murano.config similarity index 100% rename from gerrit/acls/stackforge/murano.config rename to gerrit/acls/openstack/murano.config diff --git a/gerrit/acls/stackforge-attic/murano-docs.config b/gerrit/acls/stackforge-attic/murano-docs.config new file mode 100644 index 0000000000..9e7a0f50b2 --- /dev/null +++ b/gerrit/acls/stackforge-attic/murano-docs.config @@ -0,0 +1,2 @@ +[project] +state = read only diff --git a/gerrit/acls/stackforge/puppet-murano.config b/gerrit/acls/stackforge/puppet-murano.config new file mode 100644 index 0000000000..31b7a55e8b --- /dev/null +++ b/gerrit/acls/stackforge/puppet-murano.config @@ -0,0 +1,14 @@ +[access "refs/heads/*"] +abandon = group puppet-murano-core +label-Code-Review = -2..+2 group puppet-murano-core +label-Workflow = -1..+1 group puppet-murano-core + +[access "refs/tags/*"] +pushSignedTag = group puppet-murano-release + +[receive] +requireChangeId = true +requireContributorAgreement = true + +[submit] +mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index f461945437..1b43ed98b3 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -845,6 +845,30 @@ description: Containers Service for OpenStack - project: openstack/manila description: Shared filesystem management project for OpenStack. +- project: openstack/murano + description: Application Catalog for OpenStack +- project: openstack/murano-agent + description: VM-side agent for Murano + groups: + - murano + acl-config: /home/gerrit2/acls/openstack/murano.config +- project: openstack/murano-apps + description: Examples and reference implementation of Murano application packages + groups: + - murano + acl-config: /home/gerrit2/acls/openstack/murano.config +- project: openstack/murano-dashboard + description: Dashboard for Murano + groups: + - murano + acl-config: /home/gerrit2/acls/openstack/murano.config +- project: openstack/murano-deployment + description: Scripts and automation tools for murano CI + groups: + - murano + acl-config: /home/gerrit2/acls/openstack/murano.config +- project: openstack/murano-specs + description: Murano Design Specifications - project: openstack/neutron docimpact-group: openstack-manuals description: OpenStack Networking (Neutron) @@ -1041,6 +1065,11 @@ acl-config: /home/gerrit2/acls/openstack/magnum.config - project: openstack/python-manilaclient description: Python bindings for Manila +- project: openstack/python-muranoclient + description: Client library for Murano API. + groups: + - murano + acl-config: /home/gerrit2/acls/openstack/murano.config - project: openstack/python-neutronclient description: OpenStack Networking (Neutron) Client docimpact-group: openstack-manuals @@ -1183,6 +1212,7 @@ - project: stackforge-attic/cookbook-monasca-thresh - project: stackforge-attic/murano-common - project: stackforge-attic/murano-conductor +- project: stackforge-attic/murano-docs - project: stackforge-attic/murano-metadataclient - project: stackforge-attic/murano-repository - project: stackforge-attic/murano-tests @@ -1787,35 +1817,6 @@ description: OpenStack monitoring tools - project: stackforge/MRaaS description: MapReduce as a Service -- project: stackforge/murano - description: Application catalog -- project: stackforge/murano-agent - description: Agent for murano - groups: - - murano - acl-config: /home/gerrit2/acls/stackforge/murano.config -- project: stackforge/murano-apps - description: Examples and reference implementation of murano application packages - groups: - - murano - acl-config: /home/gerrit2/acls/stackforge/murano.config -- project: stackforge/murano-dashboard - description: Dashboard for murano - groups: - - murano - acl-config: /home/gerrit2/acls/stackforge/murano.config -- project: stackforge/murano-deployment - description: Scripts and automation tools for murano CI - groups: - - murano - acl-config: /home/gerrit2/acls/stackforge/murano.config -- project: stackforge/murano-docs - description: Guides, manuals and documentation for murano - groups: - - murano - acl-config: /home/gerrit2/acls/stackforge/murano.config -- project: stackforge/murano-specs - description: Murano Design Specifications - project: stackforge/namos description: Device and Service manager - project: stackforge/nerd-reviewer @@ -1999,7 +2000,7 @@ description: StackForge Monasca Puppet Module - project: stackforge/puppet-murano description: StackForge Murano Puppet Module - acl-config: /home/gerrit2/acls/stackforge/murano.config + acl-config: /home/gerrit2/acls/stackforge/puppet-murano.config - project: stackforge/puppet-n1k-vsm description: Foreman Puppet installer for Cisco N1KV Virtual Supervisor Module - project: stackforge/puppet-neutron @@ -2106,9 +2107,6 @@ groups: - monasca acl-config: /home/gerrit2/acls/stackforge/monasca.config -- project: stackforge/python-muranoclient - description: Client library for murano API. - acl-config: /home/gerrit2/acls/stackforge/murano.config - project: stackforge/python-openstacksdk description: 'Unified SDK for OpenStack. See: https://wiki.openstack.org/wiki/UnifiedSDK' - project: stackforge/python-opentsdbclient diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index 051f5e9412..9ea53c699d 100644 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -147,14 +147,13 @@ murano: - change-merged - x-vrif-minus-2 projects: - - stackforge/murano - - stackforge/murano-agent - - stackforge/murano-apps - - stackforge/murano-dashboard - - stackforge/murano-deployment - - stackforge/murano-docs - - stackforge/murano-specs - - stackforge/python-muranoclient + - openstack/murano + - openstack/murano-agent + - openstack/murano-apps + - openstack/murano-dashboard + - openstack/murano-deployment + - openstack/murano-specs + - openstack/python-muranoclient branches: - master diff --git a/jenkins/jobs/murano.yaml b/jenkins/jobs/murano.yaml index 64f4abb2fe..98ab47d0eb 100644 --- a/jenkins/jobs/murano.yaml +++ b/jenkins/jobs/murano.yaml @@ -16,9 +16,9 @@ export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TIMEOUT=60 export ENABLED_SERVICES=murano,murano-api,murano-engine,tempest - export PROJECTS="stackforge/murano $PROJECTS" - export PROJECTS="stackforge/murano-dashboard $PROJECTS" - export PROJECTS="stackforge/python-muranoclient $PROJECTS" + export PROJECTS="openstack/murano $PROJECTS" + export PROJECTS="openstack/murano-dashboard $PROJECTS" + export PROJECTS="openstack/python-muranoclient $PROJECTS" function pre_test_hook { cd /opt/stack/new/murano/functionaltests @@ -58,9 +58,9 @@ export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TIMEOUT=60 export ENABLED_SERVICES=murano,murano-api,murano-engine,tempest,congress,mistral - export PROJECTS="stackforge/murano $PROJECTS" - export PROJECTS="stackforge/murano-dashboard $PROJECTS" - export PROJECTS="stackforge/python-muranoclient $PROJECTS" + export PROJECTS="openstack/murano $PROJECTS" + export PROJECTS="openstack/murano-dashboard $PROJECTS" + export PROJECTS="openstack/python-muranoclient $PROJECTS" export PROJECTS="openstack/congress $PROJECTS" export PROJECTS="openstack/python-congressclient $PROJECTS" export PROJECTS="stackforge/mistral $PROJECTS" diff --git a/jenkins/jobs/rally.yaml b/jenkins/jobs/rally.yaml index 7081d24201..784143176c 100644 --- a/jenkins/jobs/rally.yaml +++ b/jenkins/jobs/rally.yaml @@ -130,9 +130,9 @@ - shell: | #!/bin/bash -xe export PROJECTS="openstack/rally $PROJECTS" - export PROJECTS="stackforge/murano $PROJECTS" - export PROJECTS="stackforge/murano-dashboard $PROJECTS" - export PROJECTS="stackforge/python-muranoclient $PROJECTS" + export PROJECTS="openstack/murano $PROJECTS" + export PROJECTS="openstack/murano-dashboard $PROJECTS" + export PROJECTS="openstack/python-muranoclient $PROJECTS" export DEVSTACK_GATE_NEUTRON={neutron} export DEVSTACK_GATE_TEMPEST_LARGE_OPS={large_ops} diff --git a/zuul/layout.yaml b/zuul/layout.yaml index eac6319d54..04875d7540 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1649,6 +1649,63 @@ projects: experimental: - gate-manila-tempest-dsvm-neutron-scenario + - name: openstack/murano + template: + - name: merge-check + - name: python-jobs + - name: publish-to-pypi + - name: docs-on-rtfd + check: + - gate-murano-requirements + - gate-murano-devstack-dsvm + - gate-murano-congress-devstack-dsvm + gate: + - gate-murano-devstack-dsvm + post: + - murano-coverage + + - name: openstack/murano-agent + template: + - name: merge-check + - name: python-jobs + - name: publish-to-pypi + check: + - gate-murano-agent-requirements + post: + - murano-agent-coverage + + - name: openstack/murano-apps + template: + - name: merge-check + - name: noop-jobs + + - name: openstack/murano-dashboard + template: + - name: merge-check + - name: publish-to-pypi + check: + - gate-murano-dashboard-pep8 + - gate-murano-dashboard-python27 + - gate-murano-dashboard-requirements + - gate-murano-devstack-dsvm + gate: + - gate-murano-dashboard-pep8 + - gate-murano-dashboard-python27 + - gate-murano-devstack-dsvm + post: + - murano-dashboard-branch-tarball + + - name: openstack/murano-deployment + template: + - name: merge-check + - name: noop-jobs + + - name: openstack/murano-specs + template: + - name: merge-check + - name: stackforge-specs-jobs + - name: docs-on-rtfd + - name: openstack/neutron template: - name: merge-check @@ -2166,6 +2223,20 @@ projects: post: - python-manilaclient-coverage + - name: openstack/python-muranoclient + template: + - name: merge-check + - name: python26-jobs + - name: python-jobs + - name: publish-to-pypi + check: + - gate-python-muranoclient-requirements + - gate-murano-devstack-dsvm + gate: + - gate-murano-devstack-dsvm + post: + - python-muranoclient-branch-tarball + - name: openstack/python-neutronclient template: - name: merge-check @@ -5703,80 +5774,6 @@ projects: - name: merge-check - name: noop-jobs - - name: stackforge/murano - template: - - name: merge-check - - name: python-jobs - - name: publish-to-pypi - - name: docs-on-rtfd - check: - - gate-murano-requirements - - gate-murano-devstack-dsvm - - gate-murano-congress-devstack-dsvm - gate: - - gate-murano-devstack-dsvm - post: - - murano-coverage - pre-release: - - murano-tarball - release: - - murano-tarball - - - name: stackforge/murano-agent - template: - - name: merge-check - - name: python-jobs - - name: publish-to-pypi - check: - - gate-murano-agent-requirements - post: - - murano-agent-coverage - pre-release: - - murano-agent-tarball - release: - - murano-agent-tarball - - - name: stackforge/murano-apps - template: - - name: merge-check - - name: noop-jobs - - - name: stackforge/murano-dashboard - template: - - name: merge-check - - name: publish-to-pypi - check: - - gate-murano-dashboard-pep8 - - gate-murano-dashboard-python27 - - gate-murano-dashboard-requirements - - gate-murano-devstack-dsvm - gate: - - gate-murano-dashboard-pep8 - - gate-murano-dashboard-python27 - - gate-murano-devstack-dsvm - post: - - murano-dashboard-branch-tarball - pre-release: - - murano-dashboard-tarball - release: - - murano-dashboard-tarball - - - name: stackforge/murano-deployment - template: - - name: merge-check - - name: noop-jobs - - - name: stackforge/murano-docs - template: - - name: merge-check - - name: noop-jobs - - - name: stackforge/murano-specs - template: - - name: merge-check - - name: stackforge-specs-jobs - - name: docs-on-rtfd - - name: stackforge/namos template: - name: merge-check @@ -6541,20 +6538,6 @@ projects: post: - python-monascaclient-coverage - - name: stackforge/python-muranoclient - template: - - name: merge-check - - name: python26-jobs - - name: python-jobs - - name: publish-to-pypi - check: - - gate-python-muranoclient-requirements - - gate-murano-devstack-dsvm - gate: - - gate-murano-devstack-dsvm - post: - - python-muranoclient-branch-tarball - - name: stackforge/python-openstacksdk template: - name: merge-check