28 Commits

Author SHA1 Message Date
Joshua Hesketh
0cc48ca190 Remove Jenkins EnvInject plugin from jenkins_dev
The inject plugin is no longer being used.

Change-Id: I7292bd8c87b4426c1b1b194e270cd8f99bef8879
2014-06-30 16:40:50 +10:00
Jenkins
bb3e2f19f0 Merge "Update jenkins gearman plugin version" 2014-06-25 22:56:28 +00:00
Jenkins
1536770d1d Merge "upgrade jenkins build-timeout plugin due to a performance bug" 2014-06-25 19:15:21 +00:00
Jenkins
c331e9c63e Merge "remove unused jenkins plugins from masters" 2014-06-25 18:29:17 +00:00
Khai Do
b3dbd3f308 Update jenkins gearman plugin version
Update the gearman plugin to pick up the project node registration fix
(Ie41af7b1a2f26a4ca2aac6c7263817d5021cca9b)

Change-Id: I06fd9699d1e52735e729a673063455aca249be02
2014-06-23 14:30:59 -07:00
Khai Do
08755fe2e0 upgrade jenkins build-timeout plugin due to a performance bug
There was a sever performance bug in version 1.13 :
https://issues.jenkins-ci.org/browse/JENKINS-23012

I have tested version 1.14 on jenkins_dev.o.o and have verified that I could
not reproduce the performance problem reported in ver 1.13.

I think it's safe to use this version because plugin does not enable the
log watching feature by default and none of our projects currently use
that feature.

Change-Id: I82f60ebe352d33e4664fdbc1ff1aa876527cb23a
2014-06-03 16:56:28 -07:00
Khai Do
71856746d2 give zaro access to jenkins-dev server
Zaro needs access to jenkins-dev server to test jenkins plugins.  Zaro has read
and agrees to the following http://ci.openstack.org/sysadmin.html#ssh-access

Change-Id: I21de249ff05fc3970bccd453daef3d4f7d2c8588
2014-06-02 21:28:18 -07:00
Khai Do
0a8496233a remove unused jenkins plugins from masters
Closes-Bug: #1300447
Change-Id: Ic3aadfe88b668b06772b4910513531403f2f6221
2014-06-01 07:23:14 -07:00
Jenkins
c1345a4a8a Merge "Fixes to nodepool installation on jenkins-dev.o.o" 2014-05-01 02:04:23 +00:00
Khai Do
9db30feadd update jenkins-dev.o.o with same plugins as jenkins.o.o
Manage jenkins plugins on jenkins-dev.o.o with puppet.  Set it to have the same plugins
as jenkins.o.o so it will be ready for testing.

