Skip to content

Commit f7a9bb8

Browse files
committed
Remove TUV from supported target channels
TUS (mispelled as TUV) is not suported channel for inplace upgrade, removed from the code. Jira: OAMG-7288
1 parent d74ff90 commit f7a9bb8

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

commands/preupgrade/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
help='Enable specified repository. Can be used multiple times.')
2626
@command_opt('channel',
2727
help='Set preferred channel for the IPU target.',
28-
choices=['ga', 'tuv', 'e4s', 'eus', 'aus'],
28+
choices=['ga', 'e4s', 'eus', 'aus'],
2929
value_type=str.lower) # This allows the choices to be case insensitive
3030
@command_opt('iso', help='Use provided target RHEL installation image to perform the in-place upgrade.')
3131
@command_opt('target', choices=command_utils.get_supported_target_versions(),

commands/upgrade/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
help='Enable specified repository. Can be used multiple times.')
3232
@command_opt('channel',
3333
help='Set preferred channel for the IPU target.',
34-
choices=['ga', 'tuv', 'e4s', 'eus', 'aus'],
34+
choices=['ga', 'e4s', 'eus', 'aus'],
3535
value_type=str.lower) # This allows the choices to be case insensitive
3636
@command_opt('iso', help='Use provided target RHEL installation image to perform the in-place upgrade.')
3737
@command_opt('target', choices=command_utils.get_supported_target_versions(),

repos/system_upgrade/common/actors/setuptargetrepos/tests/test_repomapping.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,14 +614,14 @@ def test_get_expected_target_pesid_repos_with_priority_channel_set(monkeypatch):
614614
make_pesid_repo('pesid1', '7', 'pesid1-repoid-ga'),
615615
make_pesid_repo('pesid2', '8', 'pesid2-repoid-ga'),
616616
make_pesid_repo('pesid2', '8', 'pesid2-repoid-eus', channel='eus'),
617-
make_pesid_repo('pesid2', '8', 'pesid2-repoid-tuv', channel='tuv'),
617+
make_pesid_repo('pesid2', '8', 'pesid2-repoid-aus', channel='aus'),
618618
make_pesid_repo('pesid3', '8', 'pesid3-repoid-ga')
619619
]
620620
)
621621

622622
handler = RepoMapDataHandler(repositories_mapping)
623623
# Set defaults to verify that the priority channel is not overwritten by defaults
624-
handler.set_default_channels(['tuv', 'ga'])
624+
handler.set_default_channels(['aus', 'ga'])
625625
target_repoids = handler.get_expected_target_pesid_repos(['pesid1-repoid-ga'])
626626

627627
fail_description = 'get_expected_target_peid_repos does not correctly respect preferred channel.'

repos/system_upgrade/common/libraries/config/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from leapp.libraries.stdlib import api
33

44
# The devel variable for target product channel can also contain 'beta'
5-
SUPPORTED_TARGET_CHANNELS = {'ga', 'tuv', 'e4s', 'eus', 'aus'}
5+
SUPPORTED_TARGET_CHANNELS = {'ga', 'e4s', 'eus', 'aus'}
66
CONSUMED_DATA_STREAM_ID = '2.0'
77

88

repos/system_upgrade/common/models/repositoriesmap.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class PESIDRepositoryEntry(Model):
6161
too.
6262
"""
6363

64-
channel = fields.StringEnum(['ga', 'tuv', 'e4s', 'eus', 'aus', 'beta'])
64+
channel = fields.StringEnum(['ga', 'e4s', 'eus', 'aus', 'beta'])
6565
"""
6666
The 'channel' of the repository.
6767

0 commit comments

Comments
 (0)