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.

Sign up for GitHub

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

Jump to bottom

Update ocp branch references #354

Merged
merged 1 commit into from
Jun 13, 2023
Merged

Update ocp branch references #354

merged 1 commit into from
Jun 13, 2023

Conversation

rhmdnd
Copy link

@rhmdnd rhmdnd commented Jun 12, 2023

Now that we've graduated the operator to v1.0 and we have a specific
branch for that version called ocp-1.0, we should update those
references in the Makefile and documentation so the automation continues
to do what it should for Compliance Operator builds.

@rhmdnd
Update ocp branch references
ca0adc6 
Now that we've graduated the operator to v1.0 and we have a specific
branch for that version called `ocp-1.0`, we should update those
references in the Makefile and documentation so the automation continues
to do what it should for Compliance Operator builds.
@openshift-ci openshift-ci bot requested a review from mrogers950 June 12, 2023 21:45
@rhmdnd
Copy link
Author

rhmdnd commented Jun 12, 2023

I found this while doing the v1.1.0 release, but we don't have to merge this before continuing with that release.

@jhrozek jhrozek mentioned this pull request Jun 13, 2023
Merged
jhrozek
jhrozek approved these changes Jun 13, 2023
View reviewed changes
Copy link

@jhrozek jhrozek left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Jun 13, 2023
@openshift-ci
Copy link

openshift-ci bot commented Jun 13, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jhrozek, rhmdnd

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

The pull request process is described 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

@jhrozek
Copy link

jhrozek commented Jun 13, 2023

/hold

@jhrozek
Copy link

jhrozek commented Jun 13, 2023

@rhmdnd do you want this PR to be merged before PR #353 and have 353 rebased atop this one?

@rhmdnd
Copy link
Author

rhmdnd commented Jun 13, 2023

@rhmdnd do you want this PR to be merged before PR #353 and have 353 rebased atop this one?

This isn't required for the 1.1.0 release. I had to push the ocp-1.0 branch changes manually anyway. If the CO 1.1.0 release looks good and doesn't need another respin, then I'm OK having this merge after and we'll just take advantage of it in future releases.

@jhrozek
Copy link

jhrozek commented Jun 13, 2023

/hold cancel
thanks for the info

@rhmdnd
Copy link
Author

rhmdnd commented Jun 13, 2023

Test failed getting a cluster.

@rhmdnd
Copy link
Author

rhmdnd commented Jun 13, 2023

/test e2e-aws-serial

@openshift-merge-robot openshift-merge-robot merged commit f400f6b into ComplianceAsCode:master Jun 13, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jhrozek jhrozek jhrozek approved these changes

@Vincent056 Vincent056 Awaiting requested review from Vincent056

@mrogers950 mrogers950 Awaiting requested review from mrogers950

Assignees

@jhrozek jhrozek

Labels
approved docs-approved lgtm px-approved qe-approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rhmdnd @jhrozek @openshift-merge-robot