Skip to content

promotion: handle "master*" branch same as master#237

Closed
vrutkovs wants to merge 1 commit intoopenshift:masterfrom
vrutkovs:fcos-master-promotion
Closed

promotion: handle "master*" branch same as master#237
vrutkovs wants to merge 1 commit intoopenshift:masterfrom
vrutkovs:fcos-master-promotion

Conversation

@vrutkovs
Copy link
Copy Markdown
Contributor

OKD-on-FCOS testing requires some projects to have master temporarily
forked in "master-fcos" branches. This uses correct promotion flavor for
those.

Fixes sharded config tests in openshift/release#5557 and openshift/release#5589

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 24, 2019
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: vrutkovs
To complete the pull request process, please assign hongkailiu
You can assign the PR to them by writing /assign @hongkailiu in a comment when ready.

The full list of commands accepted by this bot can be found 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

Comment thread pkg/promotion/promotion.go Outdated
@vrutkovs vrutkovs force-pushed the fcos-master-promotion branch from 7ae5af5 to f307b91 Compare October 24, 2019 19:08
@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 24, 2019
@vrutkovs vrutkovs force-pushed the fcos-master-promotion branch from f307b91 to 6d5c185 Compare October 24, 2019 19:14
@vrutkovs vrutkovs changed the title promotion: handle "master-fcos" branch same as master promotion: handle "master*" branch same as master Oct 24, 2019
@vrutkovs vrutkovs force-pushed the fcos-master-promotion branch 2 times, most recently from bb1889e to 3a8d6cb Compare October 24, 2019 19:15
OKD-on-FCOS testing requires some projects to have master temporarily 
forked in "master-fcos" branches. This uses correct promotion flavor for 
these kind of branchs
@vrutkovs
Copy link
Copy Markdown
Contributor Author

/hold

It seems master-fcos branch would be renamed so this PR is not necessary

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 25, 2019
func FlavorForBranch(branch string) string {
var flavor string
if branch == "master" {
if masterBranches.MatchString(branch) {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The glob he have today is here:

    ci-operator/config/**/*master*.yaml:
      name: ci-operator-master-configs
      additional_namespaces:
      - ci-stg

That would match not-really-master-branch

@vrutkovs
Copy link
Copy Markdown
Contributor Author

vrutkovs commented Nov 1, 2019

This is no longer required - we settled on fcos branch name

@vrutkovs vrutkovs closed this Nov 1, 2019
@vrutkovs vrutkovs deleted the fcos-master-promotion branch November 1, 2019 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants