Commit Graph

215 Commits

Author SHA1 Message Date
Monty Taylor
9e63f0b303 Decode key returned from db into unicode.
We get this error in cron:

/usr/local/gerrit/scripts/update_gerrit_users.py:339: UnicodeWarning:
Unicode equal comparison failed to convert both arguments to Unicode -
interpreting them as being unequal
  if key.strip() not in db_keys:

The stuff from Launchpad comes back as unicode, but the stuff from MySQL
comes back as string, which makes the in comparison wonky.

Perhaps we should upgrade the database to unicode properly as well...

Change-Id: I5ef66763429ca490d799ebb5b030abdc4d5de67e
2012-05-26 12:01:51 -04:00
Monty Taylor
4793ef2afc Fix two typos in the remote fetch script.
The default values for locations were wrong.
The config file name is remotes.config.
The git repos are in /home/gerrit2/review_site/git.

Change-Id: Ie887b2424e3ee50f802573e147cd4751e390d3e8
2012-05-26 10:16:28 -04:00
Jenkins
7b127cb360 Merge changes I76ad015e,Iabe17164
* changes:
  Add pyflakes to Jekins slaves
  Make all Python pass pyflakes
2012-05-25 16:51:23 +00:00
Andrew Hutchings
aae2f80fdd Make all Python pass pyflakes
This found one bug, but will also help us with Jenkins testing of these scripts

