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

Update Blazar image #1334

Merged
merged 6 commits into from
Nov 12, 2024
Merged

Update Blazar image #1334

merged 6 commits into from
Nov 12, 2024

Conversation

assumptionsandg
Copy link
Contributor

Update Blazar image to include upstream and WIP flavor reservation patches to be used with coral credits.

@assumptionsandg assumptionsandg requested a review from a team as a code owner October 16, 2024 14:48
@Alex-Welsh
Copy link
Contributor

If it's WIP, I'd rather not merge this into our main branch. Can we wait until it's fully tested?

@mnasiadka
Copy link
Member

I agree with @Alex-Welsh - is there a reason the flavour reservation patches are not merged in stackhpc/2023.1 (or stackhpc/2024.1)? I understand that it's WIP because that needs testing-in-production?

@assumptionsandg
Copy link
Contributor Author

We're basing this on Blazar master. flavor-based-reservation5 contains all outstanding commits that are not in master yet, we could create a backport for Antelope of merged and unmerged patches, but we're testing with this currently.

Maybe @JohnGarbutt has some more context for this.

@mnasiadka
Copy link
Member

mnasiadka commented Oct 16, 2024

We're basing this on Blazar master. flavor-based-reservation5 contains all outstanding commits that are not in master yet, we could create a backport for Antelope of merged and unmerged patches, but we're testing with this currently.

Maybe @JohnGarbutt has some more context for this.

If it's based on master - do we plan to switch back to 2023.1 or 2024.1 version later on? That seems like it's going to cause some problems... but I'm not the Blazar expert here.

Especially that the container image tag is going to contain 2023.1 - and that's probably confusing.

@JohnGarbutt
Copy link
Member

@Alex-Welsh I believe this has now been fully tested. @assumptionsandg please do correct me if I am wrong. (All these patches are up for review upstream)

The question in my head is what to call the branch in stackhpc/blazar (partly also how to review it). We could call it stackhpc/2023.1 but we really want to use this branch (based on upstream master), with Caracal as well. We could have all the branches point to the same commit for the moment.

@Alex-Welsh
Copy link
Contributor

@JohnGarbutt We do this fairly regularly in release train, where we backport changes to our stackhpc/xyz branches. We've got automation set up to keep them up to date we the stable/xyz branches upstream. If there's a change we want in our forks, we should just cherry-pick it into both stackhpc/2023.1 and 2024.1

@Alex-Welsh
Copy link
Contributor

Okay, to get this merge I think we need 2 things:

  1. make a stackhpc/master branch which mirrors upstream but has our customisations cherry-picked in.
  2. Add a release note
    @assumptionsandg does that sound okay?

@Alex-Welsh
Copy link
Contributor

One more thing, could you add to the docs so we know know how to make use of these new features e.g. any changes we should be making in blazar.conf

Alex-Welsh
Alex-Welsh previously approved these changes Nov 12, 2024
Copy link
Contributor

@Alex-Welsh Alex-Welsh left a comment

Choose a reason for hiding this comment

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

Still can't say I love the format but looks good enough to me now

@Alex-Welsh Alex-Welsh merged commit 1bdc619 into stackhpc/2023.1 Nov 12, 2024
12 checks passed
@Alex-Welsh Alex-Welsh deleted the blazar-test-image2 branch November 12, 2024 11:05
@priteau priteau mentioned this pull request Nov 22, 2024
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.

4 participants