diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 811cd4058b..f94e45f543 100644 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -53,11 +53,6 @@ upstream: git://github.com/ttx/bugdaystats.git options: - direct-release -- project: openstack-infra/config - groups: - - openstack-ci - options: - - direct-release - project: openstack-infra/devstack-gate groups: - openstack-ci @@ -249,6 +244,11 @@ - project: openstack-infra/subunit2sql description: Tooling for converting subunit streams into a SQL DB upstream: https://github.com/mtreinish/subunit2sql +- project: openstack-infra/system-config + groups: + - openstack-ci + options: + - direct-release - project: openstack-infra/tripleo-ci description: CI for the tripleo project upstream: https://github.com/toci-dev/toci diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index 4d10b62ef5..78f0086303 100644 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -10,7 +10,6 @@ openstack-infra: - openstack-dev/specs-cookiecutter - openstack-infra/askbot-theme - openstack-infra/bugdaystats - - openstack-infra/config - openstack-infra/devstack-gate - openstack-infra/elastic-recheck - openstack-infra/gear @@ -49,6 +48,7 @@ openstack-infra: - openstack-infra/storyboard - openstack-infra/storyboard-webclient - openstack-infra/subunit2sql + - openstack-infra/system-config - openstack-infra/vinz - openstack-infra/vinz-webclient - openstack-infra/zuul @@ -753,7 +753,6 @@ openstack-merges: - openstack-dev/specs-cookiecutter - openstack-infra/activity-board - openstack-infra/askbot-theme - - openstack-infra/config - openstack-infra/devstack-gate - openstack-infra/elastic-recheck - openstack-infra/gear @@ -787,6 +786,7 @@ openstack-merges: - openstack-infra/reviewstats - openstack-infra/statusbot - openstack-infra/storyboard + - openstack-infra/system-config - openstack-infra/tripleo-ci - openstack-infra/zmq-event-publisher - openstack-infra/zuul diff --git a/jenkins/jobs/defaults.yaml b/jenkins/jobs/defaults.yaml index f1edb91667..43ef62be4c 100644 --- a/jenkins/jobs/defaults.yaml +++ b/jenkins/jobs/defaults.yaml @@ -7,8 +7,8 @@

If you would like to make changes to this job, please see: - - https://git.openstack.org/cgit/openstack-infra/config + + https://git.openstack.org/cgit/openstack-infra/system-config In modules/openstack_project/files/jenkins_job_builder/config diff --git a/jenkins/jobs/infra.yaml b/jenkins/jobs/infra.yaml index 544a6c32e2..afcb647b71 100644 --- a/jenkins/jobs/infra.yaml +++ b/jenkins/jobs/infra.yaml @@ -114,8 +114,8 @@ builders: - shell: | #!/bin/bash -xe - /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git git://git.openstack.org openstack-infra/config - cd openstack-infra/config + /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git git://git.openstack.org openstack-infra/system-config + cd openstack-infra/system-config ./tools/apply-test.sh - zuul_swift_upload_console_log diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 793582e485..f4f839cfb9 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -1731,20 +1731,6 @@ - python-jobs - pypi-jobs -- project: - name: config - node: 'bare-precise || bare-trusty' - - jobs: - - puppet-check-jobs - - gate-{name}-pep8 - - gate-{name}-bashate - - experimental-swift-logs-{name}-pep8-centos6 - - gate-infra-puppet-apply-{ostype}: - ostype: - - precise - - trusty - - centos6 - project: name: elastic-recheck @@ -2037,6 +2023,21 @@ - python-jobs - pypi-jobs +- project: + name: system-config + node: 'bare-precise || bare-trusty' + + jobs: + - puppet-check-jobs + - gate-{name}-pep8 + - gate-{name}-bashate + - experimental-swift-logs-{name}-pep8-centos6 + - gate-infra-puppet-apply-{ostype}: + ostype: + - precise + - trusty + - centos6 + - project: name: vinz node: 'bare-precise || bare-trusty' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index f4863f82fd..4181f0544c 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -491,7 +491,7 @@ jobs: - name: logs # The infra puppet configs predominantly run on precise nodes. # Test puppet for infra by default on precise nodes until that changes. - - name: ^gate-config-puppet.*$ + - name: ^gate-system-config-puppet.*$ parameter-function: set_node_options_default_precise # Berkshelf 3.x requires GeCode 3.x on precise. - name: ^gate-.*-chef-(lint|style|unit)$ @@ -789,7 +789,7 @@ jobs: branch: ^(?!stable/icehouse).*$ - name: gate-nova-pip-missing-reqs voting: false - - name: gate-config-bashate + - name: gate-system-config-bashate voting: false # TODO(rpodolyaka): make voting when the jobs pass on all SA versions - name: gate-oslo.db-tox-sqla_08 @@ -2854,27 +2854,6 @@ projects: post: - bugdaystats-branch-tarball - - name: openstack-infra/config - template: - - name: merge-check - check: - - gate-config-pep8 - - gate-config-bashate - - gate-config-puppet-syntax - - gate-infra-puppet-apply-precise - - gate-infra-puppet-apply-centos6 - - gate-ci-docs - gate: - - gate-config-pep8 - - gate-config-puppet-syntax - - gate-infra-puppet-apply-precise - - gate-infra-puppet-apply-centos6 - - gate-ci-docs - post: - - ci-docs - experimental: - - experimental-swift-logs-config-pep8-centos6 - - name: openstack-infra/devstack-gate template: - name: merge-check @@ -3186,31 +3165,31 @@ projects: template: - name: merge-check check: - - gate-config-puppet-lint - - gate-config-puppet-syntax + - gate-system-config-puppet-lint + - gate-system-config-puppet-syntax gate: - - gate-config-puppet-lint - - gate-config-puppet-syntax + - gate-system-config-puppet-lint + - gate-system-config-puppet-syntax - name: openstack-infra/puppet-yum template: - name: merge-check check: - - gate-config-puppet-lint - - gate-config-puppet-syntax + - gate-system-config-puppet-lint + - gate-system-config-puppet-syntax gate: - - gate-config-puppet-lint - - gate-config-puppet-syntax + - gate-system-config-puppet-lint + - gate-system-config-puppet-syntax - name: openstack-infra/puppet-zuul template: - name: merge-check check: - - gate-config-puppet-lint - - gate-config-puppet-syntax + - gate-system-config-puppet-lint + - gate-system-config-puppet-syntax gate: - - gate-config-puppet-lint - - gate-config-puppet-syntax + - gate-system-config-puppet-lint + - gate-system-config-puppet-syntax - name: openstack-infra/pypi-mirror template: @@ -3320,6 +3299,27 @@ projects: - gate-subunit2sql-pep8 - gate-subunit2sql-python27 + - name: openstack-infra/system-config + template: + - name: merge-check + check: + - gate-system-config-pep8 + - gate-system-config-bashate + - gate-system-config-puppet-syntax + - gate-infra-puppet-apply-precise + - gate-infra-puppet-apply-centos6 + - gate-ci-docs + gate: + - gate-system-config-pep8 + - gate-system-config-puppet-syntax + - gate-infra-puppet-apply-precise + - gate-infra-puppet-apply-centos6 + - gate-ci-docs + post: + - ci-docs + experimental: + - experimental-swift-logs-system-config-pep8-centos6 + - name: openstack-infra/tripleo-ci template: - name: merge-check