Merge lp:~roadmr/isitdeployable/existingdeployments into lp:isitdeployable

[Daniel Manrique]

Add querying and displaying of which versions of code are deployed in each service/environment.

Each project can have zero or more "Existing Deployments". Periodically, the service will poke a configured URL for each of these deployments, extract the value from a specific header, and store that for display in both the index page and each project's page.

Since most of our projects expose their current version in a X-VCS-Version or similar, this information can be collected for them, and the index page can then provide at a glance an overview of which versions each project is at.

Add querying and displaying of which versions of code are deployed in each service/environment.

Each project can have zero or more "Existing Deployments". Periodically, the service will poke a configured URL for each of these deployments, extract the value from a specific header, and store that for display in both the index page and each project's page.

Since most of our projects expose their current version in a X-VCS-Version or similar, this information can be collected for them, and the index page can then provide at a glance an overview of which versions each project is at.

[Maximiliano Bertacchini (maxiberta)]

Looks good to me, but have a few comments/questions inline. Thanks!

[Daniel Manrique (roadmr)]

Thanks! Replied below and fixes coming up.

[lp:~roadmr/isitdeployable/existingdeployments]

313. By Daniel Manrique on 2018-10-11

Space... the final frontier

314. By Daniel Manrique on 2018-10-11

PEP8 fixes

[Maximiliano Bertacchini (maxiberta)]

review: Approve

[Facundo Batista (facundo)]

Looks fine! Added a couple of small questions, but approving it.

review: Approve

=== modified file 'dev_config/supervisor.conf'
--- dev_config/supervisor.conf	2016-07-25 20:55:05 +0000
+++ dev_config/supervisor.conf	2018-10-11 19:24:34 +0000
@@ -12,7 +12,7 @@
 serverurl=unix:///tmp/supervisord.sock
 
 [program:celeryd]
-command=%(here)s/../virtualenv/bin/python %(here)s/../django_project/celeryapp.py worker --pidfile %(here)s/../tmp/celeryd.pid
+command=%(here)s/../env/bin/python %(here)s/../django_project/celeryapp.py worker --pidfile %(here)s/../tmp/celeryd.pid
 stdout_logfile=%(here)s/../tmp/celeryd.log
 stderr_logfile=%(here)s/../tmp/celeryd.log
 autostart=true
@@ -20,7 +20,7 @@
 startsecs=10
 
 [program:celerybeat]
-command=%(here)s/../virtualenv/bin/python %(here)s/../django_project/celeryapp.py beat --pidfile %(here)s/../tmp/celerybeat.pid
+command=%(here)s/../env/bin/python %(here)s/../django_project/celeryapp.py beat --pidfile %(here)s/../tmp/celerybeat.pid
 stdout_logfile=%(here)s/../tmp/celerybeat.log
 stderr_logfile=%(here)s/../tmp/celerybeat.log
 autostart=true

=== modified file 'requirements.txt'
--- requirements.txt	2018-04-10 19:57:04 +0000
+++ requirements.txt	2018-10-11 19:24:34 +0000
@@ -43,9 +43,9 @@
 oops-wsgi==0.0.11
 Paste==1.7.5.1
 psycopg2==2.7.3.2
-pybars==0.0.4
+pybars3==0.9.5
 pygit2==0.24.2
-PyMeta==0.5.0
+PyMeta3==0.5.1
 pyinotify==0.9.3
 soupmatchers==0.2
 testresources==0.2.5

=== modified file 'revtracker/admin.py'
--- revtracker/admin.py	2016-11-11 20:16:01 +0000
+++ revtracker/admin.py	2018-10-11 19:24:34 +0000
@@ -1,12 +1,20 @@
 from django.contrib import admin
 from revtracker.models import (
     DeploymentRequest,
+    ExistingDeployment,
     Project,
     )
 
 
+class ExistingDeploymentInline(admin.TabularInline):
+    model = ExistingDeployment
+    fields = ("name", "info_url", "version_header")
+    extra = 2  # Usually only prod and staging
+
+
 class ProjectAdmin(admin.ModelAdmin):
     exclude = ('deployed_revision',)
+    inlines = [ExistingDeploymentInline]
 
 
 admin.site.register(Project, ProjectAdmin)

=== modified file 'revtracker/data.py'
--- revtracker/data.py	2018-01-31 00:19:16 +0000
+++ revtracker/data.py	2018-10-11 19:24:34 +0000
@@ -16,6 +16,7 @@
 
 from .models import (
     DeploymentRequest,
+    ExistingDeployment,
     Revision,
     )
 

=== added file 'revtracker/migrations/0002_existingdeployment.py'
--- revtracker/migrations/0002_existingdeployment.py	1970-01-01 00:00:00 +0000
+++ revtracker/migrations/0002_existingdeployment.py	2018-10-11 19:24:34 +0000
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.9 on 2018-10-11 15:55
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('revtracker', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ExistingDeployment',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(help_text=b'Descriptive name for the deployment. Examples: Staging, Production, Sandbox.', max_length=512)),
+                ('date_updated', models.DateTimeField(blank=True, null=True)),
+                ('info_url', models.CharField(help_text=b'URL from which to get information about this deployment. Must contain the revno/commit id/somethingto identify the deployed version in an HTTP header.', max_length=512)),
+                ('version_header', models.CharField(help_text=b"Header from the info_url's HTTP response containing thedeployed version's identifier.", max_length=512)),
+                ('current_version', models.CharField(blank=True, help_text=b"Version identifier as of the date this deployment's data was last updated", max_length=512, null=True)),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='revtracker.Project')),
+            ],
+        ),
+    ]

=== modified file 'revtracker/models.py'
--- revtracker/models.py	2018-01-29 14:57:56 +0000
+++ revtracker/models.py	2018-10-11 19:24:34 +0000
@@ -141,3 +141,40 @@
 
     def __unicode__(self):
         return u"DeploymentRequest - %s" % self.deploy_revision
+
+
+class ExistingDeployment(models.Model):
+    project = models.ForeignKey(Project)
+    name = models.CharField(
+        max_length=512,
+        help_text=("Descriptive name for the deployment. Examples: "
+                   "Staging, Production, Sandbox.")
+    )
+    date_updated = models.DateTimeField(blank=True, null=True)
+    info_url = models.CharField(
+        max_length=512,
+        help_text=("URL from which to get information about this "
+                   "deployment. Must contain the revno/commit id/something "
+                   "to identify the deployed version in an HTTP header.")
+    )
+    version_header = models.CharField(
+        max_length=512,
+        help_text=("Header from the info_url's HTTP response containing the "
+                   "deployed version's identifier.")
+    )
+    current_version = models.CharField(
+        max_length=512,
+        blank=True, null=True,
+        help_text=("Version identifier as of the date this deployment's data "
+                   "was last updated"))
+
+    def __unicode__(self):
+        project = self.project
+        verstring = "No current version"
+        if self.current_version:
+            verstring = "Version %s" % self.current_version
+        datestring = "(Not updated yet)"
+        if self.date_updated:
+            datestring = "(Updated %s)" % self.date_updated
+        return u"%s %s - %s %s" % (
+            project.name, self.name, verstring, datestring)

=== modified file 'revtracker/static/scss/deploy_tracker.scss'
--- revtracker/static/scss/deploy_tracker.scss	2016-09-28 11:25:47 +0000
+++ revtracker/static/scss/deploy_tracker.scss	2018-10-11 19:24:34 +0000
@@ -16,6 +16,10 @@
   @include box-shadow($shadow-color 0 2px 2px 0);
 }
 
