diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 3973240186..84e6f8820a 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -6398,6 +6398,9 @@ acl-config: /home/gerrit2/acls/openstack/tripleo.config - project: openstack/tripleo-quickstart description: Ansible based project for setting up TripleO virtual environments +- project: openstack/tripleo-quickstart-extras + description: Extra Ansible roles to automate TripleO deployments + acl-config: /home/gerrit2/acls/openstack/tripleo-quickstart.config - project: openstack/tripleo-specs groups: - tripleo diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index 0eef77647e..6811451dc5 100755 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -2601,6 +2601,7 @@ tripleo: - openstack/tripleo-incubator - openstack/tripleo-puppet-elements - openstack/tripleo-quickstart + - openstack/tripleo-quickstart-extras - openstack/tripleo-specs - openstack/tripleo-ui - openstack/tripleo-validations diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 92919c8771..240b648fd1 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -14656,6 +14656,18 @@ - '{name}-tarball' - '{name}-tarball-signing' +- project: + name: tripleo-quickstart-extras + doc-publisher-site: docs.openstack.org + tarball-site: tarballs.openstack.org + + jobs: + - ansible-role-jobs + - openstack-publish-jobs + - tripleo-quickstart-extras-jobs + - '{name}-tarball' + - '{name}-tarball-signing' + - project: name: tripleo-specs diff --git a/jenkins/jobs/tripleo.yaml b/jenkins/jobs/tripleo.yaml index c27d9c14ec..714c998281 100644 --- a/jenkins/jobs/tripleo.yaml +++ b/jenkins/jobs/tripleo.yaml @@ -61,6 +61,27 @@ publishers: - console-log +- job-template: + name: '{pipeline}-tripleo-quickstart-extras-{scenario}-{node}{job-suffix}' + node: '{node}' + + builders: + - print-template-name: + template-name: "{template-name}" + - zuul-git-prep + - install-distro-packages + - shell: | + # Allow Jenkins user to ssh into localhost + ssh-keygen -f ~/.ssh/id_rsa -N "" + cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys + ssh-keyscan localhost >> ~/.ssh/known_hosts + ssh-keyscan 127.0.0.1 >> ~/.ssh/known_hosts + - tox: + envlist: "{scenario}" + + publishers: + - console-log + - job-template: name: 'gate-tripleo-buildimage-{image-name}-{node}{suffix}' node: '{node}' @@ -201,3 +222,14 @@ pipeline: gate scenario: - base + +- job-group: + name: 'tripleo-quickstart-extras-jobs' + jobs: + - '{pipeline}-tripleo-quickstart-extras-{scenario}-{node}{job-suffix}': + job-suffix: '-nv' + node: + - centos-7 + pipeline: gate + scenario: + - base diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 917ae4293a..ca8545bdc5 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -17134,6 +17134,20 @@ projects: experimental: - gate-tripleo-quickstart-base-centos-7-nv + - name: openstack/tripleo-quickstart-extras + template: + - name: merge-check + - name: openstack-server-publish-jobs + - name: openstack-server-release-jobs + check: + - gate-tripleo-quickstart-extras-linters-ubuntu-xenial + - gate-tripleo-quickstart-extras-docs-ubuntu-xenial + gate: + - gate-tripleo-quickstart-extras-linters-ubuntu-xenial + - gate-tripleo-quickstart-extras-docs-ubuntu-xenial + experimental: + - gate-tripleo-quickstart-extras-base-centos-7-nv + - name: openstack/tripleo-specs template: - name: merge-check