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

configdep: T6276: do not call dependencies on script error #3372

Merged
merged 1 commit into from
Apr 29, 2024

Conversation

jestabro
Copy link
Contributor

@jestabro jestabro commented Apr 28, 2024

Change Summary

NOTE: this should not be automatically backported, as it depends on the changes of T5839 and T5660, not yet in 1.4. Instead, all changes for T5839, T5660, T6206, T6276 will be backported in single PRs for vyatta-cfg, respectively, vyos-1x.

This fixes a simple bug in the removal of config dependency redundancies when running under vyos-configd: do not call the list of redundancies if the script returns an error (the case of a pass-through script, i.e., one returned to CLI for execution, was already handled in the original).

Test by smoketests running under configd, both 1.5 and 1.4 (output 1.5 below):

vyos_bld@514b6dccae9c:/vyos$ sudo make iso && make testd 2>&1|tee out.testd-configdep
vyos_bld@514b6dccae9c:/vyos$ tail -n 12 out.testd-configdep
DEBUG - echo EXITCODE:$?
 INFO - Smoketest finished successfully!
 INFO - Powering off system
DEBUG - EXITCODE:0poweroff now
 INFO - Shutting down virtual machine
 INFO - Waiting for shutdown...
DEBUG - poweroff now
 INFO - Waiting for shutdown...
DEBUG - poweroff now
 INFO - VM is shut down!
 INFO - Cleaning up
 INFO - Removing disk file: testinstall-20240428-201259-c043.img

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Related PR(s)

Component(s) name

Proposed changes

How to test

Smoketest result

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • I have run the components SMOKETESTS if applicable
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

@jestabro jestabro self-assigned this Apr 28, 2024
@vyosbot vyosbot requested review from a team, dmbaturin, sarthurdev, zdc, sever-sever and c-po and removed request for a team April 28, 2024 23:50
@jestabro jestabro closed this Apr 29, 2024
@jestabro jestabro reopened this Apr 29, 2024
@vyosbot vyosbot requested a review from a team April 29, 2024 00:22
@c-po c-po merged commit 0c0799a into vyos:current Apr 29, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2 participants