+.noshadowplease {
+  @include box-shadow($shadow-color 0 0 0 0);
+}
+
 .section_content {
   margin-top: 20px;
   margin-bottom: 20px;

=== modified file 'revtracker/tasks.py'
--- revtracker/tasks.py	2018-03-01 17:29:26 +0000
+++ revtracker/tasks.py	2018-10-11 19:24:34 +0000
@@ -3,6 +3,7 @@
 from email.utils import parseaddr
 import os
 import re
+import requests
 import shutil
 import tempfile
 
@@ -19,6 +20,15 @@
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.db.models import Max
+from django.utils.timezone import now
+from requests.exceptions import (
+    ConnectionError,
+    HTTPError,
+    InvalidSchema,
+    InvalidURL,
+    MissingSchema,
+    Timeout,
+    )
 import pygit2
 from six.moves.urllib.parse import (
     unquote,
@@ -654,6 +664,26 @@
     return revisions
 
 
+def get_currently_deployed_version(info_url, version_header):
+    try:
+        headers = requests.utils.default_headers()
+        headers['user-agent'] += " (isitdeployable)"
+        response = requests.head(info_url, headers=headers, timeout=2)
+        response.raise_for_status()
+    except (MissingSchema,
+            InvalidSchema,
+            InvalidURL,
+            ConnectionError,
+            Timeout,
+            HTTPError,) as exc:
+        print("Couldn't get %s: %r" % (info_url, exc))
+        return (None, None)
+    if version_header not in response.headers:
+        print("%s did not have %s header" % (info_url, version_header))
+        return (None, None)
+    return (response.headers[version_header], now())
+
+
 def update_revisions(project_id):
     load_plugins()
     project = Project.objects.get(pk=project_id)
@@ -690,15 +720,31 @@
         branch.unlock()
 
 
+def update_existing_deployments(project_id):
+    project = Project.objects.get(pk=project_id)
+    for ed in project.existingdeployment_set.all():
+        (version, when) = get_currently_deployed_version(ed.info_url, ed.version_header)
+        if version and when:
+            ed.current_version = version
+            ed.date_updated = when
+            ed.save()
+
+
 @shared_task
 def update_revisions_task(project_id):
     update_revisions(project_id)
 
 
 @shared_task
+def update_existing_deployments_task(project_id):
+    update_existing_deployments(project_id)
+
+
+@shared_task
 def update_all_projects():
     for project in Project.objects.all():
         # Have the subtask expire before the next one will be started to
         # prevent them piling up if the workers pause.
         expires = settings.CELERYBEAT_SCHEDULE['update_all_projects']['schedule'].seconds
         update_revisions_task.subtask((project.pk,), expires=expires).apply_async()
+        update_existing_deployments_task.subtask((project.pk,), expires=expires).apply_async()

=== modified file 'revtracker/templates/revtracker/index.html'
--- revtracker/templates/revtracker/index.html	2014-03-28 16:30:03 +0000
+++ revtracker/templates/revtracker/index.html	2018-10-11 19:24:34 +0000
@@ -1,24 +1,39 @@
 <div id="projects">
     {{#if projects}}
-        {{#each projects}}
+    {{#each projects}}
+    <div class="project section sixteen columns alpha">
         <a href="{{url}}">
-            <div class="project section sixteen columns alpha">
-                <div class="section_content clearfix">
-                    <div class="project_name six columns alpha main">{{name}}</div>
-                    <div class="undeployed three columns">
-                        {{undeployed_count}} undeployed revisions
-                    </div>
-                    <div class="deployable three columns">
-                        {{deployable_count}} deployable revisions
-                    </div>
-                    <div class="qa_needed three columns omega">
-                        {{needing_qa_count}} revisions need QA
-                    </div>
+            <div class="section_content clearfix">
+                <div class="project_name six columns alpha main">{{name}}</div>
+                <div class="undeployed three columns">
+                    {{undeployed_count}} undeployed revisions
+                </div>
+                <div class="deployable three columns">
+                    {{deployable_count}} deployable revisions
+                </div>
+                <div class="qa_needed three columns omega">
+                    {{needing_qa_count}} revisions need QA
                 </div>
             </div>
         </a>
-        {{/each}}
-    {{else}}
-        <div>No projects registered.</div>
-    {{/if}}
+        {{#if existing_deployments}}
+        <div class="section_content clearfix">
+            <div class="alpha six columns main">Existing Deployments</div>
+            <div class="existing_deployment three columns">Name</div>
+            <div class="existing_deployment three columns">Current version</div>
+            <div class="existing_deployment three columns omega">Updated on</div>
+            {{#each existing_deployments}}
+            <div class="alpha six columns main">&nbsp;</div>
+            <div class="existing_deployment three columns">{{this.name}}</div>
+            <div class="existing_deployment three columns">{{this.current_version}}</div>
+            <div class="existing_deployment three columns omega">{{this.date_updated}}</div>
+            {{/each}}
+        </div>
+        {{/if}}
+    </div>
+    {{/each}}
+</div>
+{{else}}
+<div>No projects registered.</div>
+{{/if}}
 </div>

=== modified file 'revtracker/templates/revtracker/project_info.html'
--- revtracker/templates/revtracker/project_info.html	2016-09-22 12:39:14 +0000
+++ revtracker/templates/revtracker/project_info.html	2018-10-11 19:24:34 +0000
@@ -15,6 +15,22 @@
         {{#if revision_blocking_deployment}}
         <div id="blocking_revision" class="global_info immediate_attention">{{revision_blocking_deployment.title}} is blocking deployment</div>
         {{/if}}
+        {{#if existing_deployments}}
+        <div class=" section fifteen columns alpha noshadowplease">
+            <div class="section_content clearfix">
+                <div class="alpha four columns main">Existing Deployments</div>
+                <div class="existing_deployment three columns">Name</div>
+                <div class="existing_deployment three columns">Current version</div>
+                <div class="existing_deployment three columns omega">Updated on</div>
+                {{#each existing_deployments}}
+                <div class="alpha four columns main">&nbsp;</div>
+                <div class="existing_deployment three columns">{{this.name}}</div>
+                <div class="existing_deployment three columns">{{this.current_version}}</div>
+                <div class="existing_deployment three columns omega">{{this.date_updated}}</div>
+                {{/each}}
+            </div>
+        </div>
+        {{/if}}
     </div>
 
     {{#if deployment_request}}

=== modified file 'revtracker/tests/factory.py'
--- revtracker/tests/factory.py	2018-01-30 01:38:57 +0000
+++ revtracker/tests/factory.py	2018-10-11 19:24:34 +0000
@@ -12,6 +12,7 @@
 
 from revtracker.models import (
     DeploymentRequest,
+    ExistingDeployment,
     Project,
     Revision,
     )
@@ -90,3 +91,19 @@
         user.is_active = is_active
         user.save()
         return user
+
+    def make_existing_deployment(self, project=None, name=None,
+                                 date_updated=None, info_url=None,
+                                 version_header=None, current_version=None):
+        if project is None:
+            project = self.make_project()
+        if name is None:
+            name = "Existing deployment for %s" % project.name
+        if info_url is None:
+            info_url = "http://example.com/_status/check"
+        if version_header is None:
+            version_header = "X-Vcs-Revision"
+        return ExistingDeployment.objects.create(
+                project=project, name=name, date_updated=date_updated,
+                info_url=info_url, version_header=version_header,
+                current_version=current_version)

=== added file 'revtracker/tests/test_models.py'
--- revtracker/tests/test_models.py	1970-01-01 00:00:00 +0000
+++ revtracker/tests/test_models.py	2018-10-11 19:24:34 +0000
@@ -0,0 +1,30 @@
+from django.utils.timezone import now
+
+from revtracker.tests import TestCase
+
+
+class ExistingDeploymentTests(TestCase):
+
+    def test_unicode_never_updated(self):
+        depl = self.factory.make_existing_deployment()
+        expected_str = (
+            "%s %s - No current version (Not updated "
+            "yet)" % (depl.project.name, depl.name))
+        self.assertEqual(str(depl), expected_str)
+
+    def test_unicode_updated_empty_version(self):
+        when = now()
+        depl = self.factory.make_existing_deployment(date_updated=when)
+        expected_str = (
+            "%s %s - No current version (Updated %s)"
+            % (depl.project.name, depl.name, when))
+        self.assertEqual(str(depl), expected_str)
+
+    def test_unicode_updated_with_version(self):
+        when = now()
+        depl = self.factory.make_existing_deployment(
+            date_updated=when, current_version="deadbeef")
+        expected_str = (
+            "%s %s - Version deadbeef (Updated %s)"
+            % (depl.project.name, depl.name, when))
+        self.assertEqual(str(depl), expected_str)

=== modified file 'revtracker/tests/test_tasks.py'
--- revtracker/tests/test_tasks.py	2018-03-01 17:29:26 +0000
+++ revtracker/tests/test_tasks.py	2018-10-11 19:24:34 +0000
@@ -1,5 +1,7 @@
 from email.utils import parseaddr
+import mock
 import os.path
+import requests
 import shutil
 import tempfile
 from test.test_support import captured_stdout
@@ -7,6 +9,7 @@
 from breezy.controldir import ControlDir
 from breezy.tests import TestCaseWithTransport
 from django.test.utils import override_settings
+from django.utils.timezone import now
 import pygit2
 from six.moves.urllib.request import pathname2url
 from testscenarios import WithScenarios
@@ -670,3 +673,115 @@
         finally:
             if self.vcs == VCS.VCS_BAZAAR:
                 branch_with_lock.unlock()
+
+
+class GetCurrentlyDeployedVersionTests(TestCase):
+
+    def test_response_contains_requested_header(self):
+        expected_version = "deadbeef"
+        version_header = "x-foo-version"
+        the_moment = now()
+        mock_response = mock.Mock()
+        mock_response.headers = {version_header: expected_version}
+        with mock.patch('revtracker.tasks.requests') as mock_requests, mock.patch('revtracker.tasks.now') as mock_now:
+            mock_now.return_value = the_moment
+            mock_requests.head.return_value = mock_response
+            result = tasks.get_currently_deployed_version("http://foo.example", version_header)
+        self.assertEqual(result, (expected_version, the_moment))
+
+    def test_response_doesnt_contain_requested_header(self):
+        expected_version = "deadbeef"
+        version_header = "x-foo-version"
+        mock_response = mock.Mock()
+        mock_response.headers = {version_header + "lalala": expected_version}
+        with captured_stdout() as cstdout, mock.patch('revtracker.tasks.requests') as mock_requests:
+            mock_requests.head.return_value = mock_response
+            result = tasks.get_currently_deployed_version("http://foo.example", version_header)
+        self.assertEqual(result, (None, None))
+        self.assertIn("http://foo.example did not have %s header" % version_header, cstdout.getvalue())
+
+    def test_http_request_exception_missing_schema(self):
+        with captured_stdout() as cstdout, mock.patch('revtracker.tasks.requests') as mock_requests:
+            mock_requests.head.side_effect = requests.exceptions.MissingSchema()
+            result = tasks.get_currently_deployed_version("doesnt-matter", "doesnt-matter-either")
+        self.assertEqual(result, (None, None))
+        self.assertIn("Couldn't get doesnt-matter: MissingSchema()", cstdout.getvalue())
+
+    def test_http_request_exception_invalid_schema(self):
+        with captured_stdout() as cstdout, mock.patch('revtracker.tasks.requests') as mock_requests:
+            mock_requests.head.side_effect = requests.exceptions.InvalidSchema()
+            result = tasks.get_currently_deployed_version("doesnt-matter", "doesnt-matter-either")
+        self.assertEqual(result, (None, None))
+        self.assertIn("Couldn't get doesnt-matter: InvalidSchema()", cstdout.getvalue())
+
+    def test_http_request_exception_invalid_url(self):
+        with captured_stdout() as cstdout, mock.patch('revtracker.tasks.requests') as mock_requests:
+            mock_requests.head.side_effect = requests.exceptions.InvalidURL()
+            result = tasks.get_currently_deployed_version("doesnt-matter", "doesnt-matter-either")
+        self.assertEqual(result, (None, None))
+        self.assertIn("Couldn't get doesnt-matter: InvalidURL()", cstdout.getvalue())
+
+    def test_http_request_exception_connection_error(self):
+        with captured_stdout() as cstdout, mock.patch('revtracker.tasks.requests') as mock_requests:
+            mock_requests.head.side_effect = requests.exceptions.ConnectionError()
+            result = tasks.get_currently_deployed_version("doesnt-matter", "doesnt-matter-either")
+        self.assertEqual(result, (None, None))
+        self.assertIn("Couldn't get doesnt-matter: ConnectionError()", cstdout.getvalue())
+
+    def test_http_request_exception_timeout(self):
+        with captured_stdout() as cstdout, mock.patch('revtracker.tasks.requests') as mock_requests:
+            mock_requests.head.side_effect = requests.exceptions.Timeout()
+            result = tasks.get_currently_deployed_version("doesnt-matter", "doesnt-matter-either")
+        self.assertEqual(result, (None, None))
+        self.assertIn("Couldn't get doesnt-matter: Timeout()", cstdout.getvalue())
+
+    def test_http_request_exception_http_error(self):
+        mock_response = mock.Mock()
+        with captured_stdout() as cstdout, mock.patch('revtracker.tasks.requests') as mock_requests:
+            mock_requests.head.return_value = mock_response
+            mock_response.raise_for_status.side_effect = requests.exceptions.HTTPError()
+            result = tasks.get_currently_deployed_version("doesnt-matter", "doesnt-matter-either")
+        self.assertEqual(result, (None, None))
+        mock_response.raise_for_status.assert_called_once()
+        self.assertIn("Couldn't get doesnt-matter: HTTPError()", cstdout.getvalue())
+
+
+class UpdateExistingDeploymentsTests(TestCase):
+
+    def test_happy_path(self):
+        expected_version = "deadbeef"
+        version_header = "x-foo-version"
+        info_url = "http://foo.example"
+        project = self.factory.make_project()
+        existing_deployment = self.factory.make_existing_deployment(
+            project=project, info_url=info_url, version_header=version_header)
+
+        the_moment = now()
+        mock_response = mock.Mock()
+        mock_response.headers = {version_header: expected_version}
+
+        with mock.patch('revtracker.tasks.requests') as mock_requests, mock.patch('revtracker.tasks.now') as mock_now:
+            mock_now.return_value = the_moment
+            mock_requests.head.return_value = mock_response
+            tasks.update_existing_deployments(project.pk)
+        existing_deployment.refresh_from_db()
+        self.assertEqual(existing_deployment.current_version, expected_version)
+        self.assertEqual(existing_deployment.date_updated, the_moment)
+
+    def test_no_revision_info(self):
+        expected_version = "deadbeef"
+        version_header = "x-foo-version"
+        info_url = "http://foo.example"
+        project = self.factory.make_project()
+        existing_deployment = self.factory.make_existing_deployment(
+            project=project, info_url=info_url, version_header=version_header)
+
+        mock_response = mock.Mock()
+        mock_response.headers = {version_header + "lalala": expected_version}
+
+        with mock.patch('revtracker.tasks.requests') as mock_requests:
+            mock_requests.head.return_value = mock_response
+            tasks.update_existing_deployments(project.pk)
+        existing_deployment.refresh_from_db()
+        self.assertEqual(existing_deployment.current_version, None)
+        self.assertEqual(existing_deployment.date_updated, None)

=== modified file 'revtracker/tests/test_views.py'
--- revtracker/tests/test_views.py	2018-01-30 01:38:57 +0000
+++ revtracker/tests/test_views.py	2018-10-11 19:24:34 +0000
@@ -48,7 +48,7 @@
     def test_query_count(self):
         project = self.factory.make_project()
         self.factory.make_revision(project=project, status=Revision.STATUS_OK)
-        self.assertNumQueries(5, views.index_data)
+        self.assertNumQueries(6, views.index_data)
 
     def test_query_count_multiple(self):
         project = self.factory.make_project()
@@ -56,7 +56,7 @@
         project = self.factory.make_project()
         self.factory.make_revision(project=project, status=Revision.STATUS_OK)
         # FIXME: O(projects)
-        self.assertNumQueries(8, views.index_data)
+        self.assertNumQueries(9, views.index_data)
 
 
 class GetProjectInfoTests(TestCase):
@@ -140,13 +140,13 @@
     def test_query_count(self):
         project = self.factory.make_project()
         self.factory.make_revision(project=project, status=Revision.STATUS_OK)
-        self.assertNumQueries(4, views.get_project_info, project)
+        self.assertNumQueries(5, views.get_project_info, project)
 
     def test_query_count_two_revisions(self):
         project = self.factory.make_project()
         self.factory.make_revision(project=project, status=Revision.STATUS_OK)
         self.factory.make_revision(project=project, status=Revision.STATUS_OK)
-        self.assertNumQueries(4, views.get_project_info, project)
+        self.assertNumQueries(5, views.get_project_info, project)
 
     def assertNumQueries(self, *args, **kwargs):
         from django.db import connection

=== modified file 'revtracker/tests/test_views_logged_in.py'
--- revtracker/tests/test_views_logged_in.py	2018-01-30 23:36:44 +0000
+++ revtracker/tests/test_views_logged_in.py	2018-10-11 19:24:34 +0000
@@ -19,6 +19,8 @@
     TestCase,
     )
 
+from testtools import matchers
+
 
 @override_settings(ROOT_URLCONF='revtracker.urls')
 class IndexViewTests(TestCase):
@@ -109,6 +111,25 @@
                   soupmatchers.Tag('revisions needing QA', 'div', attrs={'class':'qa_needed three columns omega'},
                       text=re.compile("0 revisions need QA")))))
 
+    def test_index_shows_no_existing_deployments(self):
+        self.factory.make_project()
+        response = self.client.get(reverse('index'))
+        self.assertThat(response, matchers.Not(soupmatchers.HTMLResponseHas(
+            html_matches=soupmatchers.Tag("existing deployments", "div", text="Existing Deployments"))))
+
+    def test_index_shows_existing_deployments(self):
+        project = self.factory.make_project()
+        for ed in range(2):
+            self.factory.make_existing_deployment(project=project, name=str(ed))
+        response = self.client.get(reverse('index'))
+        self.assertThat(response, soupmatchers.HTMLResponseHas(
+            html_matches=soupmatchers.Tag("existing deployments", "div", text="Existing Deployments")))
+        for ed in project.existingdeployment_set.all():
+            self.assertThat(response, soupmatchers.HTMLResponseHas(
+                html_matches=soupmatchers.Tag("existing deployment", "div", text=ed.project.name)))
+            self.assertThat(response, soupmatchers.HTMLResponseHas(
+                html_matches=soupmatchers.Tag("existing deployment", "div", text=ed.current_version)))
+
 
 @override_settings(ROOT_URLCONF='revtracker.urls')
 class ProjectViewTests(TestCase):
@@ -144,6 +165,37 @@
         self.assertThat(response, soupmatchers.HTMLResponseHas(
             html_matches=ProjectDeployedRevision(text="Currently deployed: %s" % revision.description)))
 
+    def test_project_view_shows_no_existing_deployment_if_none(self):
+        project = self.factory.make_project()
+        response = self.client.get(reverse('project_view', args=(project.name,)))
+        self.assertThat(response, matchers.Not(soupmatchers.HTMLResponseHas(
+            html_matches=soupmatchers.Tag("existing deployments", "div", text="Existing deployments:"))))
+
+    def test_project_view_shows_one_existing_deployment(self):
+        project = self.factory.make_project()
+        existing_deployment = self.factory.make_existing_deployment(project=project)
+        response = self.client.get(reverse('project_view', args=(project.name,)))
+        self.assertThat(response, soupmatchers.HTMLResponseHas(
+            html_matches=soupmatchers.Tag("existing deployments", "div", text="Existing Deployments")))
+        for ed in project.existingdeployment_set.all():
+            self.assertThat(response, soupmatchers.HTMLResponseHas(
+                html_matches=soupmatchers.Tag("existing deployment", "div", text=ed.project.name)))
+            self.assertThat(response, soupmatchers.HTMLResponseHas(
+                html_matches=soupmatchers.Tag("existing deployment", "div", text=ed.current_version)))
+
+    def test_project_view_shows_two_existing_deployments(self):
+        project = self.factory.make_project()
+        for ed in range(2):
+            self.factory.make_existing_deployment(project=project, name=str(ed))
+        response = self.client.get(reverse('project_view', args=(project.name,)))
+        self.assertThat(response, soupmatchers.HTMLResponseHas(
+            html_matches=soupmatchers.Tag("existing deployments", "div", text="Existing Deployments")))
+        for ed in project.existingdeployment_set.all():
+            self.assertThat(response, soupmatchers.HTMLResponseHas(
+                html_matches=soupmatchers.Tag("existing deployment", "div", text=ed.project.name)))
+            self.assertThat(response, soupmatchers.HTMLResponseHas(
+                html_matches=soupmatchers.Tag("existing deployment", "div", text=ed.current_version)))
+
     def test_project_view_all_revisions_deployed(self):
         project = self.factory.make_project()
         response = self.client.get(reverse('project_view', args=(project.name,)))

=== modified file 'revtracker/views.py'
--- revtracker/views.py	2018-01-29 15:34:06 +0000
+++ revtracker/views.py	2018-10-11 19:24:34 +0000
@@ -68,6 +68,11 @@
             }
     except DeploymentRequest.DoesNotExist:
         pass
+    info['existing_deployments'] = [
+        {'name': ed.name, 'current_version': ed.current_version or "(Not updated yet)",
+         'date_updated': str(ed.date_updated or "(Not updated yet)")}
+        for ed in project.existingdeployment_set.all()]
+
     undeployed_revisions = data.project_undeployed_revisions(project,
         data.project_deployed_revno(project))
     return info, undeployed_revisions
@@ -102,6 +107,10 @@
     info['undeployed_count'] = len(undeployed_revisions)
     info['deployable_count'] = len(deployable_revisions)
     info['needing_qa_count'] = len(data.project_revisions_needing_qa(undeployed_revisions))
+    info['existing_deployments'] = [
+        {'name': ed.name, 'current_version': ed.current_version or "(Not updated yet)",
+         'date_updated': str(ed.date_updated or "(Not updated yet)")}
+        for ed in project.existingdeployment_set.all()]
     return info
 
 
@@ -185,7 +194,7 @@
 
 
 def index_data():
-    projects = Project.objects.all().prefetch_related('revision_set')
+    projects = Project.objects.all().prefetch_related('existingdeployment_set', 'revision_set')
     info = dict()
     info['projects'] = [index_project_to_info(project) for project in projects]
     return info