From 9f4550caa23d6a84d1630fe4efdad512394690da Mon Sep 17 00:00:00 2001 From: Frode Date: Mon, 20 May 2019 21:04:20 +0000 Subject: [PATCH 1/2] vultr cloudtest fix --- tests/integration/cloud/clouds/test_vultrpy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/cloud/clouds/test_vultrpy.py b/tests/integration/cloud/clouds/test_vultrpy.py index e7c666d29f..586f83b3a3 100644 --- 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] ) From 247c46162ed033551acac103da75952ac9df3211 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 10 May 2019 17:40:40 +0100 Subject: [PATCH 2/2] Always run the full test suite on the 2019.2.1 release branch --- .ci/kitchen-centos6-py2 | 2 +- .ci/kitchen-centos7-py2 | 2 +- .ci/kitchen-centos7-py3 | 2 +- .ci/kitchen-debian8-py2 | 2 +- .ci/kitchen-debian8-py3 | 2 +- .ci/kitchen-debian9-py2 | 2 +- .ci/kitchen-debian9-py3 | 2 +- .ci/kitchen-ubuntu1604-py2 | 2 +- .ci/kitchen-ubuntu1604-py3 | 2 +- .ci/kitchen-ubuntu1804-py2 | 2 +- .ci/kitchen-ubuntu1804-py3 | 2 +- .ci/kitchen-windows2016-py2 | 2 +- .ci/kitchen-windows2016-py3 | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.ci/kitchen-centos6-py2 b/.ci/kitchen-centos6-py2 index 7488ee1b33..0cb999f77f 100644 --- 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') { diff --git a/.ci/kitchen-centos7-py2 b/.ci/kitchen-centos7-py2 index 8e099ead24..947c8fa383 100644 --- 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') { diff --git a/.ci/kitchen-centos7-py3 b/.ci/kitchen-centos7-py3 index bbd8a517a8..6ee502cc42 100644 --- 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') { diff --git a/.ci/kitchen-debian8-py2 b/.ci/kitchen-debian8-py2 index 05df90ad83..3b09ffc382 100644 --- 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') { diff --git a/.ci/kitchen-debian8-py3 b/.ci/kitchen-debian8-py3 index c9c0869077..fd25633921 100644 --- 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') { diff --git a/.ci/kitchen-debian9-py2 b/.ci/kitchen-debian9-py2 index cb03ab33ed..be1d3767e1 100644 --- 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') { diff --git a/.ci/kitchen-debian9-py3 b/.ci/kitchen-debian9-py3 index 9bf0e40ac3..943f457eef 100644 --- 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') { diff --git a/.ci/kitchen-ubuntu1604-py2 b/.ci/kitchen-ubuntu1604-py2 index 4f936abc06..8d5e2bfb64 100644 --- 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') { diff --git a/.ci/kitchen-ubuntu1604-py3 b/.ci/kitchen-ubuntu1604-py3 index 5c60b774ae..8291b34e3a 100644 --- 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') { diff --git a/.ci/kitchen-ubuntu1804-py2 b/.ci/kitchen-ubuntu1804-py2 index 45ea0385d9..3f80e3e88e 100644 --- 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') { diff --git a/.ci/kitchen-ubuntu1804-py3 b/.ci/kitchen-ubuntu1804-py3 index 4849bcbe63..a720804f2f 100644 --- 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') { diff --git a/.ci/kitchen-windows2016-py2 b/.ci/kitchen-windows2016-py2 index cdec5e5958..af06bb2291 100644 --- 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') { diff --git a/.ci/kitchen-windows2016-py3 b/.ci/kitchen-windows2016-py3 index 290c688793..66dc82a2c4 100644 --- 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') {