summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Trowbridge <trown@redhat.com>2018-05-17 09:59:29 -0400
committerRonelle Landy <rlandy@redhat.com>2018-05-18 17:13:09 +0000
commitf76569c23b77c568b0bb642036d40a5552c972a9 (patch)
treec585c9e5ccb8a0e6741e18a04cbbfde589418bf8
parent8d4adf42330c4907c75c5a417204c0541af299e3 (diff)
Add newton->ocata undercloud upgrades to unsupported list
Notes
Notes (review): Code-Review+2: wes hayutin <weshayutin@gmail.com> Code-Review+2: Ronelle Landy <rlandy@redhat.com> Verified-1: RDO Third Party CI <dmsimard+rdothirdparty@redhat.com> Code-Review+2: Sagi Shnaidman <sshnaidm@redhat.com> Workflow+1: Sagi Shnaidman <sshnaidm@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 21 May 2018 13:15:04 +0000 Reviewed-on: https://review.openstack.org/569120 Project: openstack-infra/tripleo-ci Branch: refs/heads/master
-rw-r--r--scripts/emit_releases_file/emit_releases_file.py4
-rw-r--r--scripts/emit_releases_file/test_unsupported_upgrades.py10
2 files changed, 14 insertions, 0 deletions
diff --git a/scripts/emit_releases_file/emit_releases_file.py b/scripts/emit_releases_file/emit_releases_file.py
index f6c936d..2c05f0d 100644
--- a/scripts/emit_releases_file/emit_releases_file.py
+++ b/scripts/emit_releases_file/emit_releases_file.py
@@ -79,6 +79,10 @@ def compose_releases_dictionary(stable_release, featureset):
79 stable_release == RELEASES[0]: 79 stable_release == RELEASES[0]:
80 raise RuntimeError("Cannot upgrade to {}".format(RELEASES[0])) 80 raise RuntimeError("Cannot upgrade to {}".format(RELEASES[0]))
81 81
82 if featureset.get('undercloud_upgrade') and stable_release == 'ocata':
83 raise RuntimeError("Undercloud upgrades are not supported from "
84 "newton to ocata")
85
82 if featureset.get('overcloud_upgrade') and \ 86 if featureset.get('overcloud_upgrade') and \
83 featureset.get('undercloud_upgrade'): 87 featureset.get('undercloud_upgrade'):
84 raise RuntimeError("This tool currently only supports upgrading the " 88 raise RuntimeError("This tool currently only supports upgrading the "
diff --git a/scripts/emit_releases_file/test_unsupported_upgrades.py b/scripts/emit_releases_file/test_unsupported_upgrades.py
index 02bb3d2..b583f97 100644
--- a/scripts/emit_releases_file/test_unsupported_upgrades.py
+++ b/scripts/emit_releases_file/test_unsupported_upgrades.py
@@ -25,6 +25,16 @@ def test_only_mixed_overcloud_upgrades_are_supported():
25 compose_releases_dictionary(stable_release, featureset) 25 compose_releases_dictionary(stable_release, featureset)
26 26
27 27
28def test_undercloud_upgrades_from_newton_to_ocata_are_unsupported():
29 featureset = {
30 'undercloud_upgrade': True,
31 }
32
33 stable_release = 'ocata'
34 with pytest.raises(RuntimeError):
35 compose_releases_dictionary(stable_release, featureset)
36
37
28@pytest.mark.parametrize('upgrade_type', 38@pytest.mark.parametrize('upgrade_type',
29 ['ffu_overcloud_upgrade', 'overcloud_upgrade']) 39 ['ffu_overcloud_upgrade', 'overcloud_upgrade'])
30def test_overcloud_upgrades_has_to_be_mixed(upgrade_type): 40def test_overcloud_upgrades_has_to_be_mixed(upgrade_type):