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

OpenStack packaging updates & Jammy support #7622

Merged

Conversation

danudey
Copy link
Contributor

@danudey danudey commented May 3, 2023

Description

A revamp of the existing packaging support for OpenStack

  • Move from sequential docker builds to docker buildx bake which can build multiple images in parallel
  • Add support for Ubuntu Jammy
  • Some shell cleanups
  • Remove unnecessary extra steps for building CentOS 7 ppc64le build image
  • Improved output for easier debugging

Release Note

Add support for OpenStack on Ubuntu Jammy

@danudey danudey added release-note-required Change has user-facing impact (no matter how small) docs-not-required Docs not required for this change labels May 3, 2023
@danudey danudey self-assigned this May 3, 2023
@danudey danudey requested a review from a team as a code owner May 3, 2023 16:54
@marvin-tigera marvin-tigera added this to the Calico v3.27.0 milestone May 3, 2023
Copy link
Member

@nelljerram nelljerram left a comment

Choose a reason for hiding this comment

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

Nice work; I've mentioned some minor tweaks and queries.

@@ -1,3 +1,5 @@
#!/bin/bash

Copy link
Member

Choose a reason for hiding this comment

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

This file is designed only to be included (with . or source), not to be executed in its own right. That's why I didn't have that hashbang line before, and I think it's better to stay as it was.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The purpose for adding the shebang line is to be able to parse the file correctly with shellcheck. I haven't done a full linting pass on these files, but I intend to do so in the future, so that's why this line was added. If you think it's a better idea to leave it unchanged though, I'll revert this.

Copy link
Member

Choose a reason for hiding this comment

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

I don't want to impose my view here, but I do think it's wrong for tools to drive an incorrect agenda. Perhaps there's another way to tell shellcheck that this is a file that it should check?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm. I'll back this out for now, and then we can figure out the best solution for this when an actual linting pass happens.

hack/release/packaging/docker-build-images/docker-bake.hcl Outdated Show resolved Hide resolved
hack/release/packaging/utils/create-update-packages.sh Outdated Show resolved Hide resolved
hack/release/packaging/utils/make-packages.sh Show resolved Hide resolved
hack/release/packaging/utils/publish-debs.sh Show resolved Hide resolved
Copy link
Member

@nelljerram nelljerram left a comment

Choose a reason for hiding this comment

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

LGTM. I'm happy to leave the shellcheck point to your judgement.

@danudey danudey merged commit b0c3e55 into projectcalico:master May 9, 2023
@danudey danudey deleted the dfox-openstack-packaging-revamp branch May 9, 2023 18:47
danudey added a commit to danudey/calico that referenced this pull request May 9, 2023
Update to our Openstack packaging system:
* Add support for Ubuntu Jammy amd64 and ppc64le
* Fix build-deps for Ubuntu Focal/Jammy
* Clean up CentOS 7 ppc64le builds
* Convert build image creation to use `docker buildx bake` (see https://docs.docker.com/build/bake/)
* Clean up build output
mgleung added a commit that referenced this pull request May 9, 2023
[Release 3.26] OpenStack packaging updates & Jammy support (cherry-pick #7622)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs-not-required Docs not required for this change release-note-required Change has user-facing impact (no matter how small)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants