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.

Sign up for GitHub

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

Jump to bottom

Fix daily pipeline failures for recover_network_interface #3039

Merged
merged 3 commits into from
Feb 7, 2024
Merged

Fix daily pipeline failures for recover_network_interface #3039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
391257c
Fix daily pipeline failures for recover_network_interface
maddieford Feb 6, 2024
412c32a
Clear any unused settings properties when enabling cse
maddieford Feb 7, 2024
a66d508
Merge branch 'develop' into fix_recover_scenario_failures
narrieta Feb 7, 2024
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
17 changes: 14 additions & 3 deletions tests_e2e/test_suites/images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,20 @@ images:
AzureChinaCloud: []
AzureUSGovernment: []
oracle_610: "Oracle Oracle-Linux 6.10 latest"
oracle_75: "Oracle Oracle-Linux 7.5 latest"
oracle_79: "Oracle Oracle-Linux ol79-gen2 latest"
oracle_82: "Oracle Oracle-Linux ol82-gen2 latest"
oracle_75:
urn: "Oracle Oracle-Linux 7.5 latest"
locations:
AzureChinaCloud: []
AzureUSGovernment: []
oracle_79:
urn: "Oracle Oracle-Linux ol79-gen2 latest"
locations:
AzureChinaCloud: []
oracle_82:
urn: "Oracle Oracle-Linux ol82-gen2 latest"
locations:
AzureChinaCloud: []
AzureUSGovernment: []
rhel_610: "RedHat RHEL 6.10 latest"
rhel_75:
urn: "RedHat RHEL 7.5 latest"
Expand Down
4 changes: 2 additions & 2 deletions tests_e2e/tests/ext_telemetry_pipeline/ext_telemetry_pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ def run(self):
log.info("")
log.info("Add CSE to the test VM...")
cse = VirtualMachineExtensionClient(self._context.vm, VmExtensionIds.CustomScript, resource_name="CustomScript")
cse.enable(settings={'commandToExecute': "echo 'enable'"})
cse.enable(settings={'commandToExecute': "echo 'enable'"}, protected_settings={})
cse.assert_instance_view()

log.info("")
log.info("Add CSE to the test VM again...")
cse.enable(settings={'commandToExecute': "echo 'enable again'"})
cse.enable(settings={'commandToExecute': "echo 'enable again'"}, protected_settings={})
cse.assert_instance_view()

# Check agent log to verify ETP is enabled
Expand Down
6 changes: 1 addition & 5 deletions tests_e2e/tests/recover_network_interface/recover_network_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,7 @@ def run(self):
log.info("")
log.info("Using CSE to bring the primary network interface down and call the OSUtil to bring the interface back up. Command to execute: {0}".format(script))
custom_script = VirtualMachineExtensionClient(self._context.vm, VmExtensionIds.CustomScript, resource_name="CustomScript")
custom_script.enable(
protected_settings={
'commandToExecute': script
}
)
custom_script.enable(protected_settings={'commandToExecute': script}, settings={})

# Check that the interface was down and brought back up in instance view
log.info("")
Expand Down
Loading