[FLOC-4514] Install Kubernetes on acceptance testing clusters

admin/acceptance.py

@@ -48,6 +48,7 @@
 )
 from flocker.provision._install import (
     ManagedNode,
+    deconfigure_kubernetes,
     task_pull_docker_images,
     uninstall_flocker,
     install_flocker,
@@ -305,7 +306,7 @@ def __init__(self, node_addresses, package_source, distribution,
         self.cert_path = cert_path
         self.logging_config = logging_config
 
-    def _upgrade_flocker(self, reactor, nodes, package_source):
+    def _upgrade_flocker(self, dispatcher, nodes, package_source):
         """
         Put the version of Flocker indicated by ``package_source`` onto all of
         the given nodes.
@@ -324,8 +325,6 @@ def _upgrade_flocker(self, reactor, nodes, package_source):
 
         :return: A ``Deferred`` that fires when the software has been upgraded.
         """
-        dispatcher = make_dispatcher(reactor)
-
         uninstalling = perform(dispatcher, uninstall_flocker(nodes))
         uninstalling.addErrback(write_failure, logger=None)
 
@@ -335,6 +334,7 @@ def install(ignored):
                 install_flocker(nodes, package_source),
             )
         installing = uninstalling.addCallback(install)
+
         return installing
 
     def ensure_keys(self, reactor):
@@ -349,13 +349,21 @@ def start_cluster(self, reactor):
         Don't start any nodes.  Give back the addresses of the configured,
         already-started nodes.
         """
+        dispatcher = make_dispatcher(reactor)
         if self.package_source is not None:
             upgrading = self._upgrade_flocker(
-                reactor, self._nodes, self.package_source
+                dispatcher, self._nodes, self.package_source
             )
         else:
             upgrading = succeed(None)
 
+        deconfiguring_kubernetes = upgrading.addCallback(
+            lambda _ignored: perform(
+                dispatcher,
+                deconfigure_kubernetes(self._nodes),
+            )
+        )
+
         def configure(ignored):
             return configured_cluster_for_nodes(
                 reactor,
@@ -375,7 +383,7 @@ def configure(ignored):
                 provider="managed",
                 logging_config=self.logging_config,
             )
-        configuring = upgrading.addCallback(configure)
+        configuring = deconfiguring_kubernetes.addCallback(configure)
         return configuring
 
     def stop_cluster(self, reactor):

build.yaml

@@ -1091,31 +1091,6 @@ job_type:
       timeout: 45
       directories_to_delete: *run_acceptance_directories_to_delete
 
-    run_acceptance_loopback_on_AWS_Ubuntu_Trusty_for:
-      on_nodes_with_labels: 'aws-ubuntu-xenial-T2Medium'
-      with_modules: *run_full_acceptance_modules
-      with_steps:
-        - { type: 'shell',
-            cli: [ *hashbang, *add_shell_functions,
-                   *cleanup, *setup_venv, *setup_flocker_modules,
-                   *check_version,
-                   'export DISTRIBUTION_NAME=ubuntu-14.04',
-                   *build_sdist, *build_package,
-                   *build_repo_metadata,
-                   *setup_authentication,
-                   'export ACCEPTANCE_TEST_MODULE=${MODULE}',
-                   'export ACCEPTANCE_TEST_PROVIDER=aws',
-                   *run_acceptance_loopback_tests,
-                   *convert_results_to_junit,
-                   *clean_packages,
-                   *exit_with_return_code_from_test ]
-          }
-      clean_repo: true
-      archive_artifacts: *acceptance_tests_artifacts_ubuntu_special_case
-      publish_test_results: true
-      timeout: 45
-      directories_to_delete: *run_acceptance_directories_to_delete
-
     run_acceptance_loopback_on_AWS_Ubuntu_Xenial_for:
       on_nodes_with_labels: 'aws-ubuntu-xenial-T2Medium'
       with_modules: *run_full_acceptance_modules
@@ -1340,36 +1315,6 @@ job_type:
       directories_to_delete: []
       notify_slack: '#nightly-builds'
 
-    run_acceptance_on_AWS_Ubuntu_Trusty_with_EBS:
-      at: '0 6 * * *'
-      # flocker.provision is responsible for creating the test nodes on
-      # so we can actually run run-acceptance-tests from GCE
-      on_nodes_with_labels: 'gce-ubuntu16'
-      with_steps:
-        - { type: 'shell',
-            cli: [ *hashbang, *add_shell_functions,
-                   *cleanup, *setup_venv, *setup_flocker_modules,
-                   *check_version,
-                   'export DISTRIBUTION_NAME=ubuntu-14.04',
-                   *build_sdist, *build_package,
-                   *build_repo_metadata,
-                   *setup_authentication,
-                   'export ACCEPTANCE_TEST_MODULE=flocker.acceptance',
-                   'export ACCEPTANCE_TEST_PROVIDER=aws',
-                   *run_acceptance_tests,
-                   *convert_results_to_junit,
-                   *clean_packages,
-                   *exit_with_return_code_from_test ]
-          }
-      clean_repo: true
-      archive_artifacts: *acceptance_tests_artifacts_ubuntu_special_case
-      publish_test_results: true
-      # Similar to the reasoning for run_acceptance_on_AWS_CentOS_7_with_EBS
-      # but slightly shorter since Ubuntu runs the tests faster.
-      timeout: 90
-      directories_to_delete: []
-      notify_slack: '#nightly-builds'
-
     run_acceptance_on_AWS_Ubuntu_Xenial_with_EBS:
       at: '0 6 * * *'
       # flocker.provision is responsible for creating the test nodes on
@@ -1429,35 +1374,6 @@ job_type:
       directories_to_delete: []
       notify_slack: '#nightly-builds'
 
-    run_acceptance_on_GCE_Ubuntu_Trusty_with_GCE:
-      at: '0 6 * * *'
-      # flocker.provision is responsible for creating the test nodes on
-      # so we can actually run run-acceptance-tests from GCE
-      on_nodes_with_labels: 'gce-ubuntu16'
-      with_steps:
-        - { type: 'shell',
-            cli: [ *hashbang, *add_shell_functions,
-                   *cleanup, *setup_venv, *setup_flocker_modules,
-                   *check_version,
-                   'export DISTRIBUTION_NAME=ubuntu-14.04',
-                   *build_sdist, *build_package,
-                   *build_repo_metadata,
-                   *setup_authentication,
-                   'export ACCEPTANCE_TEST_MODULE=flocker.acceptance',
-                   'export ACCEPTANCE_TEST_PROVIDER=gce',
-                   *run_acceptance_tests,
-                   *convert_results_to_junit,
-                   *clean_packages,
-                   *exit_with_return_code_from_test ]
-          }
-      clean_repo: true
-      archive_artifacts: *acceptance_tests_artifacts_ubuntu_special_case
-      publish_test_results: true
-      # Reasoning as for run_acceptance_on_AWS_Ubuntu_Trusty_with_EBS
-      timeout: 90
-      directories_to_delete: []
-      notify_slack: '#nightly-builds'
-
     run_acceptance_on_GCE_Ubuntu_Xenial_with_GCE:
       at: '0 6 * * *'
       # flocker.provision is responsible for creating the test nodes on
@@ -1516,35 +1432,6 @@ job_type:
       directories_to_delete: []
       notify_slack: '#nightly-builds'
 
-    run_acceptance_on_Rackspace_Ubuntu_Trusty_with_Cinder:
-      at: '0 6 * * *'
-      # flocker.provision is responsible for creating the test nodes on
-      # so we can actually run run-acceptance-tests from GCE
-      on_nodes_with_labels: 'gce-ubuntu16'
-      with_steps:
-        - { type: 'shell',
-            cli: [ *hashbang, *add_shell_functions,
-                   *cleanup, *setup_venv, *setup_flocker_modules,
-                   *check_version,
-                   'export DISTRIBUTION_NAME=ubuntu-14.04',
-                   *build_sdist, *build_package,
-                   *build_repo_metadata,
-                   *setup_authentication,
-                   'export ACCEPTANCE_TEST_MODULE=flocker.acceptance',
-                   'export ACCEPTANCE_TEST_PROVIDER=rackspace',
-                   *run_acceptance_tests,
-                   *convert_results_to_junit,
-                   *clean_packages,
-                   *exit_with_return_code_from_test ]
-          }
-      clean_repo: true
-      archive_artifacts: *acceptance_tests_artifacts_ubuntu_special_case
-      publish_test_results: true
-      # Reasoning as for run_acceptance_on_AWS_Ubuntu_Trusty_with_EBS
-      timeout: 90
-      directories_to_delete: []
-      notify_slack: '#nightly-builds'
-
     run_acceptance_on_Rackspace_Ubuntu_Xenial_with_Cinder:
       at: '0 6 * * *'
       # flocker.provision is responsible for creating the test nodes on

flocker/acceptance/testtools.py

@@ -874,7 +874,15 @@ def cleanup_all_containers(_):
                 # they're left over from previous test; they might e.g.
                 # have a volume bind-mounted, preventing its destruction.
                 for container in client.containers():
-                    client.remove_container(container["Id"], force=True)
+                    # Don't attempt to remove containers related to
+                    # orchestration frameworks
+                    protected_container = False
+                    label_keys = container["Labels"].keys()
+                    for key in label_keys:
+                        if key.startswith("io.kubernetes."):
+                            protected_container = True
+                    if not protected_container:
+                        client.remove_container(container["Id"], force=True)
 
         def cleanup_flocker_containers(_):
             cleaning_containers = api_clean_state(