Merge branch '2019.2.1' into cp-52787

2025-04-17 10:10:20 +00:00 · 2019-05-30 11:47:00 -04:00 · 2019-05-30 11:47:00 -04:00 · 0f9077b5dc
commit 0f9077b5dc
parent 9d21b75c73 50e31ecf0b
15 changed files with 26 additions and 14 deletions
--- a/.ci/kitchen-centos6-py2
+++ b/.ci/kitchen-centos6-py2
@ -6,7 +6,7 @@ properties([
        $class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
    ],
    parameters([
-        booleanParam(defaultValue: false, description: 'Run full test suite', name: 'runFull')
+        booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
    ])
 ])
 timeout(time: 8, unit: 'HOURS') {
--- a/.ci/kitchen-centos7-py2
+++ b/.ci/kitchen-centos7-py2
@ -6,7 +6,7 @@ properties([
        $class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
    ],
    parameters([
-        booleanParam(defaultValue: false, description: 'Run full test suite', name: 'runFull')
+        booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
    ])
 ])
 timeout(time: 8, unit: 'HOURS') {
--- a/.ci/kitchen-centos7-py3
+++ b/.ci/kitchen-centos7-py3
@ -6,7 +6,7 @@ properties([
        $class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
    ],
    parameters([
-        booleanParam(defaultValue: false, description: 'Run full test suite', name: 'runFull')
+        booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
    ])
 ])
 timeout(time: 6, unit: 'HOURS') {
--- a/.ci/kitchen-debian8-py2
+++ b/.ci/kitchen-debian8-py2
@ -6,7 +6,7 @@ properties([
        $class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
    ],
    parameters([
-        booleanParam(defaultValue: false, description: 'Run full test suite', name: 'runFull')
+        booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
    ])
 ])
 timeout(time: 8, unit: 'HOURS') {
--- a/.ci/kitchen-debian8-py3
+++ b/.ci/kitchen-debian8-py3
@ -6,7 +6,7 @@ properties([
        $class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
    ],
    parameters([
-        booleanParam(defaultValue: false, description: 'Run full test suite', name: 'runFull')
+        booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
    ])
 ])
 timeout(time: 6, unit: 'HOURS') {
--- a/.ci/kitchen-debian9-py2
+++ b/.ci/kitchen-debian9-py2
@ -6,7 +6,7 @@ properties([
        $class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
    ],
    parameters([
-        booleanParam(defaultValue: false, description: 'Run full test suite', name: 'runFull')
+        booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
    ])
 ])
 timeout(time: 6, unit: 'HOURS') {
--- a/.ci/kitchen-debian9-py3
+++ b/.ci/kitchen-debian9-py3
@ -6,7 +6,7 @@ properties([
        $class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
    ],
    parameters([
-        booleanParam(defaultValue: false, description: 'Run full test suite', name: 'runFull')
+        booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
    ])
 ])
 timeout(time: 6, unit: 'HOURS') {
--- a/.ci/kitchen-ubuntu1604-py2
+++ b/.ci/kitchen-ubuntu1604-py2
@ -6,7 +6,7 @@ properties([
        $class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
    ],
    parameters([
-        booleanParam(defaultValue: false, description: 'Run full test suite', name: 'runFull')
+        booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
    ])
 ])
 timeout(time: 6, unit: 'HOURS') {
--- a/.ci/kitchen-ubuntu1604-py3
+++ b/.ci/kitchen-ubuntu1604-py3
@ -6,7 +6,7 @@ properties([
        $class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
    ],
    parameters([
-        booleanParam(defaultValue: false, description: 'Run full test suite', name: 'runFull')
+        booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
    ])
 ])
 timeout(time: 6, unit: 'HOURS') {
--- a/.ci/kitchen-ubuntu1804-py2
+++ b/.ci/kitchen-ubuntu1804-py2
@ -6,7 +6,7 @@ properties([
        $class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
    ],
    parameters([
-        booleanParam(defaultValue: false, description: 'Run full test suite', name: 'runFull')
+        booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
    ])
 ])
 timeout(time: 6, unit: 'HOURS') {
--- a/.ci/kitchen-ubuntu1804-py3
+++ b/.ci/kitchen-ubuntu1804-py3
@ -6,7 +6,7 @@ properties([
        $class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
    ],
    parameters([
-        booleanParam(defaultValue: false, description: 'Run full test suite', name: 'runFull')
+        booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
    ])
 ])
 timeout(time: 6, unit: 'HOURS') {
--- a/.ci/kitchen-windows2016-py2
+++ b/.ci/kitchen-windows2016-py2
@ -6,7 +6,7 @@ properties([
        $class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
    ],
    parameters([
-        booleanParam(defaultValue: false, description: 'Run full test suite', name: 'runFull')
+        booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
    ])
 ])
 timeout(time: 6, unit: 'HOURS') {
--- a/.ci/kitchen-windows2016-py3
+++ b/.ci/kitchen-windows2016-py3
@ -6,7 +6,7 @@ properties([
        $class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
    ],
    parameters([
-        booleanParam(defaultValue: false, description: 'Run full test suite', name: 'runFull')
+        booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
    ])
 ])
 timeout(time: 8, unit: 'HOURS') {
--- a/tests/integration/cloud/clouds/test_vultrpy.py
+++ b/tests/integration/cloud/clouds/test_vultrpy.py
@ -96,7 +96,7 @@ class VultrTest(ShellCase):
        '''
        size_list = self.run_cloud('--list-sizes {0}'.format(PROVIDER_NAME))
        self.assertIn(
-            '32768 MB RAM,110 GB SSD,40.00 TB BW',
+            '32768 MB RAM,4x110 GB SSD,40.00 TB BW',
            [i.strip() for i in size_list]
        )

--- a/tests/integration/minion/test_blackout.py
+++ b/tests/integration/minion/test_blackout.py
@ -28,15 +28,25 @@ class MinionBlackoutTestCase(ModuleCase):

    @classmethod
    def setUpClass(cls):
+        cls.top_pillar = os.path.join(RUNTIME_VARS.TMP_PILLAR_TREE, 'top.sls')
        cls.blackout_pillar = os.path.join(RUNTIME_VARS.TMP_PILLAR_TREE, 'blackout.sls')

    @classmethod
    def tearDownClass(cls):
+        if os.path.exists(cls.top_pillar):
+            os.unlink(cls.top_pillar)
+        del cls.top_pillar
        if os.path.exists(cls.blackout_pillar):
            os.unlink(cls.blackout_pillar)
        del cls.blackout_pillar

    def setUp(self):
+        with salt.utils.files.fopen(self.top_pillar, 'w') as wfh:
+            wfh.write(textwrap.dedent('''\
+                base:
+                  '*':
+                    - blackout
+                '''))
        with salt.utils.files.fopen(self.blackout_pillar, 'w') as wfh:
            wfh.write('minion_blackout: False')
        self.addCleanup(self.cleanup_blackout_pillar)
@ -49,6 +59,8 @@ class MinionBlackoutTestCase(ModuleCase):
        self.wait_for_all_jobs()

    def cleanup_blackout_pillar(self):
+        if os.path.exists(self.top_pillar):
+            os.unlink(self.top_pillar)
        if os.path.exists(self.blackout_pillar):
            os.unlink(self.blackout_pillar)