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

jobs/build-podman-os.Jenkinsfile: get podman version from main #1040

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

lsm5
Copy link

@lsm5 lsm5 commented Sep 20, 2024

The current podman version is hardcoded to 5.1. This commit will allow fetching podman from upstream main branch.

@@ -122,6 +130,24 @@ def cosa_memory_request_mb = 4.5 * 1024 as Integer
def ncpus = ((cosa_memory_request_mb - 512) / 1536) as Integer


node {
Copy link
Member

Choose a reason for hiding this comment

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

there is already a node { declaration higher up in this file.

Copy link
Author

Choose a reason for hiding this comment

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

just me being a groovy noob :| . btw, there's another one below as well. Should I look at reusing either one or do you have a preference?

Copy link
Member

Choose a reason for hiding this comment

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

hmm weird. yeah, just re-use the one below

Copy link
Member

Choose a reason for hiding this comment

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

now we have two change = checkout( statements with a scm trigger in it. I don't think that's what we want either.

Copy link
Author

Choose a reason for hiding this comment

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

Hmm, thinking about this further, I should grab podman version and upstream commit from the podman-next copr rpm that's fetched in the build process https://github.com/containers/podman-machine-os/blob/main/podman-image-daily/Containerfile#L31

The current podman version is hardcoded to `5.1`. This commit
will allow fetching podman from upstream main branch.

Signed-off-by: Lokesh Mandvekar <[email protected]>
@@ -38,7 +38,7 @@ def generate_diskvar_json(shortcommit, arch, artifacts, staging_repo, repo) {
"container-tag": "${arch}-${shortcommit}",
"extra-kargs-string": "",
"image-type": "${artifact["platform"]}",
"container-imgref": "ostree-remote-registry:fedora:${repo}:5.1",
"container-imgref": "ostree-remote-registry:fedora:${repo}:${version}",
Copy link
Member

Choose a reason for hiding this comment

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

probably going to want to pass in version as an argument to this function?

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