Skip to content

Regenerate presubmits to pick up ci-tools#2136#20738

Merged
openshift-ci[bot] merged 1 commit intoopenshift:masterfrom
petr-muller:stricter-feature-branches-w-rehearsals
Aug 3, 2021
Merged

Regenerate presubmits to pick up ci-tools#2136#20738
openshift-ci[bot] merged 1 commit intoopenshift:masterfrom
petr-muller:stricter-feature-branches-w-rehearsals

Conversation

@petr-muller
Copy link
Copy Markdown
Member

@petr-muller petr-muller commented Jul 30, 2021

No description provided.

@petr-muller petr-muller mentioned this pull request Jul 30, 2021
Merged
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 30, 2021
@openshift-ci openshift-ci bot requested review from 2uasimojo and abhat July 30, 2021 14:18
@2uasimojo
Copy link
Copy Markdown
Member

2uasimojo commented Jul 30, 2021

ok for hive. I'm not sure why we need the second form, e.g.

@@ -122,7 +124,8 @@ presubmits:
   - agent: kubernetes
     always_run: false
     branches:
-    - master
+    - ^master$
+    - ^master-
     cluster: build01
     context: ci/prow/e2e-aws-manual-oidc
     decorate: true

IIUC ^master- will also match branches like master-foo, which it didn't before. But at least in our case, since we don't have branches like that, it's not a thing.

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 1, 2021
@petr-muller petr-muller force-pushed the stricter-feature-branches-w-rehearsals branch from 375fcde to 6413ef0 Compare August 3, 2021 11:38
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 3, 2021
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Aug 3, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: petr-muller

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

The pull request process is described here

Details 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

@openshift-merge-robot openshift-merge-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 3, 2021
@petr-muller
Copy link
Copy Markdown
Member Author

petr-muller commented Aug 3, 2021

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 3, 2021
@petr-muller
Copy link
Copy Markdown
Member Author

petr-muller commented Aug 3, 2021

IIUC ^master- will also match branches like master-foo, which it didn't before. But at least in our case, since we don't have branches like that, it's not a thing.

It actually did match such branches before, see https://docs.ci.openshift.org/docs/how-tos/contributing-openshift-release/#feature-branches. The problem with that is that without a separator, you get false matches by e.g. release-4.10 being a "feature
branch" of relase-4.1. Requiring the separator will help with that.

@petr-muller
Copy link
Copy Markdown
Member Author

petr-muller commented Aug 3, 2021

/retest
/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 3, 2021
@openshift-ci openshift-ci bot merged commit 82c2987 into openshift:master Aug 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@2uasimojo 2uasimojo Awaiting requested review from 2uasimojo

@abhat abhat Awaiting requested review from abhat

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@petr-muller @2uasimojo @openshift-merge-robot