Merge ~smoser/cloud-init:fix/1778737-drop-integration-test into cloud-init:master

[Scott Moser]

tests: drop salt-minion integration test

The salt minion integration test as we had it did not do a whole lot
more than the unit tests on that module did. Additionally, it caused
some transient failures at least in Ubuntu 18.04.

At a future date we may choose to add an integration test that installs
salt-minion and salt server and configures it to be a better test.

LP: #1778737

see commit message

[Chad Smith (chad.smith)]

LGTM!

review: Approve

[Scott Moser (smoser)]

I'll wait on c-i to post here
 https://jenkins.ubuntu.com/server/job/cloud-init-ci/132/
and then merge.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:308ca86bb39719b05afd30462eaea93321a3dcc7
https://jenkins.ubuntu.com/server/job/cloud-init-ci/132/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/132/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

This merge has landed in commit 58581362 to cloud-init branch master.

To view that commit see the following URL:
https://git.launchpad.net/cloud-init/commit/?id=58581362

diff --git a/tests/cloud_tests/testcases/modules/salt_minion.py b/tests/cloud_tests/testcases/modules/salt_minion.py
deleted file mode 100644
index fc9688e..0000000
--- a/tests/cloud_tests/testcases/modules/salt_minion.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-"""cloud-init Integration Test Verify Script."""
-from tests.cloud_tests.testcases import base
-
-
-class Test(base.CloudTestCase):
-    """Test salt minion module."""
-
-    def test_minon_master(self):
-        """Test master value in config."""
-        out = self.get_data_file('minion')
-        self.assertIn('master: salt.mydomain.com', out)
-
-    def test_minion_pem(self):
-        """Test private key."""
-        out = self.get_data_file('minion.pem')
-        self.assertIn('------BEGIN PRIVATE KEY------', out)
-        self.assertIn('<key data>', out)
-        self.assertIn('------END PRIVATE KEY-------', out)
-
-    def test_minion_pub(self):
-        """Test public key."""
-        out = self.get_data_file('minion.pub')
-        self.assertIn('------BEGIN PUBLIC KEY-------', out)
-        self.assertIn('<key data>', out)
-        self.assertIn('------END PUBLIC KEY-------', out)
-
-    def test_grains(self):
-        """Test master value in config."""
-        out = self.get_data_file('grains')
-        self.assertIn('role: web', out)
-
-    def test_minion_installed(self):
-        """Test if the salt-minion package is installed"""
-        self.assertPackageInstalled('salt-minion')
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/salt_minion.yaml b/tests/cloud_tests/testcases/modules/salt_minion.yaml
deleted file mode 100644
index 9227147..0000000
--- a/tests/cloud_tests/testcases/modules/salt_minion.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Create config for a salt minion
-#
-# 2016-11-17: Currently takes >60 seconds results in test failure
-#
-enabled: True
-cloud_config: |
-  #cloud-config
-  salt_minion:
-      conf:
-          master: salt.mydomain.com
-      public_key: |
-          ------BEGIN PUBLIC KEY-------
-          <key data>
-          ------END PUBLIC KEY-------
-      private_key: |
-          ------BEGIN PRIVATE KEY------
-          <key data>
-          ------END PRIVATE KEY-------
-      grains:
-          role: web
-collect_scripts:
-  minion: |
-    #!/bin/bash
-    cat /etc/salt/minion
-  minion_id: |
-    #!/bin/bash
-    cat /etc/salt/minion_id
-  minion.pem: |
-    #!/bin/bash
-    PRIV_KEYFILE=/etc/salt/pki/minion/minion.pem
-    if [ ! -f $PRIV_KEYFILE ]; then
-        # Bionic and later automatically moves /etc/salt/pki/minion/*
-        PRIV_KEYFILE=/var/lib/salt/pki/minion/minion.pem
-    fi
-    cat $PRIV_KEYFILE
-  minion.pub: |
-    #!/bin/bash
-    PUB_KEYFILE=/etc/salt/pki/minion/minion.pub
-    if [ ! -f $PUB_KEYFILE ]; then
-        # Bionic and later automatically moves /etc/salt/pki/minion/*
-        PUB_KEYFILE=/var/lib/salt/pki/minion/minion.pub
-    fi
-    cat $PUB_KEYFILE
-  grains: |
-    #!/bin/bash
-    cat /etc/salt/grains
-
-# vi: ts=4 expandtab