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

STF 1.5.4 release ops #158

Merged
merged 10 commits into from
Feb 14, 2024
Merged

STF 1.5.4 release ops #158

merged 10 commits into from
Feb 14, 2024

Conversation

vkmc
Copy link
Contributor

@vkmc vkmc commented Feb 8, 2024

No description provided.

elfiesmelfie and others added 10 commits November 6, 2023 18:53
[zuul] Use the stf-crc-jobs project template

Instead of updating the .zuul.yaml file everytime
infrawatch/service-telemetry-operator adds a new job, the
project-template can be updated in STO, which will propogate
the change to the project and avoid leaving gaps in testing.

Depends-On: http://github.com/infrawatch/service-telemetry-operator/pull/514
Support STF 1.5.3 starting at OpenShift version 4.12 due to
incompatibility with 4.11 due to dependency requirements. Our primary
target is support of OCP EUS releases.

Related: STF-1632
The way we generate our CSVs uses OLM's skipRange functionality. This is fine,
but using only this leads to older versions becoming unavailable after the
fact -- see the warning at [1].

By adding an optional spec.replaces to our CSV we allow update testing as
well as actual production updates for downstream builds that leverage it.

Populating the field requires knowledge of the latest-released bundle,
so we take it from an environment variable to be provided by the
builder. If this is unset we don't include the spec.replaces field at
all -- leaving previous behavior unchanged.

Related: infrawatch/service-telemetry-operator#559
Related: STF-1658

[1] https://olm.operatorframework.io/docs/concepts/olm-architecture/operator-catalog/creating-an-update-graph/#skiprange
Add optional spec.replaces field to CSV for update graph compliance
STF can now be deployed in disconnected mode. This change updates
the features.operators.openshift.io/disconnected annotation to
reflect this.
…port-annotation

Set features.operators.openshift.io/disconnected to True
@vkmc vkmc changed the title Release prep 1.5.4 STF 1.5.4 release ops Feb 8, 2024
@vkmc vkmc changed the base branch from master to stable-1.5 February 8, 2024 18:09
Copy link
Member

@leifmadsen leifmadsen left a comment

Choose a reason for hiding this comment

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

Contents of the merge look fine to me. Still a bit confused on the commit history stuff, but I ran into similar problems in the last release, so maybe I've just broken the cleanliness somewhere along the line?

@csibbitt
Copy link
Contributor

csibbitt commented Feb 8, 2024

Contents of the merge look fine to me. Still a bit confused on the commit history stuff, but I ran into similar problems in the last release, so maybe I've just broken the cleanliness somewhere along the line?

I think this happens due to the previous merge being a squash+merge. Look here: #149

The last commit in that PR is 0531e69, but then it says "leifmadsen merged commit 519e2eb". Because of that, this merge sees these as entirely new commits, but producing the same content.

Upshot is that while squash+merge is good for consolidating a PR that takes multiple revisions, I don't think it's good for preserving history when synchronizing branches.

@leifmadsen
Copy link
Member

Contents of the merge look fine to me. Still a bit confused on the commit history stuff, but I ran into similar problems in the last release, so maybe I've just broken the cleanliness somewhere along the line?

I think this happens due to the previous merge being a squash+merge. Look here: #149

The last commit in that PR is 0531e69, but then it says "leifmadsen merged commit 519e2eb". Because of that, this merge sees these as entirely new commits, but producing the same content.

Upshot is that while squash+merge is good for consolidating a PR that takes multiple revisions, I don't think it's good for preserving history when synchronizing branches.

Ah thanks for that. Makes sense now.

I guess in this case we want to use Merge and not the Squash and Merge option to avoid this in the future?

@vkmc vkmc merged commit 5a972e2 into stable-1.5 Feb 14, 2024
7 checks passed
@vkmc vkmc deleted the release-prep-1.5.4 branch February 14, 2024 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

5 participants