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 jenkins/runlocal platform independent #3474

Merged
merged 3 commits into from
Jul 3, 2023

Conversation

webbnh
Copy link
Member

@webbnh webbnh commented Jun 30, 2023

This PR changes jenkins/runlocal to make it independent of the host distro and version. There is also a change to free the containerbuild.sh script of dependence on a particular tag for the ubi9 base image.

Note to reviewers: currently jenkins/runlocal rebuilds everything from scratch, by first building the distclean and clean targets for the Pbench Server RPM and the Dashboard deployment, respectively, which makes the run take substantially longer and is pointless if there haven't been any changes to the sources. I propose removing those two targets, which will speed up the cycle time. The Make magic should cause those things to be rebuilt if there are changes to them, and the developer also has the option of building those targets manually if s/he wants a fresh build. Thoughts?

PBENCH-1181

@webbnh webbnh added Server Containerization Of and relating to the process of setting up and maintaining container images labels Jun 30, 2023
@webbnh webbnh added this to the v0.73 milestone Jun 30, 2023
@webbnh webbnh self-assigned this Jun 30, 2023
@webbnh webbnh changed the title Switch the Pbench Server container base image to ubi/ubi:9.1 Make jenkins/runlocal platform independent Jun 30, 2023
@webbnh webbnh marked this pull request as ready for review June 30, 2023 18:35
dbutenhof
dbutenhof previously approved these changes Jun 30, 2023
Copy link
Member

@dbutenhof dbutenhof left a comment

Choose a reason for hiding this comment

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

Sounds plausible. I would definitely support dropping the clean targets. When I run it repeatedly it's usually because I changed something: but often a functional test and rarely a dashboard file!

jenkins/runlocal Outdated Show resolved Hide resolved
# Build the Pbench Server RPM and container, and run functional tests locally.
# Requires a Fedora, CentOS, or RHEL environment to run.

#
# NOTE WELL: By default, when the functional tests are run, the infrastructure
# pod and Pbench Server container are left running by default. Add the switch,
Copy link
Member

Choose a reason for hiding this comment

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

One of the "by default"s can go :-), but not necessarily in this PR.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm going to plead, "I didn't change that or any related line", unless you request some other change. 😁

Copy link
Member

@ndokos ndokos left a comment

Choose a reason for hiding this comment

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

LGTM

@webbnh webbnh merged commit 8d54280 into distributed-system-analysis:main Jul 3, 2023
@webbnh webbnh deleted the 9.1_base branch July 3, 2023 19:42
@dbutenhof
Copy link
Member

Well, dang. I rebased against this and now on the install I'm getting

No match for argument: rsyslog-mmjsonparse
Error: Unable to find a match: rsyslog-mmjsonparse

Are we still somehow getting a mismatch between RPM and container? 😦

Sadly, this is a step back for me since I'd been able to runlocal without overriding anything since I went to Fedora 38.

@webbnh
Copy link
Member Author

webbnh commented Jul 3, 2023

Do you still have BASE_IMAGE defined in your environment?

@dbutenhof
Copy link
Member

Do you still have BASE_IMAGE defined in your environment?

Never did put it in my environment. BTW, the old quay.io/centos/centos:stream9 I used to use still works. I haven't tried forcing a Fedora ... I have to remember/reconstruct the right repo path. 😆

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Containerization Of and relating to the process of setting up and maintaining container images Server
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants