From be7dfc521f82f4e4fcf2e3a4dcac360b362324e9 Mon Sep 17 00:00:00 2001 From: Adam Gandelman Date: Tue, 3 Nov 2015 10:30:08 -0800 Subject: [PATCH] Rename projects akanda-* -> astara-* The project-formely-known as Akanda has moved to openstack/ and is to be renamed Astara. This is the final phase of the project move+rename. This patch renames: - openstack/akanda-rug -> openstack/astara - openstack/akanda-appliance -> openstack/astara-appliance - openstack/akanda-horizon -> openstack/astara-horizon - openstatck/akanda-neutron -> openstack/astara-neutron It also renames gerrit groups: - akanda-core -> astara-core - akanda-release -> astara-release As part of the rename, it also retires two unused repos to openstack-attic: - akanda - akanda-appliance-builder Jenkins jobs and zuul layouts updated accordingly. Change-Id: I3d64946d00cf7fd9c8dce725c56b83e256a6fd11 --- gerrit/acls/openstack-attic/akanda.config | 2 + gerrit/acls/openstack/akanda.config | 15 --- gerrit/acls/openstack/astara.config | 15 +++ gerrit/projects.yaml | 56 ++++------ jenkins/jobs/{akanda.yaml => astara.yaml} | 37 ++++--- jenkins/jobs/projects.yaml | 109 ++++++++----------- zuul/layout.yaml | 125 +++++++++------------- 7 files changed, 157 insertions(+), 202 deletions(-) create mode 100644 gerrit/acls/openstack-attic/akanda.config delete mode 100644 gerrit/acls/openstack/akanda.config create mode 100644 gerrit/acls/openstack/astara.config rename jenkins/jobs/{akanda.yaml => astara.yaml} (66%) diff --git a/gerrit/acls/openstack-attic/akanda.config b/gerrit/acls/openstack-attic/akanda.config new file mode 100644 index 0000000000..9e7a0f50b2 --- /dev/null +++ b/gerrit/acls/openstack-attic/akanda.config @@ -0,0 +1,2 @@ +[project] +state = read only diff --git a/gerrit/acls/openstack/akanda.config b/gerrit/acls/openstack/akanda.config deleted file mode 100644 index 951c0bb06e..0000000000 --- a/gerrit/acls/openstack/akanda.config +++ /dev/null @@ -1,15 +0,0 @@ -[access "refs/heads/*"] -abandon = group akanda-core -create = group akanda-release -label-Code-Review = -2..+2 group akanda-core -label-Workflow = -1..+1 group akanda-core - -[access "refs/tags/*"] -pushSignedTag = group akanda-release - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/openstack/astara.config b/gerrit/acls/openstack/astara.config new file mode 100644 index 0000000000..3845405a73 --- /dev/null +++ b/gerrit/acls/openstack/astara.config @@ -0,0 +1,15 @@ +[access "refs/heads/*"] +abandon = group astara-core +create = group astara-release +label-Code-Review = -2..+2 group astara-core +label-Workflow = -1..+1 group astara-core + +[access "refs/tags/*"] +pushSignedTag = group astara-release + +[receive] +requireChangeId = true +requireContributorAgreement = true + +[submit] +mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index bc53e8c641..936fb1824c 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -1,3 +1,6 @@ +- project: openstack-attic/akanda +- project: openstack-attic/akanda-appliance-builder + acl-config: /home/gerrit2/acls/openstack-attic/akanda.config - project: openstack-attic/compute-api - project: openstack-attic/database-api - project: openstack-attic/identity-api @@ -748,39 +751,6 @@ description: Zuul packaging - project: openstack/aeromancer description: OpenStack Source Explorer -- project: openstack/akanda - description: Akanda L3+ Network Virtualization - homepage: http://akanda.io -- project: openstack/akanda-appliance - description: The router appliance for Akanda - homepage: http://akanda.io - acl-config: /home/gerrit2/acls/openstack/akanda.config - groups: - - akanda -- project: openstack/akanda-appliance-builder - description: akanda appliance build scripts - homepage: http://akanda.io - acl-config: /home/gerrit2/acls/openstack/akanda.config - groups: - - akanda -- project: openstack/akanda-horizon - description: akanda rug horizon extension - homepage: http://akanda.io - acl-config: /home/gerrit2/acls/openstack/akanda.config - groups: - - akanda -- project: openstack/akanda-neutron - description: Neutron API extensions for Akanda - homepage: http://akanda.io - acl-config: /home/gerrit2/acls/openstack/akanda.config - groups: - - akanda -- project: openstack/akanda-rug - description: It ties the room together - homepage: http://akanda.io - acl-config: /home/gerrit2/acls/openstack/akanda.config - groups: - - akanda - project: openstack/anchor description: An Ephemeral PKI system that can act as a trust anchor for OpenStack PKI operations @@ -810,6 +780,26 @@ - project: openstack/app-catalog-ui description: UI component for application catalog acl-config: /home/gerrit2/acls/openstack/app-catalog.config +- project: openstack/astara + description: Astara L3+ Network Virtualization - orchestration service + acl-config: /home/gerrit2/acls/openstack/astara.config + groups: + - astara +- project: openstack/astara-appliance + description: Astara L3+ Network Virtualization - virtual appliance + acl-config: /home/gerrit2/acls/openstack/astara.config + groups: + - astara +- project: openstack/astara-horizon + description: Astara L3+ Network Virtualization - Horizon integration + acl-config: /home/gerrit2/acls/openstack/astara.config + groups: + - astara +- project: openstack/astara-neutron + description: Astara L3+ Network Virtualization - Neutron integration + acl-config: /home/gerrit2/acls/openstack/astara.config + groups: + - astara - project: openstack/automaton description: Friendly state machines for python. groups: diff --git a/jenkins/jobs/akanda.yaml b/jenkins/jobs/astara.yaml similarity index 66% rename from jenkins/jobs/akanda.yaml rename to jenkins/jobs/astara.yaml index 56af6e3e08..2c6ded5e8f 100644 --- a/jenkins/jobs/akanda.yaml +++ b/jenkins/jobs/astara.yaml @@ -1,5 +1,5 @@ - builder: - name: akanda-dsvm + name: astara-dsvm builders: - shell: | #!/bin/bash -xe @@ -12,15 +12,14 @@ export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi - export PROJECTS="openstack/akanda-rug $PROJECTS" - export PROJECTS="openstack/akanda-neutron $PROJECTS" - export PROJECTS="openstack/akanda-appliance $PROJECTS" - export PROJECTS="openstack/akanda-appliance-builder $PROJECTS" - export PROJECTS="openstack/akanda-horizon $PROJECTS" + export PROJECTS="openstack/astara $PROJECTS" + export PROJECTS="openstack/astara-neutron $PROJECTS" + export PROJECTS="openstack/astara-appliance $PROJECTS" + export PROJECTS="openstack/astara-horizon $PROJECTS" - export DEVSTACK_LOCAL_CONFIG="enable_plugin akanda-rug https://git.openstack.org/openstack/akanda-rug"$'\n'"enable_service ak-rug" + export DEVSTACK_LOCAL_CONFIG="enable_plugin astara https://git.openstack.org/openstack/astara"$'\n'"enable_service astara" - export BUILD_APPLIANCE={build-akanda-appliance} + export BUILD_APPLIANCE={build-astara-appliance} if [ "$BUILD_APPLIANCE" == "1" ] ; then export DEVSTACK_LOCAL_CONFIG+=$'\n'"BUILD_AKANDA_APPLIANCE_IMAGE=True" fi @@ -28,7 +27,7 @@ if [ "$DEVSTACK_GATE_TEMPEST" == "0" ]; then function post_test_hook {{ source $BASE/new/devstack/openrc admin admin - cd /opt/stack/new/akanda-rug + cd /opt/stack/new/astara sudo -H -E -u stack ./tools/run_functional.sh }} export -f post_test_hook @@ -38,7 +37,7 @@ ./safe-devstack-vm-gate-wrap.sh - job-template: - name: '{pipeline}-functional-dsvm-akanda{job-suffix}' + name: '{pipeline}-functional-dsvm-astara{job-suffix}' node: '{node}' wrappers: @@ -50,8 +49,8 @@ - link-logs - net-info - devstack-checkout - - akanda-dsvm: - build-akanda-appliance: 0 + - astara-dsvm: + build-astara-appliance: 0 run-tempest: 0 branch-override: '{branch-override}' publishers: @@ -59,7 +58,7 @@ - console-log - job-template: - name: '{pipeline}-functional-dsvm-akanda-appliance-src{job-suffix}' + name: '{pipeline}-functional-dsvm-astara-appliance-src{job-suffix}' node: '{node}' wrappers: @@ -71,8 +70,8 @@ - link-logs - net-info - devstack-checkout - - akanda-dsvm: - build-akanda-appliance: 1 + - astara-dsvm: + build-astara-appliance: 1 run-tempest: 0 branch-override: '{branch-override}' publishers: @@ -80,7 +79,7 @@ - console-log - job: - name: 'akanda-appliance-buildimage' + name: 'astara-appliance-buildimage' node: 'bare-trusty' builders: @@ -91,14 +90,14 @@ - shell: | #!/bin/bash -xe tox -e build_image - mv build/akanda_appliance.qcow2 $WORKSPACE/akanda_appliance.qcow2 + mv build/astara_appliance.qcow2 $WORKSPACE/astara_appliance.qcow2 publishers: - scp: site: 'tarballs.openstack.org' files: - - source: 'akanda_appliance.qcow2' - target: 'tarballs/akanda-appliance/images' + - source: 'astara_appliance.qcow2' + target: 'tarballs/astara-appliance/images' keep-hierarchy: false copy-after-failure: false - console-log diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 6d4223b45e..6e0509836b 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -11,69 +11,6 @@ - python-jobs - pypi-jobs -- project: - name: akanda - node: 'bare-precise || bare-trusty' - tarball-site: tarballs.openstack.org - - jobs: - - hook-{name}-rtfd - -- project: - name: akanda-appliance - node: 'bare-precise || bare-trusty' - tarball-site: tarballs.openstack.org - - jobs: - - python-jobs - - hook-{name}-rtfd - -- project: - name: akanda-appliance-builder - node: 'bare-precise || bare-trusty' - tarball-site: tarballs.openstack.org - - jobs: - - python-jobs - - hook-{name}-rtfd - -- project: - name: akanda-horizon - node: 'bare-precise || bare-trusty' - tarball-site: tarballs.openstack.org - - jobs: - - python-jobs - - hook-{name}-rtfd - -- project: - name: akanda-neutron - node: 'bare-precise || bare-trusty' - tarball-site: tarballs.openstack.org - - jobs: - - python-jobs - - hook-{name}-rtfd - -- project: - name: akanda-rug - node: 'bare-precise || bare-trusty' - tarball-site: tarballs.openstack.org - - jobs: - - python-jobs - - hook-{name}-rtfd - - '{pipeline}-functional-dsvm-akanda{job-suffix}': - pipeline: gate - node: 'devstack-precise || devstack-trusty' - job-suffix: '' - branch-override: 'stable/liberty' - - '{pipeline}-functional-dsvm-akanda-appliance-src{job-suffix}': - pipeline: gate - node: 'devstack-precise || devstack-trusty' - job-suffix: '' - branch-override: 'stable/liberty' - - project: name: anchor node: 'bare-precise || bare-trusty' @@ -158,6 +95,52 @@ - python-jobs - javascript-jobs +- project: + name: astara + node: 'bare-precise || bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - python-jobs + - hook-{name}-rtfd + - '{pipeline}-functional-dsvm-astara{job-suffix}': + pipeline: gate + node: 'devstack-precise || devstack-trusty' + job-suffix: '' + branch-override: 'stable/liberty' + - '{pipeline}-functional-dsvm-astara-appliance-src{job-suffix}': + pipeline: gate + node: 'devstack-precise || devstack-trusty' + job-suffix: '' + branch-override: 'stable/liberty' + +- project: + name: astara-appliance + node: 'bare-precise || bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - python-jobs + - hook-{name}-rtfd + +- project: + name: astara-horizon + node: 'bare-precise || bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - python-jobs + - hook-{name}-rtfd + +- project: + name: astara-neutron + node: 'bare-precise || bare-trusty' + tarball-site: tarballs.openstack.org + + jobs: + - python-jobs + - hook-{name}-rtfd + - project: name: automaton node: 'bare-precise || bare-trusty' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 0f9b19c750..80b9cc017d 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1106,7 +1106,7 @@ jobs: - name: ^gate-group-based-policy-dsvm-rally$ voting: false - - name: ^gate-functional-dsvm-akanda.*$ + - name: ^gate-functional-dsvm-astara.*$ branch: ^(?!stable/(?:juno|kilo)).*$ # For Gerrit ver 2.8.x and later (using buck) @@ -3493,77 +3493,6 @@ projects: - name: noop-jobs - name: publish-to-pypi - - name: openstack/akanda - template: - - name: merge-check - - name: noop-jobs - - name: docs-on-rtfd - - - name: openstack/akanda-appliance - template: - - name: merge-check - - name: docs-on-rtfd - check: - - gate-akanda-appliance-pep8 - - gate-akanda-appliance-python27 - - gate-functional-dsvm-akanda-appliance-src - gate: - - gate-akanda-appliance-pep8 - - gate-akanda-appliance-python27 - - gate-functional-dsvm-akanda-appliance-src - post: - - akanda-appliance-buildimage - - - name: openstack/akanda-appliance-builder - template: - - name: merge-check - - name: docs-on-rtfd - check: - - gate-akanda-appliance-builder-pep8 - - gate-akanda-appliance-builder-python27 - - gate-functional-dsvm-akanda-appliance-src - gate: - - gate-akanda-appliance-builder-pep8 - - gate-akanda-appliance-builder-python27 - - gate-functional-dsvm-akanda-appliance-src - - - name: openstack/akanda-horizon - template: - - name: merge-check - - name: docs-on-rtfd - check: - - gate-akanda-horizon-pep8 - - gate-akanda-horizon-python27 - gate: - - gate-akanda-horizon-pep8 - - gate-akanda-horizon-python27 - - - name: openstack/akanda-neutron - template: - - name: merge-check - - name: docs-on-rtfd - check: - - gate-akanda-neutron-pep8 - - gate-akanda-neutron-python27 - - gate-functional-dsvm-akanda - gate: - - gate-akanda-neutron-pep8 - - gate-akanda-neutron-python27 - - gate-functional-dsvm-akanda - - - name: openstack/akanda-rug - template: - - name: merge-check - - name: docs-on-rtfd - check: - - gate-akanda-rug-pep8 - - gate-akanda-rug-python27 - - gate-functional-dsvm-akanda - gate: - - gate-akanda-rug-pep8 - - gate-akanda-rug-python27 - - gate-functional-dsvm-akanda - - name: openstack/anchor template: - name: merge-check @@ -3658,6 +3587,58 @@ projects: - name: merge-check - name: noop-jobs + - name: openstack/astara + template: + - name: merge-check + - name: docs-on-rtfd + check: + - gate-astara-pep8 + - gate-astara-python27 + - gate-functional-dsvm-astara + gate: + - gate-astara-pep8 + - gate-astara-python27 + - gate-functional-dsvm-astara + + - name: openstack/astara-appliance + template: + - name: merge-check + - name: docs-on-rtfd + check: + - gate-astara-appliance-pep8 + - gate-astara-appliance-python27 + - gate-functional-dsvm-astara-appliance-src + gate: + - gate-astara-appliance-pep8 + - gate-astara-appliance-python27 + - gate-functional-dsvm-astara-appliance-src + post: + - astara-appliance-buildimage + + - name: openstack/astara-horizon + template: + - name: merge-check + - name: docs-on-rtfd + check: + - gate-astara-horizon-pep8 + - gate-astara-horizon-python27 + gate: + - gate-astara-horizon-pep8 + - gate-astara-horizon-python27 + + - name: openstack/astara-neutron + template: + - name: merge-check + - name: docs-on-rtfd + check: + - gate-astara-neutron-pep8 + - gate-astara-neutron-python27 + - gate-functional-dsvm-astara + gate: + - gate-astara-neutron-pep8 + - gate-astara-neutron-python27 + - gate-functional-dsvm-astara + - name: openstack/automaton template: - name: merge-check