From 8d6e1c528ec0cc691a83a913d092b47aa9e010f7 Mon Sep 17 00:00:00 2001 From: Yuval Brik Date: Wed, 24 Aug 2016 09:49:49 +0300 Subject: [PATCH] Rename Smaug to Karbor Smaug has been renamed to Karbor. Adjust requirements accordingly. Change-Id: Ie79da33351a172fbd9ba0e5b20e1c8322f745a3c Needed-By: I1488b975ce6bb24760644f302c8a5188132030bb --- accessbot/channels.yaml | 2 +- .../openstack/{smaug.config => karbor.config} | 16 ++-- gerrit/projects.yaml | 16 ++-- gerritbot/channels.yaml | 24 +++--- jenkins/jobs/{smaug.yaml => karbor.yaml} | 10 +-- jenkins/jobs/projects.yaml | 74 +++++++++---------- zuul/layout.yaml | 60 +++++++-------- 7 files changed, 101 insertions(+), 101 deletions(-) rename gerrit/acls/openstack/{smaug.config => karbor.config} (61%) rename jenkins/jobs/{smaug.yaml => karbor.yaml} (73%) diff --git a/accessbot/channels.yaml b/accessbot/channels.yaml index 86e466b3f5..79ef527f7b 100755 --- a/accessbot/channels.yaml +++ b/accessbot/channels.yaml @@ -135,6 +135,7 @@ channels: - name: openstack-infra-incident - name: openstack-ironic - name: openstack-javascript + - name: openstack-karbor - name: openstack-keystone - name: openstack-kiloeyes - name: openstack-ko @@ -197,7 +198,6 @@ channels: - name: openstack-sdks - name: openstack-security - name: openstack-searchlight - - name: openstack-smaug - name: openstack-solar - name: openstack-sprint - name: openstack-stable diff --git a/gerrit/acls/openstack/smaug.config b/gerrit/acls/openstack/karbor.config similarity index 61% rename from gerrit/acls/openstack/smaug.config rename to gerrit/acls/openstack/karbor.config index 5904d12902..45895d1e6c 100644 --- a/gerrit/acls/openstack/smaug.config +++ b/gerrit/acls/openstack/karbor.config @@ -1,23 +1,23 @@ [access "refs/heads/*"] -abandon = group smaug-core -create = group smaug-release -label-Code-Review = -2..+2 group smaug-core -label-Workflow = -1..+1 group smaug-core +abandon = group karbor-core +create = group karbor-release +label-Code-Review = -2..+2 group karbor-core +label-Workflow = -1..+1 group karbor-core [access "refs/heads/stable/*"] abandon = group Change Owner abandon = group Project Bootstrappers -abandon = group smaug-stable-maint +abandon = group karbor-stable-maint exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group Project Bootstrappers -label-Code-Review = -2..+2 group smaug-stable-maint +label-Code-Review = -2..+2 group karbor-stable-maint label-Code-Review = -1..+1 group Registered Users label-Workflow = -1..+0 group Change Owner label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group smaug-stable-maint +label-Workflow = -1..+1 group karbor-stable-maint [access "refs/tags/*"] -pushSignedTag = group smaug-release +pushSignedTag = group karbor-release [receive] requireChangeId = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 0f86613595..a62a64dbe5 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -3385,6 +3385,11 @@ use-storyboard: true - project: openstack/k8s-docker-suite-app-murano description: Suite of the Docker and Kubernetes applications +- project: openstack/karbor + description: Application Data Protection as a Service in OpenStack +- project: openstack/karbor-dashboard + description: Horizon plugin for karbor + acl-config: /home/gerrit2/acls/openstack/karbor.config - project: openstack/karma-subunit-reporter description: A karma plugin to report Karma test results as a subunit stream - project: openstack/keystone @@ -4620,6 +4625,9 @@ description: Python API for managing jobs and nodes in a Jenkins CI instance - project: openstack/python-k8sclient description: Python API for Kubernetes +- project: openstack/python-karborclient + description: Python client library for karbor API + acl-config: /home/gerrit2/acls/openstack/karbor.config - project: openstack/python-keystoneclient description: OpenStack Identity (Keystone) Client options: @@ -4701,9 +4709,6 @@ acl-config: /home/gerrit2/acls/openstack/senlin.config options: - translate -- project: openstack/python-smaugclient - description: Python client library for Smaug API - acl-config: /home/gerrit2/acls/openstack/smaug.config - 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 @@ -4936,11 +4941,6 @@ description: RackHD and OpenStack Coordinator - project: openstack/shovel-horizon description: Shovel plugin for OpenStack Horizon dashboard -- project: openstack/smaug - description: Application Data Protection as a Service in OpenStack -- project: openstack/smaug-dashboard - description: Horizon plugin for Smaug - acl-config: /home/gerrit2/acls/openstack/smaug.config - project: openstack/solar description: Resource management and orchestration engine for distributed systems - project: openstack/solar-resources diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index 7bad21be9a..4a978f7be4 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -967,6 +967,18 @@ openstack-javascript: branches: - master +openstack-karbor: + events: + - patchset-created + - change-merged + - x-vrif-minus-2 + projects: + - openstack/karbor + - openstack/karbor-dashboard + - openstack/python-karborclient + branches: + - master + openstack-keystone: events: - change-merged @@ -2017,18 +2029,6 @@ openstack-security: branches: - master -openstack-smaug: - events: - - patchset-created - - change-merged - - x-vrif-minus-2 - projects: - - openstack/python-smaugclient - - openstack/smaug - - openstack/smaug-dashboard - branches: - - master - openstack-solar: events: - patchset-created diff --git a/jenkins/jobs/smaug.yaml b/jenkins/jobs/karbor.yaml similarity index 73% rename from jenkins/jobs/smaug.yaml rename to jenkins/jobs/karbor.yaml index a895e2acef..fea82dffaf 100644 --- a/jenkins/jobs/smaug.yaml +++ b/jenkins/jobs/karbor.yaml @@ -1,5 +1,5 @@ - job-template: - name: '{pipeline}-smaug-dsvm-fullstack{job-suffix}' + name: '{pipeline}-karbor-dsvm-fullstack{job-suffix}' node: '{node}' wrappers: @@ -26,17 +26,17 @@ export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi - export PROJECTS="openstack/smaug $PROJECTS" + export PROJECTS="openstack/karbor $PROJECTS" - export DEVSTACK_GATE_SETTINGS=/opt/stack/new/smaug/devstack/devstackgaterc + export DEVSTACK_GATE_SETTINGS=/opt/stack/new/karbor/devstack/devstackgaterc function gate_hook {{ - bash -xe $BASE/new/smaug/karbor/tests/contrib/gate_hook.sh fullstack + bash -xe $BASE/new/karbor/karbor/tests/contrib/gate_hook.sh fullstack }} export -f gate_hook function post_test_hook {{ - bash -xe $BASE/new/smaug/karbor/tests/contrib/post_test_hook.sh fullstack + bash -xe $BASE/new/karbor/karbor/tests/contrib/post_test_hook.sh fullstack }} export -f post_test_hook diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 76455dd691..15dfbe03ea 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -5350,6 +5350,33 @@ - nodejs4-jobs - nodejs4-publish-to-npm +- project: + name: karbor + tarball-site: tarballs.openstack.org + doc-publisher-site: docs.openstack.org + + jobs: + - python-jobs + - openstack-publish-jobs + - 'gate-{name}-python35{suffix}': + suffix: '-nv' + - pypi-jobs + - '{pipeline}-karbor-dsvm-fullstack{job-suffix}': + pipeline: gate + node: ubuntu-trusty + job-suffix: '-nv' + branch-override: default + +- project: + name: karbor-dashboard + tarball-site: tarballs.openstack.org + + jobs: + - python-jobs + - 'gate-{name}-python35{suffix}': + suffix: '-nv' + - pypi-jobs + - project: name: karma-subunit-reporter tarball-site: tarballs.openstack.org @@ -11144,6 +11171,16 @@ envlist: - py27-functional +- project: + name: python-karborclient + tarball-site: tarballs.openstack.org + + jobs: + - python-jobs + - 'gate-{name}-python35{suffix}': + suffix: '-nv' + - pypi-jobs + - project: name: python-keystoneclient tarball-site: tarballs.openstack.org @@ -11478,16 +11515,6 @@ - pypi-jobs - translation-jobs -- project: - name: python-smaugclient - tarball-site: tarballs.openstack.org - - jobs: - - python-jobs - - 'gate-{name}-python35{suffix}': - suffix: '-nv' - - pypi-jobs - - project: name: python-solumclient tarball-site: tarballs.openstack.org @@ -12400,33 +12427,6 @@ jobs: - python-jobs -- project: - name: smaug - tarball-site: tarballs.openstack.org - doc-publisher-site: docs.openstack.org - - jobs: - - python-jobs - - openstack-publish-jobs - - 'gate-{name}-python35{suffix}': - suffix: '-nv' - - pypi-jobs - - '{pipeline}-smaug-dsvm-fullstack{job-suffix}': - pipeline: gate - node: ubuntu-trusty - job-suffix: '-nv' - branch-override: default - -- project: - name: smaug-dashboard - tarball-site: tarballs.openstack.org - - jobs: - - python-jobs - - 'gate-{name}-python35{suffix}': - suffix: '-nv' - - pypi-jobs - - project: name: solar tarball-site: tarballs.openstack.org diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 8a05cdac97..ecd993653e 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -9673,6 +9673,27 @@ projects: - name: merge-check - name: noop-jobs + - name: openstack/karbor + template: + - name: merge-check + - name: python-jobs + - name: python34-jobs + - name: python35-jobs-nv + - name: check-requirements + - name: publish-to-pypi + - name: openstack-server-publish-jobs + check: + - gate-karbor-dsvm-fullstack-nv + + - name: openstack/karbor-dashboard + template: + - name: merge-check + - name: python-jobs + - name: python34-jobs + - name: python35-jobs-nv + - name: check-requirements + - name: publish-to-pypi + - name: openstack/karma-subunit-reporter template: - name: merge-check @@ -13839,6 +13860,15 @@ projects: gate: - gate-python-k8sclient-tox-with-sudo-py27-functional + - name: openstack/python-karborclient + template: + - name: merge-check + - name: python-jobs + - name: python34-jobs + - name: python35-jobs-nv + - name: check-requirements + - name: publish-to-pypi + - name: openstack/python-keystoneclient template: - name: merge-check @@ -14175,15 +14205,6 @@ projects: - name: translation-jobs - name: osc-plugin-jobs - - name: openstack/python-smaugclient - template: - - name: merge-check - - name: python-jobs - - name: python34-jobs - - name: python35-jobs-nv - - name: check-requirements - - name: publish-to-pypi - - name: openstack/python-solumclient template: - name: merge-check @@ -14992,27 +15013,6 @@ projects: - name: merge-check - name: python-jobs - - name: openstack/smaug - template: - - name: merge-check - - name: python-jobs - - name: python34-jobs - - name: python35-jobs-nv - - name: check-requirements - - name: publish-to-pypi - - name: openstack-server-publish-jobs - check: - - gate-smaug-dsvm-fullstack-nv - - - name: openstack/smaug-dashboard - template: - - name: merge-check - - name: python-jobs - - name: python34-jobs - - name: python35-jobs-nv - - name: check-requirements - - name: publish-to-pypi - - name: openstack/solar template: - name: merge-check