diff --git a/accessbot/channels.yaml b/accessbot/channels.yaml index bd1433ccc6..a246db4580 100755 --- a/accessbot/channels.yaml +++ b/accessbot/channels.yaml @@ -55,6 +55,7 @@ global: # Individual channel configuration: channels: + - name: ara - name: cerberus-project - name: cloud-init - name: cloudkitty diff --git a/gerrit/acls/openstack/ara.config b/gerrit/acls/openstack/ara.config new file mode 100644 index 0000000000..d5d33e66a7 --- /dev/null +++ b/gerrit/acls/openstack/ara.config @@ -0,0 +1,15 @@ +[access "refs/heads/*"] +abandon = group ara-core +create = group ara-release +label-Code-Review = -2..+2 group ara-core +label-Workflow = -1..+1 group ara-core + +[access "refs/tags/*"] +pushSignedTag = group ara-release + +[receive] +requireChangeId = true +requireContributorAgreement = false + +[submit] +mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 1549a218d7..76cb7efda1 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -797,6 +797,10 @@ - project: openstack/app-catalog-ui description: UI component for application catalog acl-config: /home/gerrit2/acls/openstack/app-catalog.config +- project: openstack/ara + description: ARA records Ansible Playbook runs and provides intuitive + interfaces to browse them + upstream: https://github.com/dmsimard/ara.git - project: openstack/astara description: Astara L3+ Network Virtualization - orchestration service groups: diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index 93f04ddc6b..cca319b783 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -1,4 +1,14 @@ # This file is sorted alphabetically by channel name. +ara: + events: + - patchset-created + - change-merged + - x-vrif-minus-2 + projects: + - openstack/ara + branches: + - master + cerberus-project: events: - patchset-created diff --git a/jenkins/jobs/ara.yaml b/jenkins/jobs/ara.yaml new file mode 100644 index 0000000000..4060db75ab --- /dev/null +++ b/jenkins/jobs/ara.yaml @@ -0,0 +1,17 @@ +- job-template: + name: 'gate-ara-integration-{scenario}-{ostype}' + node: '{ostype}' + builders: + - print-template-name: + template-name: "{template-name}" + - link-logs + - gerrit-git-prep + - install-distro-packages + - tox: + envlist: "integration-{scenario}" + wrappers: + - build-timeout: + timeout: 20 + - timestamps + publishers: + - console-log diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index e3b3bdbfa3..43eb3a99b8 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -197,6 +197,19 @@ - python-jobs - javascript-jobs +- project: + name: ara + tarball-site: tarballs.openstack.org + ostype: + - centos-7 + - ubuntu-trusty + scenario: + - smoke + - ansible + jobs: + - python-jobs + - 'gate-ara-integration-{scenario}-{ostype}' + - project: name: astara tarball-site: tarballs.openstack.org diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 683246c1fe..58103104df 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -4544,6 +4544,24 @@ projects: gate: - gate-app-catalog-ui-pep8 + - name: openstack/ara + template: + - name: merge-check + - name: python-jobs + check: + - gate-ara-integration-smoke-centos-7 + - gate-ara-integration-smoke-ubuntu-trusty + - gate-ara-integration-ansible-centos-7 + - gate-ara-integration-ansible-ubuntu-trusty + - ara-coverage + gate: + - gate-ara-integration-smoke-centos-7 + - gate-ara-integration-smoke-ubuntu-trusty + - gate-ara-integration-ansible-centos-7 + - gate-ara-integration-ansible-ubuntu-trusty + post: + - ara-coverage + - name: openstack/astara template: - name: merge-check