From f190b29a0e65208ae582a89af233036239b28bda Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Wed, 4 Jul 2012 13:08:18 +0100 Subject: [PATCH] Migrate Stackforge Jenkins/Gerrit to OpenStack This moves all the projects from Stackforge to OpenStack and removes Stackforge configs. Change-Id: I8d5e9f7b12fdeae4c811b72040732841bbe0818b --- manifests/site.pp | 15 +++ manifests/stackforge.pp | 112 ------------------ .../{stackforge => openstack}/ceilometer.yml | 0 .../{stackforge => openstack}/heat.yml | 0 .../{stackforge => openstack}/mraas.yml | 0 .../{stackforge => openstack}/reddwarf.yml | 0 .../files/zuul/layout.yaml | 39 ++++++ modules/stackforge-config/README | 1 - .../stackforge-config/files/zuul/layout.yaml | 70 ----------- .../stackforge-config/files/zuul/logging.conf | 39 ------ 10 files changed, 54 insertions(+), 222 deletions(-) delete mode 100644 manifests/stackforge.pp rename modules/jenkins_jobs/files/projects/{stackforge => openstack}/ceilometer.yml (100%) rename modules/jenkins_jobs/files/projects/{stackforge => openstack}/heat.yml (100%) rename modules/jenkins_jobs/files/projects/{stackforge => openstack}/mraas.yml (100%) rename modules/jenkins_jobs/files/projects/{stackforge => openstack}/reddwarf.yml (100%) delete mode 100644 modules/stackforge-config/README delete mode 100644 modules/stackforge-config/files/zuul/layout.yaml delete mode 100644 modules/stackforge-config/files/zuul/logging.conf diff --git a/manifests/site.pp b/manifests/site.pp index 87b40c2d28..0bc77b3dff 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -234,6 +234,18 @@ node "review.openstack.org" { }, { name => 'openstack/python-swiftclient', close_pull => 'true' + }, { + name => 'stackforge/MRaaS', + close_pull => 'true' + }, { + name => 'stackforge/reddwarf', + close_pull => 'true' + }, { + name => 'stackforge/ceilometer', + close_pull => 'true' + }, { + name => 'heat-api/heat', + close_pull => 'true' } ], upstream_projects => [ { name => 'openstack-ci/gerrit', @@ -314,6 +326,9 @@ node "jenkins.openstack.org" { 'swift', 'tempest', 'zuul', + 'reddwarf', + 'ceilometer', + 'heat' ] } class { 'zuul': } diff --git a/manifests/stackforge.pp b/manifests/stackforge.pp deleted file mode 100644 index 989c8f0ba5..0000000000 --- a/manifests/stackforge.pp +++ /dev/null @@ -1,112 +0,0 @@ -import "openstack" - -class stackforge_jenkins_slave { - include tmpreaper - class { 'openstack_server': - iptables_public_tcp_ports => [] - } - class { 'jenkins_slave': - ssh_key => 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvlHx1TM9y6Y+oWJwPQP1jDejQYLA5MaTgD2oQOgQapSAWWU3f9/xcKKF4I5cC833xrSqFCqpstuWt5FdtO6qL5KMqGeVOwTCgcH0uGHciSF/zxBVpHp2n3rHLb0Fibyz/ys2kI+9J/hD0+GlVNQ/U8h9PZPMLFoJIZz5ep5WBszLM5z4vymBZ3GeytD8hk1BW0GLYi9vYWFrwoCTH6o6xRtdKajNE/9NcRGXjkY+SW7EGvqTAfLdsQ8q23MIO2ZX6YOpnmxAmR3OyNEOMo7Y/XCWjqTGWhQ669YaFxagS65f7EGCGwhhgQPtReDwkW88yTGhU3fZjS6Rc3BymTsnx jenkins@jenkins.stackforge.org' - } -} - -# -# Default: should at least behave like an openstack server -# - -node default { - class { 'openstack_template': - iptables_public_tcp_ports => [] - } -} - -# -# Long lived servers: -# -node "puppet.stackforge.org" { - class { 'openstack_server': - iptables_public_tcp_ports => [8140] - } -} - -node "review.stackforge.org" { - class { 'openstack_server': - iptables_public_tcp_ports => [80, 443, 29418] - } - class { 'gerrit': - virtual_hostname => 'review.stackforge.org', - canonicalweburl => "https://review.stackforge.org/", - ssl_cert_file => '/etc/ssl/certs/review.stackforge.org.crt', - ssl_key_file => '/etc/ssl/private/review.stackforge.org.key', - ssl_chain_file => '/etc/ssl/certs/intermediate.crt', - email => "review@stackforge.org", - httpd_maxwait => '5000min', - sshd_threads => '100', - github_projects => [ { - name => 'stackforge/MRaaS', - close_pull => 'true' - }, { - name => 'stackforge/reddwarf', - close_pull => 'true' - }, { - name => 'stackforge/ceilometer', - close_pull => 'true' - }, { - name => 'heat-api/heat', - close_pull => 'true' - } ], - logo => 'stackforge.png', - war => 'http://ci.openstack.org/tarballs/gerrit-2.4.1-10-g63110fd.war', - script_user => 'update', - script_key_file => '/home/gerrit2/.ssh/id_rsa', - script_site => 'stackforge' - } -} - -node "jenkins.stackforge.org" { - class { 'openstack_server': - iptables_public_tcp_ports => [80, 443, 4155] - } - class { 'jenkins_master': - serveradmin => 'webmaster@stackforge.org', - site => 'jenkins.stackforge.org', - logo => 'stackforge.png', - ssl_cert_file => '/etc/ssl/certs/jenkins.stackforge.org.pem', - ssl_key_file => '/etc/ssl/private/jenkins.stackforge.org.key', - ssl_chain_file => '/etc/ssl/certs/intermediate.pem', - } - - class { "jenkins_jobs": - site => "stackforge", - projects => ['reddwarf', 'ceilometer', 'heat'] - } - - class { 'zuul': } - file { "/etc/zuul/layout.yaml": - ensure => 'present', - source => 'puppet:///modules/stackforge-config/zuul/layout.yaml' - } - file { "/etc/zuul/logging.conf": - ensure => 'present', - source => 'puppet:///modules/stackforge-config/zuul/logging.conf' - } -} - -# -# Jenkins slaves: -# -node /^build.*\.slave\.stackforge\.org$/ { - include stackforge_jenkins_slave -} - -# bare-bones slaves spun up by jclouds. Specifically need to not set ssh -# login limits, because it screws up jclouds provisioning -node /^.*\.jclouds\.stackforge\.org$/ { - - include openstack_base - - class { 'jenkins_slave': - ssh_key => "", - user => false - } -} diff --git a/modules/jenkins_jobs/files/projects/stackforge/ceilometer.yml b/modules/jenkins_jobs/files/projects/openstack/ceilometer.yml similarity index 100% rename from modules/jenkins_jobs/files/projects/stackforge/ceilometer.yml rename to modules/jenkins_jobs/files/projects/openstack/ceilometer.yml diff --git a/modules/jenkins_jobs/files/projects/stackforge/heat.yml b/modules/jenkins_jobs/files/projects/openstack/heat.yml similarity index 100% rename from modules/jenkins_jobs/files/projects/stackforge/heat.yml rename to modules/jenkins_jobs/files/projects/openstack/heat.yml diff --git a/modules/jenkins_jobs/files/projects/stackforge/mraas.yml b/modules/jenkins_jobs/files/projects/openstack/mraas.yml similarity index 100% rename from modules/jenkins_jobs/files/projects/stackforge/mraas.yml rename to modules/jenkins_jobs/files/projects/openstack/mraas.yml diff --git a/modules/jenkins_jobs/files/projects/stackforge/reddwarf.yml b/modules/jenkins_jobs/files/projects/openstack/reddwarf.yml similarity index 100% rename from modules/jenkins_jobs/files/projects/stackforge/reddwarf.yml rename to modules/jenkins_jobs/files/projects/openstack/reddwarf.yml diff --git a/modules/openstack-ci-config/files/zuul/layout.yaml b/modules/openstack-ci-config/files/zuul/layout.yaml index 3676077b16..6e828f8c07 100644 --- a/modules/openstack-ci-config/files/zuul/layout.yaml +++ b/modules/openstack-ci-config/files/zuul/layout.yaml @@ -378,3 +378,42 @@ projects: - gate-tempest-pep8 silent: - gate-tempest-devstack-vm + + - name: stackforge/ceilometer + check: + - gate-ceilometer-merge: + - gate-ceilometer-pep8 + - gate-ceilometer-python26 + - gate-ceilometer-python27 + - gate-ceilometer-python26-essex + - gate-ceilometer-python27-essex + gate: + - gate-ceilometer-merge: + - gate-ceilometer-pep8 + - gate-ceilometer-python26 + - gate-ceilometer-python27 + + - name: heat-api/heat + check: + - gate-heat-merge: + - gate-heat-pep8 + - gate-heat-python26 + - gate-heat-python27 + gate: + - gate-heat-merge: + - gate-heat-pep8 + - gate-heat-python26 + - gate-heat-python27 + + - name: stackforge/reddwarf + check: + - gate-reddwarf-merge: + - gate-reddwarf-pep8 + - gate-reddwarf-python26 + - gate-reddwarf-python27 + gate: + - gate-reddwarf-merge: + - gate-reddwarf-pep8 + - gate-reddwarf-python26 + - gate-reddwarf-python27 + diff --git a/modules/stackforge-config/README b/modules/stackforge-config/README deleted file mode 100644 index 2ffb8bf738..0000000000 --- a/modules/stackforge-config/README +++ /dev/null @@ -1 +0,0 @@ -This file stores config files specific to the Stackforge project. diff --git a/modules/stackforge-config/files/zuul/layout.yaml b/modules/stackforge-config/files/zuul/layout.yaml deleted file mode 100644 index 0956f2c4c5..0000000000 --- a/modules/stackforge-config/files/zuul/layout.yaml +++ /dev/null @@ -1,70 +0,0 @@ -queues: - - name: check - manager: IndependentQueueManager - trigger: - - event: patchset-created - success: - verified: 1 - failure: - verified: -1 - - - name: gate - manager: DependentQueueManager - trigger: - - event: comment-added - approval: - - approved: 1 - success: - verified: 2 - submit: true - failure: - verified: -2 - - - name: post - manager: IndependentQueueManager - trigger: - - event: ref-updated - ref: ^(?!refs/).*$ - -jobs: - - name: ^.*-merge$ - failure-message: This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset. - -projects: - - name: stackforge/ceilometer - check: - - gate-ceilometer-merge: - - gate-ceilometer-pep8 - - gate-ceilometer-python26 - - gate-ceilometer-python27 - - gate-ceilometer-python26-essex - - gate-ceilometer-python27-essex - gate: - - gate-ceilometer-merge: - - gate-ceilometer-pep8 - - gate-ceilometer-python26 - - gate-ceilometer-python27 - - - name: heat-api/heat - check: - - gate-heat-merge: - - gate-heat-pep8 - - gate-heat-python26 - - gate-heat-python27 - gate: - - gate-heat-merge: - - gate-heat-pep8 - - gate-heat-python26 - - gate-heat-python27 - - - name: stackforge/reddwarf - check: - - gate-reddwarf-merge: - - gate-reddwarf-pep8 - - gate-reddwarf-python26 - - gate-reddwarf-python27 - gate: - - gate-reddwarf-merge: - - gate-reddwarf-pep8 - - gate-reddwarf-python26 - - gate-reddwarf-python27 diff --git a/modules/stackforge-config/files/zuul/logging.conf b/modules/stackforge-config/files/zuul/logging.conf deleted file mode 100644 index 948b05826b..0000000000 --- a/modules/stackforge-config/files/zuul/logging.conf +++ /dev/null @@ -1,39 +0,0 @@ -[loggers] -keys=root,zuul - -[handlers] -keys=console,debug,normal - -[formatters] -keys=simple - -[logger_root] -level=WARNING -handlers=console - -[logger_zuul] -level=DEBUG -handlers=debug,normal -qualname=zuul - -[handler_console] -level=WARNING -class=StreamHandler -formatter=simple -args=(sys.stdout,) - -[handler_debug] -level=DEBUG -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('/var/log/zuul/debug.log', 'midnight', 1, 30,) - -[handler_normal] -level=INFO -class=logging.handlers.TimedRotatingFileHandler -formatter=simple -args=('/var/log/zuul/zuul.log', 'midnight', 1, 30,) - -[formatter_simple] -format=%(asctime)s %(levelname)s %(name)s: %(message)s -datefmt=