Merge into trunk : buildout-charm : Code : pkgme service

Status:	Merged
Approved by:	Jonathan Lange on 2012-11-08
Approved revision:	143
Merged at revision:	139
Proposed branch:	lp:~jml/pkgme-service/buildout-charm
Merge into:	lp:pkgme-service
Diff against target:	96 lines (+17/-27) 5 files modified buildout-templates/django.wsgi.in (+1/-0) charms/precise/pkgme-service/hooks/install (+9/-21) charms/precise/pkgme-service/revision (+1/-1) dev_config/manifests/pkgme_service_db.pp (+5/-4) dev_config/templates/httpd.conf.erb (+1/-1)
To merge this branch:	bzr merge lp:~jml/pkgme-service/buildout-charm
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
James Westby (community)		2012-11-02	Approve on 2012-11-02
Review via email: mp+132708@code.launchpad.net

Commit message

Update charm to use buildout

Description of the change

Updates the charm to use buildout.

Known issues:

* README out of date
* Installs pkgme-service-dependencies, which depends on things that are
now superfluous, as they are provided by buildout
* Warning in apache error log /var/lib/juju/units/pkgme-service-0/charm/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/__init__.py:4: UserWarning: Module bson was already imported from /usr/lib/python2.7/dist-packages/bson/__init__.pyc, but /var/lib/juju/units/pkgme-service-0/charm/eggs/bson-0.3.3-py2.7.egg is being added to sys.path

Revision history for this message

James Westby (james-w) on 2012-11-02:

#

review: Approve

Revision history for this message

ISD Branch Mangler (isd-branches-mangler) wrote on 2012-11-07:

#

Download full text (5.8 KiB)

The attempt to merge lp:~jml/pkgme-service/buildout-charm into lp:pkgme-service failed. Below is the output from the failed tests.

./bin/py django_project/manage.py test djpkgme
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

Tree is up to date at revision 43 of branch bzr+ssh://bazaar.launchpad.net/+branch/ca-download-cache
...........................E.........................
======================================================================
ERROR: test_gtk (djpkgme.tests.test_integration.TestEndToEnd)
djpkgme.tests.test_integration.TestEndToEnd.test_gtk
----------------------------------------------------------------------
_StringException: Empty attachments:
twisted-log

