Merge lp:~joetalbott/qa-dashboard/fix_for_15.04 into lp:qa-dashboard

[Joe Talbott]

  Fix for snappy stable results (i.e. core_15.04_edge)

  The dot was not being accepted by the url regex.
  Also fix jenkins url.

  Fix for snappy stable results (i.e. core_15.04_edge)

  The dot was not being accepted by the url regex.
  Also fix jenkins url.

[Paul Larson (pwlars)]

Interesting, I didn't know the statsd server had changed. I trust the jenkins url change isn't going to affect the stuff we have running on dev-jenkins becuase that's a different deployment? +1 otherwise

review: Approve

[Para Siva (psivaa)]

+1, Thanks for the fix

review: Approve

[Chris Johnston (cjohnston)]

The attempt to merge lp:~joetalbott/qa-dashboard/fix_for_15.04 into lp:qa-dashboard failed. Below is the output from the failed tests.

Creating test database for alias 'default'...
Type 'yes' if you would like to try deleting the test database 'test_qa_dashboard', or 'no' to cancel:
Got an error creating the test database: database "test_qa_dashboard" already exists

EOFError: EOF when reading a line

[Chris Johnston (cjohnston)]

The attempt to merge lp:~joetalbott/qa-dashboard/fix_for_15.04 into lp:qa-dashboard failed. Below is the output from the failed tests.

Creating test database for alias 'default'...
Type 'yes' if you would like to try deleting the test database 'test_qa_dashboard', or 'no' to cancel:
Got an error creating the test database: database "test_qa_dashboard" already exists

EOFError: EOF when reading a line

=== modified file 'qa_dashboard/settings_base.py'
--- qa_dashboard/settings_base.py	2015-03-27 19:39:12 +0000
+++ qa_dashboard/settings_base.py	2015-06-05 16:42:40 +0000
@@ -39,7 +39,7 @@
 PROJECT_PATH = os.path.dirname(os.path.abspath(__file__))
 LAUNCHPADLIB_CACHE = ".cache/launchpadlib"
 
-JENKINS_URL = "http://dev-jenkins.ubuntu-ci:8080/"
+JENKINS_URL = "http://jenkins.qa.ubuntu.com"
 
 MANAGERS = ADMINS
 
@@ -323,7 +323,7 @@
 # txstatsd config
 
 TXSTATSD_ENABLED = False
-TXSTATSD_HOST = "snakefruit.canonical.com"
+TXSTATSD_HOST = "asrai.canonical.com"
 TXSTATSD_PORT = 10041
 
 # Use local settings if available

=== modified file 'smokeng/urls.py'
--- smokeng/urls.py	2013-11-21 17:46:02 +0000
+++ smokeng/urls.py	2015-06-05 16:42:40 +0000
@@ -22,12 +22,12 @@
     'smokeng.views',
     url(r'^api/', include(v1_api.urls)),
     url(
-        r'^(?:(?P<release>\w+)/)?(?:(?P<variant>\w+)/)?$',
+        r'^(?:(?P<release>\w+)/)?(?:(?P<variant>(\w|\.)+)/)?$',
         'overview',
         name='smokeng_overview',
     ),
     url(
-        r'^(?P<release>\w+)/(?P<variant>\w+)/(?P<arch>\w+)'
+        r'^(?P<release>\w+)/(?P<variant>(\w|\.)+)/(?P<arch>\w+)'
         '/(?P<build_number>'
         '(\d+:\d+(\.\d+|):\d+(\.\d+|)|\d+(\.\d+|( |%20)\?|)))'
         '/(?P<image_id>\d+)/$',
@@ -35,7 +35,7 @@
         name='smokeng_image_overview',
     ),
     url(
-        r'^(?P<release>\w+)/(?P<variant>\w+)/(?P<arch>\w+)'
+        r'^(?P<release>\w+)/(?P<variant>(\w|\.)+)/(?P<arch>\w+)'
         '/(?P<build_number>'
         '(\d+:\d+(\.\d+|):\d+(\.\d+|)|\d+(\.\d+|( |%20)\?|)))'
         '/(?P<image_id>\d+)/(?P<name>.*)/(?P<id>\d+)/$',
@@ -43,7 +43,7 @@
         name='smokeng_test_result_detail',
     ),
     url(
-        r'^(?P<release>\w+)/(?P<variant>\w+)/(?P<arch>\w+)'
+        r'^(?P<release>\w+)/(?P<variant>(\w|\.)+)/(?P<arch>\w+)'
         '/(?P<build_number>'
         '(\d+:\d+(\.\d+|):\d+(\.\d+|)|\d+(\.\d+|( |%20)\?|)))'
         '/(?P<image_id>\d+)/(?P<name>.*)/$',