From 14cef9c3970a5a41c1b757c00340933a938aba9b Mon Sep 17 00:00:00 2001 From: Ramy Asselin Date: Thu, 29 Oct 2015 01:32:57 -0700 Subject: [PATCH] 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 --- jenkins/jobs/infra.yaml | 13 + nodepool/nodepool.yaml | 1126 +++++++++++++++++++++++++++++++++++++++ test-requirements.txt | 1 + tox.ini | 3 + zuul/layout.yaml | 16 +- 5 files changed, 1158 insertions(+), 1 deletion(-) create mode 100644 nodepool/nodepool.yaml diff --git a/jenkins/jobs/infra.yaml b/jenkins/jobs/infra.yaml index c3f0f8a03c..648797ab43 100644 --- a/jenkins/jobs/infra.yaml +++ b/jenkins/jobs/infra.yaml @@ -88,6 +88,19 @@ publishers: - 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: name: gate-project-config-projects-yaml node: 'bare-precise || bare-trusty' diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml new file mode 100644 index 0000000000..8fa4aaaeb6 --- /dev/null +++ b/nodepool/nodepool.yaml @@ -0,0 +1,1126 @@ +script-dir: /etc/nodepool/scripts +elements-dir: /etc/nodepool/elements +images-dir: /opt/nodepool_dib + +cron: + cleanup: '*/1 * * * *' + check: '*/15 * * * *' + image-update: '14 14 * * *' + +zmq-publishers: + - tcp://jenkins01.openstack.org:8888 + - tcp://jenkins02.openstack.org:8888 + - tcp://jenkins03.openstack.org:8888 + - tcp://jenkins04.openstack.org:8888 + - tcp://jenkins05.openstack.org:8888 + - tcp://jenkins06.openstack.org:8888 + - tcp://jenkins07.openstack.org:8888 + +gearman-servers: + - host: zuul.openstack.org + +labels: + - name: devstack-precise + image: devstack-precise + ready-script: configure_mirror.sh + min-ready: 1 + providers: + - name: hpcloud-b1 + - name: hpcloud-b2 + - name: hpcloud-b3 + - name: hpcloud-b4 + - name: hpcloud-b5 + - name: rax-dfw + - name: rax-ord + - name: rax-iad + - name: ovh-gra1 + - name: devstack-precise-check + image: devstack-precise-check + min-ready: 0 + providers: + - name: rax-iad + - name: bare-precise + image: bare-precise + ready-script: configure_mirror.sh + min-ready: 1 + providers: + - name: hpcloud-b1 + - name: hpcloud-b2 + - name: hpcloud-b3 + - name: hpcloud-b4 + - name: hpcloud-b5 + - name: rax-dfw + - name: rax-ord + - name: rax-iad + - name: devstack-trusty + image: devstack-trusty + ready-script: configure_mirror.sh + min-ready: 20 + providers: + - name: hpcloud-b1 + - name: hpcloud-b2 + - name: hpcloud-b3 + - name: hpcloud-b4 + - name: hpcloud-b5 + - name: rax-dfw + - name: rax-ord + - name: rax-iad + - name: ovh-gra1 + # Special dib specific labels for testing dib based images + # in new providers as we dibify them. + - name: devstack-trusty-dib + image: devstack-trusty-dib + ready-script: configure_mirror.sh + min-ready: 0 + providers: [] + - name: devstack-precise-dib + image: devstack-precise-dib + ready-script: configure_mirror.sh + min-ready: 0 + providers: [] + - name: bare-trusty + image: bare-trusty + ready-script: configure_mirror.sh + min-ready: 8 + providers: + - name: hpcloud-b1 + - name: hpcloud-b2 + - name: hpcloud-b3 + - name: hpcloud-b4 + - name: hpcloud-b5 + - name: rax-dfw + - name: rax-ord + - name: rax-iad + - name: bare-centos6 + image: bare-centos6 + ready-script: configure_mirror.sh + min-ready: 2 + providers: + - name: hpcloud-b1 + - name: hpcloud-b2 + - name: hpcloud-b3 + - name: hpcloud-b4 + - name: hpcloud-b5 + - name: rax-dfw + - name: rax-ord + - name: rax-iad + - name: centos-6 + image: centos-6 + ready-script: configure_mirror.sh + min-ready: 1 + providers: + - name: hpcloud-b1 + - name: hpcloud-b2 + - name: hpcloud-b3 + - name: hpcloud-b4 + - name: hpcloud-b5 + - name: rax-dfw + - name: rax-ord + - name: rax-iad + - name: ovh-gra1 + - name: ubuntu-trusty + image: ubuntu-trusty + ready-script: configure_mirror.sh + min-ready: 1 + providers: + - name: hpcloud-b1 + - name: hpcloud-b2 + - name: hpcloud-b3 + - name: hpcloud-b4 + - name: hpcloud-b5 + - name: rax-dfw + - name: rax-ord + - name: rax-iad + - name: ovh-gra1 + - name: ubuntu-trusty-check + image: ubuntu-trusty-check + min-ready: 1 + providers: + - name: ovh-gra1 + - name: ubuntu-trusty-2-node + image: ubuntu-trusty + ready-script: multinode_setup.sh + subnodes: 1 + min-ready: 1 + providers: + - name: rax-dfw + - name: rax-ord + - name: rax-iad + - name: hpcloud-b1 + - name: hpcloud-b2 + - name: hpcloud-b3 + - name: hpcloud-b4 + - name: hpcloud-b5 + - name: ovh-gra1 + - name: devstack-trusty-2-node + image: devstack-trusty + ready-script: multinode_setup.sh + subnodes: 1 + min-ready: 1 + providers: + - name: rax-dfw + - name: rax-ord + - name: rax-iad + - name: hpcloud-b1 + - name: hpcloud-b2 + - name: hpcloud-b3 + - name: hpcloud-b4 + - name: hpcloud-b5 + - name: ovh-gra1 + - name: devstack-precise-2-node + image: devstack-precise + ready-script: multinode_setup.sh + subnodes: 1 + min-ready: 0 + providers: + - name: rax-dfw + - name: rax-ord + - name: rax-iad + - name: hpcloud-b1 + - name: hpcloud-b2 + - name: hpcloud-b3 + - name: hpcloud-b4 + - name: hpcloud-b5 + - name: devstack-f21 + image: devstack-f21 + ready-script: configure_mirror.sh + min-ready: 1 + providers: + - name: rax-dfw + - name: rax-ord + - name: rax-iad + - name: hpcloud-b1 + - name: hpcloud-b2 + - name: hpcloud-b3 + - name: hpcloud-b4 + - name: hpcloud-b5 + - name: devstack-centos7 + image: devstack-centos7 + ready-script: configure_mirror.sh + min-ready: 1 + providers: + - name: rax-dfw + - name: rax-ord + - name: rax-iad + - name: hpcloud-b1 + - name: hpcloud-b2 + - name: hpcloud-b3 + - name: hpcloud-b4 + - name: hpcloud-b5 + - name: devstack-centos7-dib + image: devstack-centos7-dib + ready-script: configure_mirror.sh + min-ready: 1 + providers: + - name: hpcloud-b1 + - name: hpcloud-b2 + - name: hpcloud-b3 + - name: hpcloud-b4 + - name: hpcloud-b5 + - name: devstack-fedora21-dib + image: devstack-fedora21-dib + ready-script: configure_mirror.sh + min-ready: 1 + providers: + - name: hpcloud-b1 + - name: hpcloud-b2 + - name: hpcloud-b3 + - name: hpcloud-b4 + - name: hpcloud-b5 + - name: fedora-22 + image: fedora-22 + ready-script: configure_mirror.sh + min-ready: 1 + providers: + - name: rax-dfw + - name: rax-ord + - name: rax-iad + - name: hpcloud-b1 + - name: hpcloud-b2 + - name: hpcloud-b3 + - name: hpcloud-b4 + - name: hpcloud-b5 + - name: tripleo-f21 + image: tripleo-f21 + min-ready: 16 + providers: + - name: tripleo-test-cloud-rh1 + +providers: + - name: rax-dfw + region-name: 'DFW' + cloud: rax + api-timeout: 60 + boot-timeout: 120 + max-servers: 184 + rate: 0.001 + image-type: vhd + images: + - name: devstack-precise + base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-precise + base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-trusty + base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-trusty + base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-centos6 + base-image: 'CentOS 6 (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: centos-6 + base-image: 'CentOS 6 (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: ubuntu-trusty + min-ram: 8192 + diskimage: ubuntu-trusty + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + name-filter: 'Performance' + config-drive: true + meta: + vm_mode: hvm + xenapi_use_agent: 'false' + - name: devstack-f21 + base-image: 'Fedora 21 (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: fedora-22 + min-ram: 8192 + diskimage: fedora-22 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: devstack-centos7 + base-image: 'CentOS 7 (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: rax-ord + region-name: 'ORD' + cloud: rax + api-timeout: 60 + boot-timeout: 120 + max-servers: 55 + rate: 0.001 + image-type: vhd + images: + - name: devstack-precise + base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-precise + base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-trusty + base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-trusty + base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-centos6 + base-image: 'CentOS 6 (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: centos-6 + base-image: 'CentOS 6 (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: ubuntu-trusty + min-ram: 8192 + diskimage: ubuntu-trusty + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + name-filter: 'Performance' + config-drive: true + meta: + vm_mode: hvm + xenapi_use_agent: 'false' + - name: devstack-f21 + base-image: 'Fedora 21 (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: fedora-22 + min-ram: 8192 + diskimage: fedora-22 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: devstack-centos7 + base-image: 'CentOS 7 (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: rax-iad + region-name: 'IAD' + cloud: rax + api-timeout: 60 + boot-timeout: 120 + max-servers: 85 + rate: 0.001 + image-type: vhd + images: + - name: devstack-precise + base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-precise + base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-trusty + base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-trusty + base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-centos6 + base-image: 'CentOS 6 (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: centos-6 + base-image: 'CentOS 6 (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: ubuntu-trusty + min-ram: 8192 + diskimage: ubuntu-trusty + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + name-filter: 'Performance' + config-drive: true + meta: + vm_mode: hvm + xenapi_use_agent: 'false' + - name: devstack-precise-check + base-image: 'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-f21 + base-image: 'Fedora 21 (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: fedora-22 + min-ram: 8192 + diskimage: fedora-22 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: devstack-centos7 + base-image: 'CentOS 7 (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: hpcloud-region-a + region-name: 'region-a.geo-1' + cloud: hpcloud + boot-timeout: 120 + max-servers: 0 + rate: 0.1 + images: + - name: devstack-precise-check + base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image' + min-ram: 8192 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: hpcloud-b1 + region-name: 'region-b.geo-1' + cloud: hpcloud + api-timeout: 60 + boot-timeout: 120 + max-servers: 100 + networks: + - net-id: b6596f90-914a-41e9-b01a-223d90b86e8d + availability-zones: + - az3 + rate: 0.1 + images: + - name: devstack-precise-check + base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-precise + min-ram: 30720 + diskimage: devstack-precise + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: bare-precise + base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image' + min-ram: 30720 + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-trusty + min-ram: 30720 + diskimage: devstack-trusty + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: bare-trusty + base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20150706) - Partner Image' + min-ram: 30720 + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-centos6 + base-image: 'CentOS 6.3 Server 64-bit 20130116' + min-ram: 30720 + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: centos-6 + min-ram: 30720 + diskimage: centos-6 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: ubuntu-trusty + min-ram: 30720 + diskimage: ubuntu-trusty + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: devstack-f21 + base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-centos7 + base-image: 'CentOS 7 x86_64 (2014-09-29) - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-centos7-dib + min-ram: 30720 + diskimage: devstack-centos7-dib + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: devstack-fedora21-dib + min-ram: 30720 + diskimage: devstack-fedora21-dib + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: fedora-22 + min-ram: 30720 + diskimage: fedora-22 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: hpcloud-b2 + region-name: 'region-b.geo-1' + cloud: hpcloud + api-timeout: 60 + boot-timeout: 120 + max-servers: 100 + networks: + - net-id: 90169672-ad5a-4fd5-a1b6-af121203f95c + availability-zones: + - az3 + rate: 0.1 + images: + - name: devstack-precise-check + base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-precise + min-ram: 30720 + diskimage: devstack-precise + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: bare-precise + base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image' + min-ram: 30720 + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-trusty + min-ram: 30720 + diskimage: devstack-trusty + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: bare-trusty + base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20150706) - Partner Image' + min-ram: 30720 + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-centos6 + base-image: 'CentOS 6.3 Server 64-bit 20130116' + min-ram: 30720 + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: centos-6 + min-ram: 30720 + diskimage: centos-6 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: ubuntu-trusty + min-ram: 30720 + diskimage: ubuntu-trusty + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: devstack-f21 + base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-centos7 + base-image: 'CentOS 7 x86_64 (2014-09-29) - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-centos7-dib + min-ram: 30720 + diskimage: devstack-centos7-dib + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: devstack-fedora21-dib + min-ram: 30720 + diskimage: devstack-fedora21-dib + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: fedora-22 + min-ram: 30720 + diskimage: fedora-22 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: hpcloud-b3 + region-name: 'region-b.geo-1' + cloud: hpcloud + api-timeout: 60 + boot-timeout: 120 + max-servers: 100 + networks: + - net-id: 63657422-b84f-4d2d-b7d2-765ac560546b + availability-zones: + - az3 + rate: 0.1 + images: + - name: devstack-precise-check + base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-precise + min-ram: 30720 + diskimage: devstack-precise + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: bare-precise + base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image' + min-ram: 30720 + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-trusty + min-ram: 30720 + diskimage: devstack-trusty + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: bare-trusty + base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20150706) - Partner Image' + min-ram: 30720 + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-centos6 + base-image: 'CentOS 6.3 Server 64-bit 20130116' + min-ram: 30720 + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: centos-6 + min-ram: 30720 + diskimage: centos-6 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: ubuntu-trusty + min-ram: 30720 + diskimage: ubuntu-trusty + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: devstack-f21 + base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-centos7 + base-image: 'CentOS 7 x86_64 (2014-09-29) - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-centos7-dib + min-ram: 30720 + diskimage: devstack-centos7-dib + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: devstack-fedora21-dib + min-ram: 30720 + diskimage: devstack-fedora21-dib + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: fedora-22 + min-ram: 30720 + diskimage: fedora-22 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: hpcloud-b4 + region-name: 'region-b.geo-1' + cloud: hpcloud + api-timeout: 60 + boot-timeout: 120 + max-servers: 100 + networks: + - net-id: f6d0d957-f31d-4e3b-9c07-3d2a4feebc03 + availability-zones: + - az2 + - az3 + rate: 0.1 + images: + - name: devstack-precise-check + base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-precise + min-ram: 30720 + diskimage: devstack-precise + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: bare-precise + base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image' + min-ram: 30720 + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-trusty + min-ram: 30720 + diskimage: devstack-trusty + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: bare-trusty + base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20150706) - Partner Image' + min-ram: 30720 + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-centos6 + base-image: 'CentOS 6.3 Server 64-bit 20130116' + min-ram: 30720 + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: centos-6 + min-ram: 30720 + diskimage: centos-6 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: ubuntu-trusty + min-ram: 30720 + diskimage: ubuntu-trusty + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: devstack-f21 + base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-centos7 + base-image: 'CentOS 7 x86_64 (2014-09-29) - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-centos7-dib + min-ram: 30720 + diskimage: devstack-centos7-dib + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: devstack-fedora21-dib + min-ram: 30720 + diskimage: devstack-fedora21-dib + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: fedora-22 + min-ram: 30720 + diskimage: fedora-22 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: hpcloud-b5 + region-name: 'region-b.geo-1' + cloud: hpcloud + api-timeout: 60 + boot-timeout: 120 + max-servers: 100 + networks: + - net-id: b96c212f-16e1-4b9c-a3d2-09b3871220c2 + availability-zones: + - az1 + - az2 + - az3 + rate: 0.1 + images: + - name: devstack-precise-check + base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-precise + min-ram: 30720 + diskimage: devstack-precise + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: bare-precise + base-image: 'Ubuntu Server 12.04.5 LTS (amd64 20150707) - Partner Image' + min-ram: 30720 + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-trusty + min-ram: 30720 + diskimage: devstack-trusty + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: bare-trusty + base-image: 'Ubuntu Server 14.04.1 LTS (amd64 20150706) - Partner Image' + min-ram: 30720 + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-centos6 + base-image: 'CentOS 6.3 Server 64-bit 20130116' + min-ram: 30720 + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: centos-6 + min-ram: 30720 + diskimage: centos-6 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: ubuntu-trusty + min-ram: 30720 + diskimage: ubuntu-trusty + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: devstack-f21 + base-image: 'Fedora 21 Cloud Base 64-bit 20141203 - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-centos7 + base-image: 'CentOS 7 x86_64 (2014-09-29) - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-centos7-dib + min-ram: 30720 + diskimage: devstack-centos7-dib + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: devstack-fedora21-dib + min-ram: 30720 + diskimage: devstack-fedora21-dib + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: fedora-22 + min-ram: 30720 + diskimage: fedora-22 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + - name: ovh-gra1 + region-name: 'GRA1' + cloud: ovh + api-timeout: 60 + boot-timeout: 120 + max-servers: 0 + rate: 10.0 + image-type: raw + images: + - name: centos-6 + min-ram: 8000 + name-filter: 'ssd-osFoundation' + diskimage: centos-6 + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-precise + min-ram: 8000 + name-filter: 'ssd-osFoundation' + diskimage: devstack-precise + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-trusty + min-ram: 8000 + name-filter: 'ssd-osFoundation' + diskimage: devstack-trusty + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: ubuntu-trusty-check + min-ram: 8000 + name-filter: 'ssd-osFoundation' + diskimage: ubuntu-trusty + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: ubuntu-trusty + min-ram: 8000 + name-filter: 'ssd-osFoundation' + diskimage: ubuntu-trusty + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: tripleo-test-cloud-rh1 + cloud: tripleo-test-cloud-rh1 + boot-timeout: 120 + max-servers: 75 + rate: 0.001 + networks: + - net-label: default-net + - net-label: tripleo-bm-test + images: + - name: tripleo-f21 + base-image: 'Fedora 21 64-bit' + min-ram: 8192 + name-filter: h1 + setup: prepare_node_tripleo.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa +targets: + - name: jenkins01 + - name: jenkins02 + - name: jenkins03 + - name: jenkins04 + - name: jenkins05 + - name: jenkins06 + - name: jenkins07 + +diskimages: + - name: centos-6 + elements: + - centos + - vm + - openstack-repos + - nodepool-base + - node-devstack + - cache-bindep + env-vars: + TMPDIR: /opt/dib_tmp + DIB_IMAGE_CACHE: /opt/dib_cache + - name: ubuntu-trusty + elements: + - ubuntu-minimal + - vm + - simple-init + - openstack-repos + - nodepool-base + - node-devstack + - cache-bindep + - growroot + release: trusty + env-vars: + TMPDIR: /opt/dib_tmp + DIB_IMAGE_CACHE: /opt/dib_cache + DIB_APT_LOCAL_CACHE: '0' + DIB_DISABLE_APT_CLEANUP: '1' + - name: devstack-trusty + elements: + - ubuntu + - vm + - openstack-repos + - nodepool-base + - node-devstack + - cache-bindep + release: trusty + env-vars: + TMPDIR: /opt/dib_tmp + DIB_IMAGE_CACHE: /opt/dib_cache + DIB_APT_LOCAL_CACHE: '0' + DIB_DISABLE_APT_CLEANUP: '1' + QEMU_IMG_OPTIONS: compat=0.10 + - name: devstack-precise + elements: + - ubuntu + - vm + - openstack-repos + - nodepool-base + - node-devstack + - cache-bindep + release: precise + env-vars: + TMPDIR: /opt/dib_tmp + DIB_IMAGE_CACHE: /opt/dib_cache + DIB_APT_LOCAL_CACHE: '0' + DIB_DISABLE_APT_CLEANUP: '1' + QEMU_IMG_OPTIONS: compat=0.10 + - name: devstack-centos7-dib + elements: + - centos7 + - vm + - openstack-repos + - nodepool-base + - node-devstack + - cache-bindep + env-vars: + TMPDIR: /opt/dib_tmp + DIB_IMAGE_CACHE: /opt/dib_cache + QEMU_IMG_OPTIONS: compat=0.10 + - name: devstack-fedora21-dib + elements: + - fedora + - vm + - openstack-repos + - nodepool-base + - node-devstack + - cache-bindep + release: 21 + env-vars: + TMPDIR: /opt/dib_tmp + DIB_IMAGE_CACHE: /opt/dib_cache + QEMU_IMG_OPTIONS: compat=0.10 + - name: fedora-22 + elements: + - fedora-minimal + - vm + - simple-init + - openstack-repos + - nodepool-base + - node-devstack + - puppet + release: 22 + env-vars: + TMPDIR: /opt/dib_tmp + DIB_IMAGE_CACHE: /opt/dib_cache + QEMU_IMG_OPTIONS: compat=0.10 diff --git a/test-requirements.txt b/test-requirements.txt index 64d33397d7..cc3e88fb3c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,3 +1,4 @@ hacking>=0.10,<0.11 bashate>=0.2 grafyaml +-e git://git.openstack.org/openstack-infra/nodepool#egg=nodepool diff --git a/tox.ini b/tox.ini index d50f50659b..3275cf04fe 100644 --- a/tox.ini +++ b/tox.ini @@ -92,3 +92,6 @@ deps = PyYAML six commands = {toxinidir}/tools/tests/mass_rename_projects_unit_test.py + +[testenv:nodepool] +commands = nodepool -c {toxinidir}/nodepool/nodepool.yaml config-validate diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 994b507390..f2eca87823 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1147,6 +1147,10 @@ jobs: failure-message: Jenkins XML output has changed. 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 voting: false @@ -1185,6 +1189,13 @@ jobs: - '^nodepool/elements/.*$' - '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 files: - 'check_valid_gerrit_projects.py' @@ -2592,6 +2603,7 @@ projects: - gate-project-config-pep8 - gate-project-config-irc-access - gate-project-config-jenkins-project + - gate-project-config-nodepool - gate-project-config-projects-yaml - gate-infra-docs-index - gate-generate-specs-site @@ -2602,6 +2614,8 @@ projects: - gate-project-config-layout - gate-project-config-pep8 - 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-projects-yaml - gate-infra-docs-index @@ -3339,12 +3353,12 @@ projects: check: - gate-system-config-pep8 - gate-system-config-bashate + #TODO(asselin) remove this job after migration is complete - gate-system-config-nodepool - gate-system-config-puppet-syntax gate: - gate-system-config-pep8 - gate-system-config-bashate - - gate-system-config-nodepool - gate-system-config-puppet-syntax experimental: - experimental-swift-logs-system-config-pep8-centos6