Move nodepool.yaml from system-config to project-config
Nodepool.yaml.erb in system-config no longer contains any secrets. Let's move it to the project-config repo. Add the nodepool validation jobs and tox environment, initially as non-voting until it is boot strapped. The version of nodepool.yaml proposed matches the version in system-config depends-on patch. A follow-up patch will be submitted with any deltas needed when the needed-by patch is ready to merge. Until that happens, this nodepool.yaml file won't be used and is safe to merge. Make both gate-project-config-nodepool and gate-system-config-nodepool non-voting to aid in bootstrapping this change. The nodepool logging template file and associated tool that generates the file will remain in system-config. In the short term, updates to nodepool.yaml in this repo may require a related change in system-config to update the logging configuration. In the longer term, nodepool will be updated to automatically log image creations without needing a customized logging configuration. Needed-By: I2b45a7145805368b1598d3a3e8a94f0e4eb8cf2d Depends-On: Ib045c104daac15360e62f46e3e5683c7a387bc96 Depends-On: I89207d100eb4b6bbb502a6ed38831f49e4b29096 Change-Id: I473a1b78acdb035eb379394a7ed5f771434dc942
This commit is contained in:

committed by
Andreas Jaeger

parent
d68450c61b
commit
14cef9c397
@@ -88,6 +88,19 @@
|
|||||||
publishers:
|
publishers:
|
||||||
- zuul-swift-upload-console-log
|
- zuul-swift-upload-console-log
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: gate-project-config-nodepool
|
||||||
|
node: 'bare-precise || bare-trusty'
|
||||||
|
|
||||||
|
builders:
|
||||||
|
- revoke-sudo
|
||||||
|
- gerrit-git-prep
|
||||||
|
- tox:
|
||||||
|
envlist: 'nodepool'
|
||||||
|
|
||||||
|
publishers:
|
||||||
|
- zuul-swift-upload-console-log
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: gate-project-config-projects-yaml
|
name: gate-project-config-projects-yaml
|
||||||
node: 'bare-precise || bare-trusty'
|
node: 'bare-precise || bare-trusty'
|
||||||
|
1126
nodepool/nodepool.yaml
Normal file
1126
nodepool/nodepool.yaml
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,3 +1,4 @@
|
|||||||
hacking>=0.10,<0.11
|
hacking>=0.10,<0.11
|
||||||
bashate>=0.2
|
bashate>=0.2
|
||||||
grafyaml
|
grafyaml
|
||||||
|
-e git://git.openstack.org/openstack-infra/nodepool#egg=nodepool
|
||||||
|
3
tox.ini
3
tox.ini
@@ -92,3 +92,6 @@ deps = PyYAML
|
|||||||
six
|
six
|
||||||
commands =
|
commands =
|
||||||
{toxinidir}/tools/tests/mass_rename_projects_unit_test.py
|
{toxinidir}/tools/tests/mass_rename_projects_unit_test.py
|
||||||
|
|
||||||
|
[testenv:nodepool]
|
||||||
|
commands = nodepool -c {toxinidir}/nodepool/nodepool.yaml config-validate
|
||||||
|
@@ -1147,6 +1147,10 @@ jobs:
|
|||||||
failure-message: Jenkins XML output has changed.
|
failure-message: Jenkins XML output has changed.
|
||||||
success-message: Jenkins XML output is unchanged.
|
success-message: Jenkins XML output is unchanged.
|
||||||
|
|
||||||
|
# Making non-voting while bootstrapping in nodepool.yaml
|
||||||
|
- name: gate-system-config-nodepool
|
||||||
|
voting: false
|
||||||
|
|
||||||
- name: gate-dsvm-nodepool
|
- name: gate-dsvm-nodepool
|
||||||
voting: false
|
voting: false
|
||||||
|
|
||||||
@@ -1185,6 +1189,13 @@ jobs:
|
|||||||
- '^nodepool/elements/.*$'
|
- '^nodepool/elements/.*$'
|
||||||
- 'tox.ini'
|
- 'tox.ini'
|
||||||
|
|
||||||
|
# Making non-voting while bootstrapping in nodepool.yaml
|
||||||
|
- name: gate-project-config-nodepool
|
||||||
|
voting: false
|
||||||
|
files:
|
||||||
|
- '^nodepool/nodepool.yaml'
|
||||||
|
- 'tox.ini'
|
||||||
|
|
||||||
- name: gate-project-config-projects-yaml
|
- name: gate-project-config-projects-yaml
|
||||||
files:
|
files:
|
||||||
- 'check_valid_gerrit_projects.py'
|
- 'check_valid_gerrit_projects.py'
|
||||||
@@ -2592,6 +2603,7 @@ projects:
|
|||||||
- gate-project-config-pep8
|
- gate-project-config-pep8
|
||||||
- gate-project-config-irc-access
|
- gate-project-config-irc-access
|
||||||
- gate-project-config-jenkins-project
|
- gate-project-config-jenkins-project
|
||||||
|
- gate-project-config-nodepool
|
||||||
- gate-project-config-projects-yaml
|
- gate-project-config-projects-yaml
|
||||||
- gate-infra-docs-index
|
- gate-infra-docs-index
|
||||||
- gate-generate-specs-site
|
- gate-generate-specs-site
|
||||||
@@ -2602,6 +2614,8 @@ projects:
|
|||||||
- gate-project-config-layout
|
- gate-project-config-layout
|
||||||
- gate-project-config-pep8
|
- gate-project-config-pep8
|
||||||
- gate-project-config-irc-access
|
- gate-project-config-irc-access
|
||||||
|
#TODO(asselin) add back when it becomes voting
|
||||||
|
#- gate-project-config-nodepool
|
||||||
- gate-project-config-jenkins-project
|
- gate-project-config-jenkins-project
|
||||||
- gate-project-config-projects-yaml
|
- gate-project-config-projects-yaml
|
||||||
- gate-infra-docs-index
|
- gate-infra-docs-index
|
||||||
@@ -3339,12 +3353,12 @@ projects:
|
|||||||
check:
|
check:
|
||||||
- gate-system-config-pep8
|
- gate-system-config-pep8
|
||||||
- gate-system-config-bashate
|
- gate-system-config-bashate
|
||||||
|
#TODO(asselin) remove this job after migration is complete
|
||||||
- gate-system-config-nodepool
|
- gate-system-config-nodepool
|
||||||
- gate-system-config-puppet-syntax
|
- gate-system-config-puppet-syntax
|
||||||
gate:
|
gate:
|
||||||
- gate-system-config-pep8
|
- gate-system-config-pep8
|
||||||
- gate-system-config-bashate
|
- gate-system-config-bashate
|
||||||
- gate-system-config-nodepool
|
|
||||||
- gate-system-config-puppet-syntax
|
- gate-system-config-puppet-syntax
|
||||||
experimental:
|
experimental:
|
||||||
- experimental-swift-logs-system-config-pep8-centos6
|
- experimental-swift-logs-system-config-pep8-centos6
|
||||||
|
Reference in New Issue
Block a user