From c8af5e1ead61529ce566e0cf7e260b883fcbbc7f Mon Sep 17 00:00:00 2001 From: Philip Schwartz Date: Fri, 16 May 2014 12:06:31 -0400 Subject: [PATCH] Creation of vinz project in the openstack-infra scheme. Change-Id: I1706332f911ad9c8887d1e40613b06cbeb5e1143 Signed-off-by: Philip Schwartz --- .../files/gerritbot_channel_config.yaml | 3 ++ .../acls/openstack-infra/puppet-vinz.config | 10 ++++++ .../gerrit/acls/openstack-infra/vinz.config | 11 +++++++ .../jenkins_job_builder/config/projects.yaml | 22 +++++++++++++ .../jenkins_job_builder/config/vinz.yaml | 20 ++++++++++++ .../files/review.projects.yaml | 10 ++++++ .../openstack_project/files/zuul/layout.yaml | 32 +++++++++++++++++++ 7 files changed, 108 insertions(+) create mode 100644 modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vinz.config create mode 100644 modules/openstack_project/files/gerrit/acls/openstack-infra/vinz.config create mode 100644 modules/openstack_project/files/jenkins_job_builder/config/vinz.yaml diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index e549429fbd..87bb6d8b24 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -36,6 +36,7 @@ openstack-infra: - openstack-infra/puppet-dashboard - openstack-infra/puppet-storyboard - openstack-infra/puppet-vcsrepo + - openstack-infra/puppet-vinz - openstack-infra/puppet-yum - openstack-infra/puppet-zuul - openstack-infra/pypi-mirror @@ -46,6 +47,8 @@ openstack-infra: - openstack-infra/statusbot - openstack-infra/storyboard - openstack-infra/storyboard-webclient + - openstack-infra/vinz + - openstack-infra/vinz-webclient - openstack-infra/zuul - openstack-infra/zuul-packaging - openstack/requirements diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vinz.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vinz.config new file mode 100644 index 0000000000..e99985da5f --- /dev/null +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vinz.config @@ -0,0 +1,10 @@ +[access "refs/heads/*"] + label-Code-Review = -2..+2 group openstack-ci-core + label-Workflow = -1..+1 group openstack-ci-core + abandon = group openstack-ci-core +[project] + state = active +[receive] + requireChangeId = true +[submit] + mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/vinz.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/vinz.config new file mode 100644 index 0000000000..0d47b02f0d --- /dev/null +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/vinz.config @@ -0,0 +1,11 @@ +[access "refs/heads/*"] + label-Code-Review = -2..+2 group vinz-core + label-Workflow = -1..+1 group vinz-core + abandon = group vinz-core +[access "refs/tags/*"] + pushSignedTag = group vinz-ptl +[receive] + requireChangeId = true + requireContributorAgreement = true +[submit] + mergeContent = true diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index ab23bf6624..6d8d1e8f4e 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -1366,6 +1366,28 @@ - '{name}-js-release-{branch-designator}': branch-designator: 'branch' +- project: + name: vinz + github-org: openstack-infra + node: bare-precise + tarball-site: tarballs.openstack.org + + jobs: + - python-jobs + - pypi-jobs + +- project: + name: vinz-webclient + github-org: openstack-infra + node: bare-precise + tarball-site: tarballs.openstack.org + + jobs: + - gate-{name}-js-unittests + - '{name}-js-release-{branch-designator}': + branch-designator: 'master' + - '{name}-js-release-{branch-designator}': + branch-designator: 'branch' - project: name: swift diff --git a/modules/openstack_project/files/jenkins_job_builder/config/vinz.yaml b/modules/openstack_project/files/jenkins_job_builder/config/vinz.yaml new file mode 100644 index 0000000000..9fc9512f30 --- /dev/null +++ b/modules/openstack_project/files/jenkins_job_builder/config/vinz.yaml @@ -0,0 +1,20 @@ +# This is a non-standard docs job because it uses SCP instead of FTP +- job: + name: vinz-docs + node: bare-precise + + builders: + - revoke-sudo + - gerrit-git-prep + - docs: + github-org: openstack-infra + project: vinz + + publishers: + - scp: + site: '173.203.107.207' + files: + - target: 'ci/vinz' + source: 'doc/build/html/**/*' + keep-hierarchy: true + - console-log diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml index 412dca789e..c330cce73c 100644 --- a/modules/openstack_project/files/review.projects.yaml +++ b/modules/openstack_project/files/review.projects.yaml @@ -155,6 +155,9 @@ group: openstack-ci - project: openstack-infra/puppet-vcsrepo group: openstack-ci +- project: openstack-infra/puppet-vinz + description: Puppet module to deploy vinz + group: openstack-ci - project: openstack-infra/puppet-yum group: openstack-ci upstream: git://github.com/dprince/puppet-yum.git @@ -197,6 +200,13 @@ - project: openstack-infra/tripleo-ci description: CI for the tripleo project upstream: https://github.com/toci-dev/toci +- project: openstack-infra/vinz + use-storyboard: true + description: Standalone UI replacement for Gerrit API +- project: openstack-infra/vinz-webclient + acl-config: /home/gerrit2/acls/openstack-infra/vinz.config + description: Standalone UI replacment for Gerrit + use-storyboard: true - project: openstack-infra/zmq-event-publisher group: openstack-ci description: Jenkins plugin to publish build events via ZMQ PUB SUB. diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 70db27283c..5865b0d76f 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -517,6 +517,8 @@ jobs: success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/doc/build/html/ - name: gate-storyboard-webclient-js-unittests success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/dist/ + - name: gate-vinz-webclient-js-unittests + success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/dist/ - name: infra-publications-publish branch: ^(?!master).*$ - name: ^gate-.*-requirements$ @@ -2839,6 +2841,14 @@ projects: - gate-config-puppet-lint - gate-config-puppet-syntax + - name: openstack-infra/puppet-vinz + check: + - gate-config-puppet-lint + - gate-config-puppet-syntax + gate: + - gate-config-puppet-lint + - gate-config-puppet-syntax + - name: openstack-infra/puppet-zuul check: - gate-config-puppet-lint @@ -2969,6 +2979,28 @@ projects: release: - storyboard-webclient-js-release-master + - name: openstack-infra/vinz + template: + - name: publish-to-pypi + template: + - name: python-jobs + post: + - vinz-docs + pre-release: + - vinz-docs + release: + - vinz-docs + + - name: openstack-infra/vinz-webclient + check: + - gate-vinz-webclient-js-unittests + gate: + - gate-vinz-webclient-js-unittests + post: + - vinz-webclient-js-release-branch + release: + - vinz-webclient-js-release-master + - name: openstack-infra/tripleo-ci check: - noop