[FLOC-4505] [DO NOT MERGE] Remove container API

admin/package-files/rsyslog/flocker.conf

@@ -3,4 +3,3 @@
 # should be discarded by rsyslog.
 if $programname == 'flocker-control' then ~
 if $programname == 'flocker-dataset-agent' then ~
-if $programname == 'flocker-container-agent' then ~

admin/packaging.py

@@ -587,7 +587,6 @@ def __str__(self):
 
         # Upstart control files are not installed as conffiles.
         'non-conffile-in-etc /etc/init/flocker-dataset-agent.conf',
-        'non-conffile-in-etc /etc/init/flocker-container-agent.conf',
         'non-conffile-in-etc /etc/init/flocker-control.conf',
         'non-conffile-in-etc /etc/init/flocker-docker-plugin.conf',
 
@@ -673,7 +672,6 @@ def __str__(self):
 
         # Upstart control files are not installed as conffiles.
         'file-in-etc-not-marked-as-conffile etc/init/flocker-dataset-agent.conf',  # noqa
-        'file-in-etc-not-marked-as-conffile etc/init/flocker-container-agent.conf',  # noqa
         'file-in-etc-not-marked-as-conffile etc/init/flocker-control.conf',
         'file-in-etc-not-marked-as-conffile etc/init/flocker-docker-plugin.conf',  # noqa
 
@@ -998,8 +996,6 @@ def omnibus_package_builder(
                      flocker_node_path),
                     (FilePath('/opt/flocker/bin/flocker-control'),
                      flocker_node_path),
-                    (FilePath('/opt/flocker/bin/flocker-container-agent'),
-                     flocker_node_path),
                     (FilePath('/opt/flocker/bin/flocker-dataset-agent'),
                      flocker_node_path),
                     (FilePath('/opt/flocker/bin/flocker-diagnostics'),

admin/test/test_packaging.py

@@ -984,8 +984,6 @@ def fake_make_dependencies(
                          flocker_node_path),
                         (FilePath('/opt/flocker/bin/flocker-control'),
                          flocker_node_path),
-                        (FilePath('/opt/flocker/bin/flocker-container-agent'),
-                         flocker_node_path),
                         (FilePath('/opt/flocker/bin/flocker-dataset-agent'),
                          flocker_node_path),
                         (FilePath('/opt/flocker/bin/flocker-diagnostics'),

build.yaml

@@ -841,51 +841,6 @@ job_type:
       timeout: 30
       directories_to_delete: *run_trial_directories_to_delete
 
-    run_trial_on_AWS_CentOS_7_flocker.node.functional.test_docker:
-      # FLOC-3903: docker on centos use loop-devmapper
-      # by default. That makes it much slower than Ubuntu
-      # with aufs. It leads to timeouts, but seems to do
-      # a bit better on the medium instance
-      on_nodes_with_labels: 'aws-centos-7-SELinux-T2Medium'
-      module: flocker.node.functional.test_docker
-      with_steps:
-        - { type: 'shell', cli: *run_trial_cli }
-      archive_artifacts: *flocker_artifacts
-      publish_test_results: true
-      coverage_report: true
-      clean_repo: true
-      # Increase the timeout due to FLOC-3903
-      timeout: 45
-      directories_to_delete: *run_trial_directories_to_delete
-
-    # Split out just to do the CentOS version above,
-    # for the reasons outlined in that section
-    run_trial_on_AWS_Ubuntu_Trusty_flocker.node.functional.test_docker:
-      on_nodes_with_labels: 'aws-ubuntu-trusty-T2Medium'
-      module: flocker.node.functional.test_docker
-      with_steps:
-        - { type: 'shell', cli: *run_trial_cli }
-      archive_artifacts: *flocker_artifacts
-      publish_test_results: true
-      coverage_report: true
-      clean_repo: true
-      timeout: 30
-      directories_to_delete: *run_trial_directories_to_delete
-
-    # Split out just to do the CentOS version above,
-    # for the reasons outlined in that section
-    run_trial_on_AWS_Ubuntu_Xenial_flocker.node.functional.test_docker:
-      on_nodes_with_labels: 'aws-ubuntu-xenial-T2Medium'
-      module: flocker.node.functional.test_docker
-      with_steps:
-        - { type: 'shell', cli: *run_trial_cli }
-      archive_artifacts: *flocker_artifacts
-      publish_test_results: true
-      coverage_report: true
-      clean_repo: true
-      timeout: 30
-      directories_to_delete: *run_trial_directories_to_delete
-
   run_trial_for_storage_driver:
     run_trial_for_ebs_storage_driver_on_CentOS_7:
       on_nodes_with_labels: 'aws-centos-7-SELinux-T2Medium'

flocker/acceptance/endtoend/test_diagnostics.py

@@ -13,7 +13,6 @@
 from ...common.runner import run_ssh, download
 from ...testtools import AsyncTestCase, async_runner
 from ..testtools import require_cluster, ACCEPTANCE_TEST_TIMEOUT
-from testtools.matchers import MatchesAny, Equals
 
 
 class DiagnosticsTests(AsyncTestCase):
@@ -23,12 +22,7 @@ class DiagnosticsTests(AsyncTestCase):
 
     run_tests_with = async_runner(timeout=ACCEPTANCE_TEST_TIMEOUT)
 
-    # This only requires the container agent to check
-    # that its log is collected. We still care about
-    # that working, so we run it. We should stop
-    # running it for this test when we get closer
-    # to never running it in production.
-    @require_cluster(1, require_container_agent=True)
+    @require_cluster(1)
     def test_export(self, cluster):
         """
         ``flocker-diagnostics`` creates an archive of all Flocker service logs
@@ -62,20 +56,15 @@ def download_archive(remote_archive_path):
 
         def verify_archive(local_archive_path):
             with tarfile.open(local_archive_path.path) as f:
-                actual_basenames = set()
+                actual_filenames = set()
                 for name in f.getnames():
                     basename = os.path.basename(name)
                     if name == basename:
                         # Ignore the directory entry
                         continue
-                    actual_basenames.add(basename)
+                    actual_filenames.add(basename)
 
-            container_agent_basenames = set([
-                'flocker-container-agent_startup.gz',
-                'flocker-container-agent_eliot.gz',
-            ])
-
-            expected_basenames = set([
+            expected_filenames = set([
                 'flocker-control_startup.gz',
                 'flocker-control_eliot.gz',
                 'flocker-dataset-agent_startup.gz',
@@ -95,13 +84,11 @@ def verify_archive(local_archive_path):
                 'fdisk',
                 'lshw',
             ])
-            self.expectThat(
-                actual_basenames,
-                MatchesAny(
-                    Equals(expected_basenames),
-                    Equals(expected_basenames.union(
-                        container_agent_basenames)),
-                )
+            # Missing expected filenames will show up as differences.
+            # Unexpected filenames will be ignored.
+            self.assertEqual(
+                set(),
+                expected_filenames.difference(actual_filenames)
             )
 
         verifying = downloading.addCallback(verify_archive)

flocker/acceptance/integration/test_mongodb.py

@@ -28,7 +28,7 @@ def insert_data(test_case, host, port):
 
     def got_client(client):
         database = client.example
-        database.posts.insert({u"the data": u"it moves"})
+        database.posts.insert_one({u"the data": u"it moves"})
     d.addCallback(got_client)
     return d