From 70208f19e4799ffaa060b9461cebf6595fa2f44b Mon Sep 17 00:00:00 2001 From: Spencer Krum Date: Mon, 20 Jun 2016 10:43:38 -0700 Subject: [PATCH] Add infra puppet gem dependency holder repo This repo (actually a ruby gem) serves as one place to list puppet gem dependencies. This avoids us having to make 60+ one line changes when we need to bump or pin a gem. No repo to import. Change-Id: I2eaa81a06d061d4ef65a8b717961de446dce9c8a Needed-By: I2dc35841b13b886753314a31adf0254590279451 --- .../puppet-openstack_infra_spec_helper.config | 13 +++++++ gerrit/projects.yaml | 5 +++ jenkins/jobs/infra.yaml | 34 +++++++++++++++++++ jenkins/jobs/projects.yaml | 7 ++++ zuul/layout.yaml | 12 +++++++ 5 files changed, 71 insertions(+) create mode 100644 gerrit/acls/openstack-infra/puppet-openstack_infra_spec_helper.config diff --git a/gerrit/acls/openstack-infra/puppet-openstack_infra_spec_helper.config b/gerrit/acls/openstack-infra/puppet-openstack_infra_spec_helper.config new file mode 100644 index 0000000000..f7b11a4e82 --- /dev/null +++ b/gerrit/acls/openstack-infra/puppet-openstack_infra_spec_helper.config @@ -0,0 +1,13 @@ +[access "refs/heads/*"] +abandon = group puppet-openstack_infra_spec_helper-core +label-Code-Review = -2..+2 group puppet-openstack_infra_spec_helper-core +label-Workflow = -1..+1 group puppet-openstack_infra_spec_helper-core + +[access "refs/tags/*"] +pushSignedTag = group puppet-openstack_infra_spec_helper-release + +[receive] +requireChangeId = true + +[submit] +mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index aac9a0d764..8a15bdf9bb 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -498,6 +498,11 @@ description: Puppet module to deploy OpenStack Health groups: - openstack-ci +- project: openstack-infra/puppet-openstack_infra_spec_helper + use-storyboard: true + description: Library gem used by Infra puppet modules + groups: + - openstack-ci - project: openstack-infra/puppet-os_client_config use-storyboard: true description: Puppet module for os-client-config diff --git a/jenkins/jobs/infra.yaml b/jenkins/jobs/infra.yaml index 5b03968201..b7beeafb9d 100644 --- a/jenkins/jobs/infra.yaml +++ b/jenkins/jobs/infra.yaml @@ -317,6 +317,40 @@ publishers: - console-log +- job-template: + name: 'gate-puppet-openstack-infra-spec-helper-unit-{node}' + node: '{node}' + + builders: + - print-template-name: + template-name: "{template-name}" + - link-logs + - zuul-clone: + project: openstack/puppet-openstack_infra_spec_helper + - install-distro-packages + - puppet-prepare-node + - shell: | + #!/bin/bash -xe + cd openstack/puppet-openstack_infra_spec_helper + ./run_unit_tests.sh + + wrappers: + - build-timeout: + timeout: 60 + - timestamps + + publishers: + - console-log + +- job-group: + name: 'puppet-openstack-infra-spec-helper-jobs' + node: + - centos-7 + - ubuntu-xenial + - ubuntu-trusty + jobs: + - 'gate-puppet-openstack-infra-spec-helper-unit-{node}' + - job: name: periodic-package-afs-centos7 node: centos-7 diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index b71501c510..3bf9bee2cd 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -6684,6 +6684,13 @@ job-suffix: '' branch-override: default +- project: + name: puppet-openstack_infra_spec_helper + tarball-site: tarballs.openstack.org + + jobs: + - puppet-openstack-infra-spec-helper-jobs + - project: name: puppet-openstack-integration tarball-site: tarballs.openstack.org diff --git a/zuul/layout.yaml b/zuul/layout.yaml index b9591101a0..c3145b7c88 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3893,6 +3893,18 @@ projects: - name: infra-puppet-apply-jobs - name: puppet-beaker-jobs + - name: openstack-infra/puppet-openstack_infra_spec_helper + template: + - name: merge-check + check: + - noop + gate: + - noop + experimental: + - gate-puppet-openstack-infra-spec-helper-unit-centos-7 + - gate-puppet-openstack-infra-spec-helper-unit-ubuntu-xenial + - gate-puppet-openstack-infra-spec-helper-unit-ubuntu-trusty + - name: openstack-infra/puppet-openstackci template: - name: merge-check