Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip test_secure_upgrade.py if current image is not secured. #9747

Merged
merged 26 commits into from
Aug 31, 2023
Merged
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
febcacd
Added test case to verify ebtables rules.
abdosi Feb 6, 2021
9582616
Merge remote-tracking branch 'upstream/master'
abdosi Feb 9, 2021
940ebe4
Merge remote-tracking branch 'upstream/master'
abdosi Feb 28, 2021
36feb13
Merge remote-tracking branch 'upstream/master'
abdosi Mar 9, 2021
ab4beee
Merge remote-tracking branch 'upstream/master'
abdosi Mar 16, 2021
8d59326
Merge remote-tracking branch 'upstream/master'
abdosi Mar 18, 2021
fa03609
Merge remote-tracking branch 'upstream/master'
abdosi Mar 18, 2021
532639a
Merge remote-tracking branch 'upstream/master'
abdosi May 14, 2021
0833669
Merge remote-tracking branch 'upstream/master'
abdosi Jun 28, 2021
f2dbf92
Merge remote-tracking branch 'upstream/master'
abdosi Oct 4, 2021
915dc97
Merge remote-tracking branch 'upstream/master'
abdosi Oct 12, 2021
1aacc7a
Merge remote-tracking branch 'upstream/master'
abdosi Oct 12, 2021
6ca8577
Merge remote-tracking branch 'upstream/master'
abdosi Oct 13, 2021
7ad4900
Merge remote-tracking branch 'upstream/master'
abdosi Oct 27, 2021
a6d5c16
Fix to avoid overlap of Front Port Channel and Internal Pot Channel
abdosi Oct 27, 2021
03453b0
Merge remote-tracking branch 'upstream/master'
abdosi Nov 18, 2021
5fce19c
Merge remote-tracking branch 'upstream/master'
abdosi Jan 21, 2022
501698b
Merge branch 'master' of https://github.com/abdosi/sonic-mgmt
abdosi Feb 13, 2022
e7b6504
Merge remote-tracking branch 'upstream/master'
abdosi Jun 27, 2023
402c17c
Merge remote-tracking branch 'upstream/master'
abdosi Aug 4, 2023
fe770ed
Increase wait time for link up post config reload/minigraph for modular
abdosi Aug 4, 2023
dddc82a
Merge remote-tracking branch 'upstream/master'
abdosi Aug 16, 2023
e6be5d2
Revert "Increase wait time for link up post config reload/minigraph f…
abdosi Aug 21, 2023
4e190f0
Increase the time needed for Route to be programmed into ASIC
abdosi Aug 21, 2023
52a0a0b
Merge remote-tracking branch 'upstream/master' into order-ecmp
abdosi Aug 29, 2023
f983b96
Skip the test case if current installed image is not secure boot image
abdosi Aug 29, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion tests/platform_tests/test_secure_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def keep_same_version_installed(duthost):
pytest_assert(len(results) > 0, "Current image is empty!")
current_version = results[0]
yield
duthost.shell("sudo sonic-installer set-default {}", format(current_version))
duthost.shell("sudo sonic-installer set-default {}".format(current_version))


@pytest.fixture(scope='session')
Expand All @@ -55,6 +55,11 @@ def test_non_secure_boot_upgrade_failure(duthost, non_secure_image_path, tbinfo)
"""
@summary: This test case validates non successful upgrade of a given non secure image
"""
secure_boot_image = duthost.command("sonic-cfggen -y /etc/sonic/sonic_version.yml -v secure_boot_image")['stdout']

if secure_boot_image != 'yes':
pytest.skip("Current Image is not secured so skipping")

# install non secure image
logger.info("install non secure image - expect fail, image path = {}".format(non_secure_image_path))
result = "image install failure" # because we expect fail
Expand Down