Change-Id: I2009618121f85173c009ac4ec3977dc9bbc3215a
2014-04-25 13:30:02 -07:00
James E. Blair
398e1175f4 Fixes to nodepool installation on jenkins-dev.o.o
The patch to add nodepool to jenkins-dev (https://review.openstack.org/#/c/57333)
did not work.

There were a few issues with it:
  1. jenkins-dev.pp was passing literal strings to the nodepool module, instead it
     should be passing in the variables.
  2. jenkins-dev.pp was calling ::nodepool but puppet seems to think that it wants
     ::openstack_project::nodepool due to puppet's scoping weirdness :(
  3. The script to build nodepool machines needed the jenkins_dev_ssh_key.

Fixes to above issues:
  1. This is trivial, just passed the variables thru instead of literal strings.
  2. The nodepool.pp module is renamed to nodepool_prod.pp to prevent the scoping problem.
  3. We use the dev jenkins ssh key with dev nodepool by allowing the nodepool module
     to pass arbitrary env settings through the defaults file.

Change-Id: Id91053212f088079ff1b0f06ebdce5c381f5cd19
2014-04-25 11:52:08 -07:00
James E. Blair
8af61da62f Revert "Enable Gearman as default on Jenkins slaves"
SERVER: Invalid relationship: File[/var/lib/jenkins/hudson.plugins.gearman.GearmanPluginConfig.xml] { require => Class[Zuul] }, because Class[Zuul]doesn't seem to be in the catalog

This reverts commit 2a9cd677e4eb6a60787ebc73bd8fd9e1b6f26b34
2014-03-31 22:49:41 +00:00
iberezovskiy
2a9cd677e4 Enable Gearman as default on Jenkins slaves
We don't need to enable Gearman through Jenkins UI.
It'll we done as default.

Change-Id: I50a1506f7efa3d71034cca2caebb6e5ddb76285a
2014-03-21 12:08:31 +04:00
Khai Do
efe3323255 add nodepool to jenkins-dev server
We are co-locating nodepool on jenkins-dev to allow us to test
jenkins upgrades.  This dev nodepool is configured to only spin
up machines in one AZ on hpcloud.

Change-Id: I73f6d4373fa79fec8845d7d81fa1235f7fe15482
2013-12-03 18:21:31 +00:00
Khai Do
62e760ce32 configure jenkins logger for jenkins-dev.openstack.org
apply the same logging configuration for jenkins-dev as for
jenkins prod.

Change-Id: I5bff25b9e701a3f6ed764879d8110132a551271b
reference: https://review.openstack.org/#/c/38352
2013-07-24 10:39:06 -07:00
James E. Blair
dab09b9646 Fix ssh public key on jenkins-dev.
The "openstack_project" module must be included in order to reference
the ssh public key variable.

Change-Id: I7126bff62134d220d8e90e457788100eee04e04b
Reviewed-on: https://review.openstack.org/31550
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Elizabeth Krumbach Joseph <lyz@princessleia.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
2013-06-04 21:48:10 +00:00
James E. Blair
00d9391958 Add jenkins dev slaves.
Allow them to use an ssh key distinct from production.
Clean up unused slave classes.
Use dedicated keys on dev slaves (do this in prod in the future, but it's a
breaking change).
Add a dev_slave_template class for devstack-gate to use.
Remove devstack-gate deps from jenkins master (they're on devstack-launch
now).
Clean up unneeded remove statements for glance creds.
Tidy up some permissions on files where they weren't specified before.

Change-Id: I02cef1ee3951c5780084118073770521bebb9eda
Reviewed-on: https://review.openstack.org/29319
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
2013-05-20 17:34:27 +00:00
Jeremy Stanley
b9b510ba6a Connectivity from workers to gearmand on zuul.
* manifests/site.pp: Pass both jenkins.openstack.org and
jenkins-dev.openstack.org to openstack_project::zuul as the list of
gearman workers for use in iptables rules.

* modules/openstack_project/manifests/jenkins.pp
* modules/openstack_project/manifests/jenkins_dev.pp: Remove unused
4155/tcp from public allowed ports list, previously for a bzr
service which is no longer running on these servers.

* modules/openstack_project/manifests/zuul.pp: Add iptables rules
allowing access from gearman workers to the gearmand, and also
configure gearmand to listen on all addresses including IPv6, as
opposed to its IPv4-only default.

* install_modules.sh: Add puppetlabs-stdlib version 3.2.0 to the list of
puppet dependencies. This is required to pull in the "flatten" function
used in zuul.pp above.

Change-Id: I05d4abc92b3050884a7e9f3c2b6cd9dcc81bfa36
Reviewed-on: https://review.openstack.org/26245
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
2013-04-05 20:11:04 +00:00
Jeremy Stanley
7188fd57bc Revert "Connectivity from workers to gearmand on zuul."
This reverts commit f61a6e53dd3633346257f4d1c1b23cc661e057f5.

Change-Id: I8c94cdeff5bdef2160ce74ff2c1170ea0c25ae3b
Reviewed-on: https://review.openstack.org/26183
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
2013-04-05 02:24:14 +00:00
Jeremy Stanley
f61a6e53dd Connectivity from workers to gearmand on zuul.
* manifests/site.pp: Pass both jenkins.openstack.org and
jenkins-dev.openstack.org to openstack_project::zuul as the list of
gearman workers for use in iptables rules.

* modules/openstack_project/manifests/jenkins.pp
* modules/openstack_project/manifests/jenkins_dev.pp: Remove unused
4155/tcp from public allowed ports list, previously for a bzr
service which is no longer running on these servers.

* modules/openstack_project/manifests/zuul.pp: Add iptables rules
allowing access from gearman workers to the gearmand, and also
configure gearmand to listen on all addresses including IPv6, as
opposed to its IPv4-only default.

Change-Id: I3c9c31732bcb8d4033a5ec9a602242656d993d7b
Reviewed-on: https://review.openstack.org/25583
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
2013-04-04 16:17:08 +00:00
Matthew Wagoner
f31a426c65 Cleanup openstack_project manifest lint errors.
Now with extra unwrap!

Change-Id: I7c622ffa77821f33f911793fc6b6cdaaba37904a
Reviewed-on: https://review.openstack.org/15052
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
2012-11-21 17:48:11 +00:00
Clark Boylan
94a7768dc3 Pass sysadmins list into node defs.
Pass the sysadmins list into each node definition. This allows us to
retrieve the data from hiera rather than hard coding it in the puppet
manifests. Also, update test script to use bogus sysadmin data when
testing.

Change-Id: Ide3560f16bce4d66fb95cc5021fc879476e6a712
Reviewed-on: https://review.openstack.org/12512
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
2012-09-10 15:58:27 +00:00
Monty Taylor
e35a6e7c73 Aggregate jenkins modules into one module.
Put jenkins_master into jenkins::master and jenkins_job_builder into
jenkins::job_builder and jenkins_slave into jenkins::slave.

Change-Id: Icb0e3071894730c17d8f36f49e9d34979d9c568e
Reviewed-on: https://review.openstack.org/11249
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
2012-08-12 18:22:26 +00:00
Monty Taylor
be854cd76a Revert "Aggregate jenkins modules into one module."
This reverts commit 222f983fabfbf05f8aa074af90d60d7587acddfa

Change-Id: Iebc5744c5342a19aafdf24ea64e0b98812464ef4
Reviewed-on: https://review.openstack.org/11247
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
2012-08-12 18:12:03 +00:00
Monty Taylor
222f983fab Aggregate jenkins modules into one module.
Put jenkins_master into jenkins::master and jenkins_job_builder into
jenkins::job_builder and jenkins_slave into jenkins::slave.

Change-Id: I2a1d242ecab0e765ab1b1556bbebd2db8f632888
Reviewed-on: https://review.openstack.org/10842
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
2012-08-12 18:03:58 +00:00
Monty Taylor
7d8c838038 Align all web server usage on apache module.
Change-Id: Idd712a8ee5ec81c6b88b7d3e2270dce4da254927
Reviewed-on: https://review.openstack.org/10838
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
2012-08-12 17:03:46 +00:00
Monty Taylor
993f7c5f78 Rename backup to bup.
Naming it after what it installs. Also, split the target cronjob into
a define.

Change-Id: I73a4383f529c60bc35c60241dfc91508965d755e
Reviewed-on: https://review.openstack.org/10885
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
2012-08-07 06:19:37 +00:00
Monty Taylor
e498870959 Make a class for each type of server.
Change-Id: I520b77a4d83958a6a1c2472e87b28f6b8822d890
2012-07-23 10:33:20 -05:00