celery-log: {{{
[2012-11-07 11:54:22,933: WARNING/MainProcess] -------------- <email address hidden> v2.5.0
---- **** -----
--- * *** * -- [Configuration]
-- * - **** --- . broker: djkombu.transport.DatabaseTransport:////
- ** ---------- . loader: djcelery.loaders.DjangoLoader
- ** ---------- . logfile: <email address hidden>@WARNING
- ** ---------- . concurrency: 1
- ** ---------- . events: ON
- *** --- * --- . beat: OFF
-- ******* ----
--- ***** ----- [Queues]
-------------- . celery: exchange:celery (direct) binding:celery
[2012-11-07 11:54:23,014: WARNING/MainProcess] <email address hidden> has started.
[2012-11-07 11:54:34,208: INFO/PoolWorker-1] ['tar', '--force-local', '--no-same-owner', '--no-same-permissions', '-xf', u'/tmp/tmp2semEr/download/package-name4.tar.gz', '-C', '/tmp/tmp2semEr/working'] finished in 2.202s
[2012-11-07 11:54:46,028: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/python-stub/want'] finished in 11.818s
[2012-11-07 11:54:46,430: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/diff/want'] finished in 0.401s
[2012-11-07 11:54:46,696: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/pdf/want'] finished in 0.265s
[2012-11-07 11:54:46,980: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/deb-bin/want'] finished in 0.282s
[2012-11-07 11:54:47,255: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/exe/want'] finished in 0.274s
[2012-11-07 11:54:47,599: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/deb-src/want'] finished in 0.343s
[2012-11-07 11:54:47,871: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/text/want'] finished in 0.271s
[2012-11-07 11:54:48,134: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/image/want'] finished in 0.262s
[2012-11-07 11:54:48,393: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/shell/want'] finished in 0.259s
[2012-11-07 11:54:48,665: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/desktop/want'] finished in 0.271s
[2012-11-07 11:...

The attempt to merge lp:~jml/pkgme-service/buildout-charm into lp:pkgme-service failed. Below is the output from the failed tests.

./bin/py django_project/manage.py test djpkgme
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

Tree is up to date at revision 43 of branch bzr+ssh://bazaar.launchpad.net/+branch/ca-download-cache
...........................E.........................
======================================================================
ERROR: test_gtk (djpkgme.tests.test_integration.TestEndToEnd)
djpkgme.tests.test_integration.TestEndToEnd.test_gtk
----------------------------------------------------------------------
_StringException: Empty attachments:
  twisted-log

celery-log: {{{
[2012-11-07 11:54:22,933: WARNING/MainProcess] -------------- celery@test-74637456.server-4226a987-b7d4-4140-995e-ce178d47c80c v2.5.0
---- **** -----
--- * ***  * -- [Configuration]
-- * - **** ---   . broker:      djkombu.transport.DatabaseTransport:////
- ** ----------   . loader:      djcelery.loaders.DjangoLoader
- ** ----------   . logfile:     celeryd@test-74637456.log@WARNING
- ** ----------   . concurrency: 1
- ** ----------   . events:      ON
- *** --- * ---   . beat:        OFF
-- ******* ----
--- ***** ----- [Queues]
 --------------   . celery:      exchange:celery (direct) binding:celery
[2012-11-07 11:54:23,014: WARNING/MainProcess] celery@test-74637456.server-4226a987-b7d4-4140-995e-ce178d47c80c has started.
[2012-11-07 11:54:34,208: INFO/PoolWorker-1] ['tar', '--force-local', '--no-same-owner', '--no-same-permissions', '-xf', u'/tmp/tmp2semEr/download/package-name4.tar.gz', '-C', '/tmp/tmp2semEr/working'] finished in 2.202s
[2012-11-07 11:54:46,028: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/python-stub/want'] finished in 11.818s
[2012-11-07 11:54:46,430: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/diff/want'] finished in 0.401s
[2012-11-07 11:54:46,696: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/pdf/want'] finished in 0.265s
[2012-11-07 11:54:46,980: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/deb-bin/want'] finished in 0.282s
[2012-11-07 11:54:47,255: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/exe/want'] finished in 0.274s
[2012-11-07 11:54:47,599: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/deb-src/want'] finished in 0.343s
[2012-11-07 11:54:47,871: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/text/want'] finished in 0.271s
[2012-11-07 11:54:48,134: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/image/want'] finished in 0.262s
[2012-11-07 11:54:48,393: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/shell/want'] finished in 0.259s
[2012-11-07 11:54:48,665: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/desktop/want'] finished in 0.271s
[2012-11-07 11:54:49,050: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/jar/want'] finished in 0.384s
[2012-11-07 11:54:49,367: INFO/PoolWorker-1] ['/tmp/eggs/pkgme_devportal-0.4.10-py2.7.egg/devportalbinary/backends/binary/want'] finished in 0.316s
}}}

celery-startup-log: {{{
[1;36mceleryd-multi v2.5.0[0m
> Starting nodes...
	> test-74637456.server-4226a987-b7d4-4140-995e-ce178d47c80c: [1;32mOK[0m
}}}

django-settings: {{{
MULTILANG_OP_ENDPOINTS = False
MYAPPS_BASE_URL = ''
BROKER_USER = ''
PKGME_LOG_DIR = '.'
SITE_ID = 1
OPENID_SREG_REQUIRED_FIELDS = ['email', 'nickname']
MYAPPS_REALM = 'Pkgme'
OPENID_LAUNCHPAD_STAFF_TEAMS = ['canonical-ca-hackers', 'canonical-losas']
OOPSES = {'publishers': [{'error_dir': 'oopses', 'exchange_name': '', 'routing_key': '', 'instance_id': 'dev', 'vhost': '', 'host': '', 'user': '', 'new_only': '', 'password': '', 'type': 'datedir'}]}
ROOT_URLCONF = 'django_project.urls'
CELERYD_TASK_TIME_LIMIT = 120
OPENID_LAUNCHPAD_TEAMS_MAPPING = {'canonical-losas': 'admin', 'canonical-ca-hackers': 'admin'}
PKGME_MAINTAINER_EMAIL = 'pkgme-service bot <ca-pkgme-service-bot@canonical.com>'
CELERY_DISABLE_RATE_LIMITS = True
OPENID_SREG_EXTRA_FIELDS = ['language']
OPENID_CREATE_USERS = True
BROKER_VHOST = ''
PKGME_OUTPUT_DIRECTORY = '/tmp/tmpRLGvh5'
EXTRA_INSTALLED_APPS = []
BROKER_PASSWORD = ''
MYAPPS_CONSUMER_KEY = 'pkgme-service-dev-consumer-key'
OPENID_SSO_SERVER_URL = 'https://login.ubuntu.com/'
CACHE_BACKEND = 'locmem://'
SETTINGS_MODULE = 'django_project.settings'
SETTINGS_ENCODING = 'utf-8'
OPENID_UPDATE_DETAILS_FROM_SREG = True
BROKER_HOST = ''
BROKER_PORT = 0
MYAPPS_TOKEN_SECRET = 'pkgme-service-dev-token-secret'
PKGME_OUTPUT_URL = 'http://localhost:8001/+output'
PKGME_ALLOWED_BACKENDS = ['binary', 'pdf', 'deb-bin', 'deb-src', 'desktop', 'diff', 'exe', 'image', 'jar', 'python-stub', 'shell', 'text']
MYAPPS_TOKEN = 'pkgme-service-dev-token'
MYAPPS_CONSUMER_SECRET = 'pkgme-service-dev-consumer-secret'
BROKER_BACKEND = 'djkombu.transport.DatabaseTransport'
}}}

syncdb-log: {{{
Syncing...
Creating tables ...
Installing custom SQL ...
Installing indexes ...
No fixtures found.

Synced:
 > django.contrib.auth
 > django.contrib.contenttypes
 > django.contrib.sessions
 > django.contrib.sites
 > django.contrib.messages
 > django.contrib.staticfiles
 > django.contrib.admin
 > piston
 > djpkgme
 > south
 > django_configglue
 > preflight
 > djkombu
 > django_openid_auth

Not synced (use migrations):
 - djcelery
(use ./manage.py migrate to migrate these)
}}}

TimeoutError: User timeout caused connection failure.

----------------------------------------------------------------------
Ran 53 tests in 123.491s

FAILED (errors=1)
make: *** [test] Error 1

 === modified file 'buildout-templates/django.wsgi.in'
 --- buildout-templates/django.wsgi.in	2012-10-30 18:23:06 +0000
 +++ buildout-templates/django.wsgi.in	2012-11-02 15:08:21 +0000
@@ -19,6 +19,7 @@
      return os.path.join(_z3c_recipe_filetemplate_base, path)
  import sys
  sys.path[0:0] = [
++    _z3c_recipe_filetemplate_base,
      ${string-paths}
+     ]
 === modified file 'charms/precise/pkgme-service/hooks/install'
 --- charms/precise/pkgme-service/hooks/install	2012-07-25 12:38:44 +0000
 +++ charms/precise/pkgme-service/hooks/install	2012-11-02 15:08:21 +0000
@@ -56,31 +56,19 @@
      apache2 \
      libapache2-mod-wsgi \
      python-wsgi-intercept \
--    rabbitmq-server
--
--# XXX: a public fork of the real config, which lives at
--# lp:~canonical-ca-hackers/ca-configs/pkgme-service-configmanager.
--# Differences are that it's public and that it uses public URLs.
--CONFIG_MANAGER_CONFIG="http://bazaar.launchpad.net/~canonical-ca-hackers/+junk/pkgme-service-configmanager"
--
--
--# Grab the branches
--CONFIG_MANAGER_BRANCH="https://code.launchpad.net/config-manager"
--
--bzr branch $CONFIG_MANAGER_BRANCH /tmp/config-manager
--bzr branch $CONFIG_MANAGER_CONFIG /tmp/config
--
--/tmp/config-manager/cm.py update /tmp/config/sourcedeps.conf
--
--rm -rf /tmp/config-manager
--rm -rf /tmp/config
++    rabbitmq-server \
++    gcc \
++    python-dev \
++    libpq-dev
  SERVICE_NAME="pkgme-service"
--# Build the code
--(cd ${SERVICE_NAME}/sourcecode/pkgme && python setup.py build)
--(cd ${SERVICE_NAME}/sourcecode/pkgme-devportal && python setup.py build)
++bzr export download-cache https://code.launchpad.net/ca-download-cache
++bzr branch https://code.launchpad.net/pkgme-service ${SERVICE_NAME}
++
++(cd ${SERVICE_NAME} && make)
++
  # XXX: Grab canonical-memento and use it?
 === modified file 'charms/precise/pkgme-service/revision'
 --- charms/precise/pkgme-service/revision	2012-07-26 14:51:14 +0000
 +++ charms/precise/pkgme-service/revision	2012-11-02 15:08:21 +0000
@@ -1,1 +1,1 @@
--39
++46
 === modified file 'dev_config/manifests/pkgme_service_db.pp'
 --- dev_config/manifests/pkgme_service_db.pp	2012-07-03 13:22:23 +0000
 +++ dev_config/manifests/pkgme_service_db.pp	2012-11-02 15:08:21 +0000
@@ -15,10 +15,11 @@
+ }
  user {$unix_user:
--   comment => 'This user was created by Puppet',
--   ensure => 'present',
--   gid => $unix_user,
--   require => Group[$unix_user],
++  comment => 'This user was created by Puppet',
++  ensure => 'present',
++  gid => $unix_user,
++  require => Group[$unix_user],
++  managehome => true,
+ }
  exec { "rabbit-add-user-$rabbit_user":
 === modified file 'dev_config/templates/httpd.conf.erb'
 --- dev_config/templates/httpd.conf.erb	2012-02-28 16:39:54 +0000
 +++ dev_config/templates/httpd.conf.erb	2012-11-02 15:08:21 +0000
@@ -9,7 +9,7 @@
  WSGIProcessGroup <%= basedir %>
  WSGIPassAuthorization On
--WSGIScriptAlias / <%= basedir %>/django_project/django.wsgi
++WSGIScriptAlias / <%= basedir %>/django.wsgi
  <VirtualHost *:80>

pkgme service

Merge lp:~jml/pkgme-service/buildout-charm into lp:pkgme-service

Commit message

Description of the change

Preview Diff

Subscribers