Change-Id: Iabe171645c06f769957db7cf0def1d10a0e47988
2012-05-25 14:26:41 +01:00
Thierry Carrez
c7ceb721f6 Update series bugtasks status on stable/* changes
Makes update_bug.py Gerrit/LP hook support setting series-specific
bug tasks to FixCommitted status on change-merged to stable/*
branches. Fixes bug 921588.

Also sets "In Progress" on patchset-created to stable/*.

Change-Id: I5e3b7c8d249755a71f3425dd33151764be2a1485
2012-05-23 16:51:59 +02:00
Thierry Carrez
735715899c Fix typo causing update_bug hook failure
A typo in update_bug.py recent changes was causing hook
failure. Fixes bug 1003377.

Change-Id: Ie86a8431b19cbf1777ec3ca6abaf0df51f7d51f7
2012-05-23 14:18:43 +02:00
Monty Taylor
f5c0cbb07f Remove refreshonly - it's only for exec types.
Change-Id: I5340d4bd3d1b2998d67ec1fcbcb48837e47bdac0
2012-05-22 11:52:37 -04:00
Jenkins
4e2eb0f081 Merge "Skip fix committed for some projects." 2012-05-22 15:51:44 +00:00
Jenkins
91b3c16838 Merge "Restart gerritbot if we push new versions." 2012-05-22 15:36:50 +00:00
Andrew Hutchings
32b780b9b3 Switch to RBR for Gerrit's MySQL binlogs
MySQL binlogs are filling up quick due to lots of delete statements during user
sync that don't delete any rows.  We could test to see if the rows exist first
but this would be a performance hit on a script that takes forever to run as it
is (plus the new sync script will work differently and not have this problem).

Switching to RBR which will only log row changes so will ignore these deletes.

Fixes bug #1002550

Change-Id: Ief2097de63bd0a5bde129b72cec87ff3745a6ea1
2012-05-22 12:04:51 +01:00
Jenkins
88e08a5164 Merge "Add SSH key syncing to user sync" 2012-05-21 16:47:12 +00:00
Monty Taylor
d2d85fff67 Restart gerritbot if we push new versions.
Change-Id: I767a52f5b25aff0e64acd4b0f75dc522256b7af3
2012-05-21 12:41:06 -04:00
Monty Taylor
456cbd6f4b Import pkg_resources before launchpadlib.
Fixes bug 1001664. It's a hack, but it's not an evil hack.

Change-Id: I6d09cdecc5cae64a21cefad81c75ed1c02c4801c
2012-05-19 11:15:31 -04:00
Monty Taylor
38693e0a39 Skip fix committed for some projects.
There are a set of projects which release directly from git,
so we can just set them directly to fix released.

Fixes bug 943413.

Change-Id: I0186b67efaa5eee7130ae9d5a677dfb2951a98e8
2012-05-19 10:04:01 -04:00
Andrew Hutchings
a12bab8988 Add SSH key syncing to user sync
Previously the user update script only synced the SSH keys upon adding a user.
This will make it add new keys to gerrit on every run.

Fixes bug #1001180

Also added a lock file since it is sometimes taking longer than 15 minutes to
execute (especially now we are pulling SSH keys) and has jammed up StackForge.

Change-Id: I28fd0f557568c20a07e724bcd3d9c789a62fff42
2012-05-18 14:33:37 +01:00
Jenkins
66dff2a2db Merge "Add parameters for scripts that talk to Gerrit" 2012-05-17 21:02:17 +00:00
Andrew Hutchings
ab8c2a7ba7 Add parameters for scripts that talk to Gerrit
Not all gerrit installations are configured the same.  This adds parameters
to the gerrit sync script and expire script so that it can work from the
command line and cron on all servers.

Fixes bug #994201

Change-Id: Iac37e18aaf7a10fb5594be233e33b000eabed336
2012-05-17 15:16:29 +01:00
Monty Taylor
4b7476294e Update gerritbot to respond to VRFY +2/-2.
Change-Id: Iece4652e00b665137061709b4d3545b2f37eb248
2012-05-16 22:36:30 -04:00
Andrew Hutchings
06d4241646 Change expire messages
From Jim: "I think the confusion may be coming from people who only see this
message via email. In that case, indicating that the button is available in the
web UI when visiting the change may be helpful."

Done!

Change-Id: I1125cfc5040b6351ef956527b90e71f4d33f30a0
2012-05-14 17:27:50 +01:00
Andrew Hutchings
68e3619c1f Add restore messages to gerrit auto-expire script
Fixes bug #950497

Change-Id: Ib7c1eb134d21883c6d02987cceb3823c59f90abe
2012-05-14 16:12:18 +01:00
Monty Taylor
6fdebcf5af Adds support for tracking an upstream repos.
Change-Id: I3c92c19cf2c2fd6a911fbdbf4aeeb66e53cf07e0
2012-05-10 13:12:31 -04:00
Monty Taylor
fb93135e46 Add python-cinderclient support.
Add python-cinderclient to pull-requests closing.,
Add python-cinderclient jenkins jobs.
Re-add cinder and python-openstackclient and python-glanceclient to jenkins.

Change-Id: I415a0f6586f6c22036715513c38b5105ff319809
2012-05-03 14:25:11 -07:00
Monty Taylor
993563afe5 Install gerritbot files from puppet.
Change-Id: Ife98fa24e731bcbbe719f583b1788870433b7f10
2012-05-03 08:25:56 -07:00
David Shrewsbury
2b7496c0ee Compress database backups.
Fixes bug 951600.

The update_gerrit_users.py script creates a database backup
everytime it runs. This change compresses the backups as they
are being made and adds a cron job that will remove backups that
are 30 days or older. Current backups will need to be manually
compressed.

Change-Id: Idb90d4af629892f1bc2e3e98f35f7de2ad58d4be
2012-05-03 09:35:45 -04:00
Monty Taylor
af48c6d986 Move gerrit scripts to puppet.
Take the things from openstack-ci/gerrit and move them directly
in to the puppet module. Install them using the model we're using
for the jenkins slave scripts.

Change-Id: I420b2b895bd57d40232b2cdda437617373a82890
2012-05-01 17:31:05 -04:00
Andrew Hutchings
9069914ebe Change outdated color
To be landed after the gerrit change in https://review.openstack.org/6749/ had been applied.  Lightens the red used for the outdated highlight.

Change-Id: I33a89873968c0c8e6cb8dfa30892d50337b9a124
2012-04-24 15:56:56 +01:00
James E. Blair
69bc0c1061 Fix gerrit config file permissions.
Match what gerrit init creates; otherwise, gerrit init will
delete and recreate the secure config file, losing the database
password in the process.

Change-Id: Ic1632fe3b24a0e4498b2415029e8a1db0fd1dfe2
2012-04-24 07:36:24 -07:00
James E. Blair
83d516611a Add note about launchpadlib creds
Change-Id: Iea5c39f9fbac8f5b6a22d1e31a8983e936aed5cd
2012-04-13 09:22:57 -07:00
James E. Blair
20bf6a8139 Add python-mysqldb to gerrit servers
And other depends for launchpad sync script.

Change-Id: I1f2d628485b201fadeb46fed4b48bba65f283d00
2012-04-12 17:47:34 -07:00
James E. Blair
16a44c5416 Add ServerName to apache vhost
Change-Id: I8f52bab84dd7ab5713d31e5df6e9a389532a5af2
2012-04-12 16:46:32 -07:00
James E. Blair
c4eaff3957 Install and manage more of Gerrit.
Upgrade gerrit to 2.3.0.

Add management of the apache virtualhost.

Remove gerrit body styling (including the javascript hack) in favor
of using the gerrit theme config options for body styling.  Keep header
and top menu changes.  This should make it easier to keep up with new
gerrit versions without chasing weird GWT changes.

Add management of the gerrit init script.

Add management of MySQL.

Add installation and upgrading of Gerrit.

Change-Id: Idf9e551552d335a2ae82cd27a63edcf6daf94115
2012-04-11 22:38:15 +00:00
Andrew Hutchings
1fb69a103a Fix hidden hyperlink images in Gerrit
Some hyperlinks in Gerrit use background images (why God why?!).  An example is any 'X' link to delete something.  Lets unhide these.

Fixes bug 974413

Change-Id: I851a407750bc0ef70969a897b125861d0106da80
2012-04-10 11:48:27 +01:00
James E. Blair
33ef15108a Revert "Move gerrit scripts into puppet module"
This reverts commit 428ec0b42d
2012-04-05 20:15:19 +00:00
Andrew Hutchings
428ec0b42d Move gerrit scripts into puppet module
Moving the cron executed gerrit scripts into the puppet module.  This is for two reasons:

1. Easier/faster to deploy/maintain than having a cron job for a separate git repo
2. We can add customisations required for review-dev and stackforge

Change-Id: Iaf44e1d57d6ee6ea282575b1b48261f4ccbbaf3f
2012-04-04 15:27:18 +01:00
Devananda van der Veen
8b2ec5b7ae Enable MySQL connection pooling
Connection pool must be explicitly enabled.
See lines 160 - 175 of file
  gerrit:gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java

Change-Id: I0f2d712cfa622d318e81a327ce18283aa086f894
2012-04-03 20:01:16 -07:00
Andrew Hutchings
5b32163857 Fix patch js hack for Chrome
Chrome doesn't handle window.onload in the same way as other browsers, this compensates (and cleans up the JS a little)

Change-Id: If629155a6f305e5079f70db6d4045896fb43b483
2012-03-29 17:17:06 +01:00
Andrew Hutchings
0d6deb7a80 Use improved StackForge logo
Change-Id: Icdcec9b4e2437731106ce97f7785e142b85443ed
2012-03-26 14:15:31 +01:00
Jenkins
8ac1fd5cb3 Merge "Make the Search button a bit bigger" 2012-03-22 21:48:54 +00:00
Dolph Mathews
be5ce59755 Better match openstack.org H1's
Change-Id: I0c17e05acf46e164e714ecd836601f5fdcf1e6fb
2012-03-22 10:12:20 -05:00
Dolph Mathews
79c61e76e8 Make the Search button a bit bigger
Change-Id: I8539e7f9df750412b6b048f38f0ef7548e541392
2012-03-22 10:05:01 -05:00
Andrew Hutchings
1ca926ba72 Cleanup gerrit style
Fixes:

bug #961395
bug #961394
bug #961367

Change-Id: I887fc7529ede981eb8f7e85346d1530289b982f0
2012-03-21 17:15:07 +00:00
Andrew Hutchings
87daa5e032 Fix logo in gerrit
Puppet wasn't evaluating ${title} due to wrong quotes used

Change-Id: I70bdb25e895791512a3a6683366878b1ab31e974
2012-03-21 16:40:19 +00:00
Andrew Hutchings
31c328b623 Fix Puppet for Review site
Natty's puppet doesn't support system users so remove that for now.

Change-Id: Ie389462d60530710e5c8c18ba9e9426f3b996694
2012-03-21 16:27:29 +00:00
Andrew Hutchings
08be53181b Add Openstack look to gerrit
* Adds stylesheet, header and images to make gerrit look more like an Openstack thing
* Adds Javascript hack that the CSS detects so we don't ruin the style of the patch pages
* Adds both openstack and stackforge logo
* Also adds stackforge logo to stackforge Jenkins

Change-Id: Ic541443fb706ab119a9d47f474bcad2bf8e9907e
2012-03-21 15:35:47 +00:00
Andrew Hutchings
00059f5b2f Modify puppet repo to work with stackforge
Add stackforge manifest (can be pointed to in puppet.ini)
Remove gerrit_installed lib (doesn't work with puppet master)
Make jenkins_master module more generic
Have an SSH key for different jenkins_slave setups

Change-Id: Ic52f06d150210038aaf47c48aeb7c991b94c6fc8
2012-03-16 14:21:11 +00:00
Hengqing Hu
dcd994da28 Remove trailing whitespaces in regular file
Change-Id: I06d4ed2a8153820f7253c6602bfa8c05af59e06f
2012-03-09 16:02:04 +08:00
James E. Blair
5cd947a18c Repack git repos weekly.
Early Sunday mornings, repack all the git repos in gerrit.  This
currently takes 41 seconds for all 32 repositories, so running
it weekly doesn't seem too intensive.

Fixes bug 943623.

Change-Id: Iff0e999c27b428cd1170706e3dc7ede3a1a178a8
2012-03-08 16:00:43 -08:00
Andrew Hutchings
6f48f94585 Add support for LP: #nnnnnn bug format
Fixes bug: 928444

Change-Id: Iab6b9206e4fad8bb64c4c8d8002950ab63d334af
2012-02-08 20:41:15 +00:00
James E. Blair
6c779a5f83 Increase sshd threads for gerrit.
Based on the advice in this thread:
http://groups.google.com/group/repo-discuss/browse_thread/thread/b91491c185295a71

Size the sshd threads (which are also used to handle https git requests)
better.  Based on current trends, we peak at about 50% cpu usage
and 25% memory usage.  Double the number of threads here to try to
allow us to get closer to 100% cpu.

(Corresponding increase in db connections.)

Change-Id: Icde18233de01466b241ab28d38d2e98735108193
2012-02-02 14:29:12 +13:00
Jenkins
b63c79a982 Merge "Adds expire_old_reviews.py to puppet" 2012-01-23 22:51:38 +00:00
James E. Blair
559b0c86d5 Tune gerrit parameters.
In order to clone 8 keystone repos simultaneously via https in dev,
the following were needed:

httpd.acceptorThreads>=4
sshd.threads>=8

And database.poolLimit is supposed to be higher than http+ssh threads.

Change-Id: I8d011af41e32f7865424d54d5a78a10a3689e708
2012-01-20 15:50:04 +11:00
Andrew Hutchings
eeaba1202a Adds expire_old_reviews.py to puppet
Adds a cron job to puppet for expire_old_reviews.py and creates a directory for the logs

Required for bug 907842

Change-Id: Ia07fd6dd90035d34a2008a99263274d2846d2c7a
2012-01-12 13:00:50 +00:00
James E. Blair
ee1cf2b75d Remove reference to form in fake CLA.
Change-Id: I83655661c3c517de10bd249bde60d20869a8a6ba
2012-01-06 12:03:37 -08:00
James E. Blair
ebac164ee0 Add CLA config to gerrit.
Also add the echosign "cla" which just points devs to the wiki page.

Change-Id: I0ef37511d9f7e7495d78f2f3cd9fde47f88aa99c
2012-01-04 10:49:40 -08:00
Thierry Carrez
89d0eb6d84 Enable update_bug.py generic hook
Use update_bug.py generic hook to update Launchpad bug status on
change-merged and patchset-created events.

This should be merged after https://review.openstack.org/2367
which adds update_bug.py to openstack-ci.

Change-Id: I0098cfacd7c320f3acadd960b97e531febf57218
2011-12-19 16:37:44 +01:00
Thierry Carrez
fa41ae0c0b Only master merges set bugs to FixCommitted
Fix bug 888479:
Only allow master branch merges to set bug status to FixCommitted.
For other branches (think stable/diablo or milestone-proposed), set
a in-BRANCHNAME tag instead, to allow for efficient searching.

Change-Id: I6401ab4ba92f7983040ac8b2008c88490e2589d8
2011-11-10 12:02:03 +01:00
Thierry Carrez
43153110e6 Include branch name in email notification subject
Include branch name in email notification subject, and shorten the subject.
Fixes bug 859620.

Change-Id: I9eea5e051f71918eb417e620749b55eb73c9fc40
2011-10-19 15:02:57 +02:00
James E. Blair
37ffe84997 Fix commentlink regex for blueprints.
Fixes bug 868376.

Change-Id: I9cc39941dfb623be1519bf91f67b98001ab843c7
2011-10-06 10:52:48 -04:00
James E. Blair
ced39692eb Increase gerrit session timeout to 24h.
Set session cookies to SSL-only.

Change-Id: Ie49b0fe90f4c8c9f1c603d21b21e67fbdda6196c
2011-09-14 11:20:47 -07:00
James E. Blair
0d8b89c252 Cleanup.
Remove include cowbuilder; not needed since it's a module.
Change cron strings to single quotes so that puppet doesn't try to
interpolate escaped chars.

Change-Id: I4f6b7b84fc7b0b67a49edabc5138bcbe345d1784
Reviewed-on: https://review.openstack.org/267
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
2011-08-18 20:29:15 +00:00
James E. Blair
cfa2c921cb Add gitweb to gerrit servers.
Change-Id: Ibf958392eff5011e3c150a192f4fc33abc0570aa
Reviewed-on: https://review.openstack.org/266
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
2011-08-17 21:16:51 +00:00
James E. Blair
92f82238bc Put blueprint updates into production.
Call the blueprint update script from the patchset created hook.

Add blueprint comment links.
Also, add changeid comment links.

This change depends on I62f965ca7f14f589e3b299ea46729efb68abd06f
in openstack-ci.

Change-Id: I62b0644ffea4b4d7f5a3407fc9e776b28e200278
Reviewed-on: https://review.openstack.org/254
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
2011-08-16 22:15:35 +00:00
James E. Blair
4d39ca5280 Fix crontab typos for gerrit jobs.
Change-Id: Ibd0b539dd0e68f0f420103a82733791baf382836
Reviewed-on: https://review.openstack.org/240
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
2011-08-15 22:58:26 +00:00
James E. Blair
f252d95d5c Add cron job for closing pull requests.
Also move the launchpad sync cron into puppet.
Create config file for github pull close script.

This change depends on https://review.openstack.org/#change,224

Change-Id: I1b7ad599a6c7542614780ea0ce46a42a8995d15b
Reviewed-on: https://review.openstack.org/225
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
2011-08-15 16:06:02 +00:00
James E. Blair
9b06e7fdc8 Add Gerrit configuration to puppet.
Change-Id: I26ebd80adb00ac5bf676533d5dd9359cbbe08075
2011-08-05 16:36:48 -07:00