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

feat(ci): Build container images without python deps #2572

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

celebdor
Copy link
Contributor

This change allows building the container images without the python dependencies that are getting harder to get by.
It keeps the pre-existing version2.py so that it can be imported from the python bundle generation code

This change allows building the container images without the python
dependencies that are getting harder to get by.

Signed-off-by: Antoni Segura Puimedon <[email protected]>
@openshift-ci openshift-ci bot requested review from 2uasimojo and dlom February 17, 2025 13:52
Copy link
Contributor

openshift-ci bot commented Feb 17, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: celebdor
Once this PR has been reviewed and has the lgtm label, please assign dlom for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Contributor

openshift-ci bot commented Feb 17, 2025

@celebdor: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/verify 00b13a6 link true /test verify

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

SOURCE_GIT_TAG := $(shell export HOME=$(HOME); python3 -m ensurepip >&2; python3 -mpip --no-cache install --user gitpython pyyaml >&2; hack/version2.py)
# 0.0.x-y if it is an `UnknownBranch`. However, the {commitcount} and {sha}
# should still be accurate.
SOURCE_GIT_TAG := $(shell hack/version2.sh)
Copy link
Member

Choose a reason for hiding this comment

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

Love this. It was super annoying waiting for pip every time the Makefile loaded up.

However, this may have been the only thing ensuring that pyyaml was installed when running generate-saas-template.py. I'm going to look into porting that to bash/yq as well, but in the meantime, can we add the ensurepip and pyyaml business inside that rule? (At least then it will only run when that rule is invoked.)

function prefix_from_branch() {
declare -r branch_name="$1"

if [[ "$branch_name" =~ ^([^/]+/)?mce-([[:digit:]]+.[[:digit:]]+) ]]; then
Copy link
Member

Choose a reason for hiding this comment

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

I've asked and ACM/MCE don't seem to be using bundle-gen anymore. Given that, and the fact that we don't build OperatorHub bundles for MCE branches anymore, we should be able to eliminate this condition.

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.

2 participants