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

Make SONiC the default flavor. #158

Merged
merged 8 commits into from
Apr 29, 2024
Merged

Make SONiC the default flavor. #158

merged 8 commits into from
Apr 29, 2024

Conversation

Gerrit91
Copy link
Contributor

Closes #154.

@Gerrit91 Gerrit91 requested a review from a team as a code owner April 19, 2024 07:24
@robertvolkmann
Copy link
Contributor

@Gerrit91 sonic-vs.img is missing on the integration platform.

@robertvolkmann
Copy link
Contributor

@Gerrit91 What is your opinion to use both flavors for cleanup? The leaves of one flavor cannot be removed by the other flavor.

MINI_LAB_FLAVOR=cumulus make cleanup
MINI_LAB_FLAVOR=sonic make cleanup

@Gerrit91
Copy link
Contributor Author

Not yet decided, maybe we can just destroy for all flavors in cleanup.

Makefile Outdated
Comment on lines 136 to 140

# destroying the sonic lab requires the image to exist, otherwise it fails with bind path verification
touch sonic-vs.img
sudo $(CONTAINERLAB) destroy --topo mini-lab.sonic.yaml
rm -f sonic-vs.img
Copy link
Contributor

@robertvolkmann robertvolkmann Apr 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using a conditional?

ifneq ($(wildcard sonic-vs.img),)
	sudo $(CONTAINERLAB) destroy --topo mini-lab.sonic.yaml
endif

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this has the issue that on repeated run of the CI job on the same runner after checkout the image file will not be present but the SONiC VMs might still be running.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe its easier to create a container image that contains the VM image. Let me try something next week.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you come up with something better? Release pipeline is currently broken due to cleanup problems so we should find something soon.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will look into it during my journey.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We prioritized fixing the pipeline for now. If you find some time to improve the cleanup please feel free to raise a new pull request.

@Gerrit91 Gerrit91 merged commit 45eb9d6 into master Apr 29, 2024
1 check passed
@Gerrit91 Gerrit91 deleted the sonic-default-flavor branch April 29, 2024 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make SONiC the default flavor
3 participants