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

Injecting new required vars into origin.spec file #20503

Merged
merged 1 commit into from
Aug 2, 2018

Conversation

sdodson
Copy link
Member

@sdodson sdodson commented Aug 1, 2018

We may need to just copy the contents of .tito/lib/ from OSE to Origin if there are more changes here.

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 1, 2018
@sdodson
Copy link
Member Author

sdodson commented Aug 1, 2018

@DanyC97 this may help

@sdodson
Copy link
Member Author

sdodson commented Aug 1, 2018

/assign @jupierce
/cc @jupierce

@adammhaile
Copy link
Contributor

Want to review but is there some context on why this change is needed?

@jupierce
Copy link
Contributor

jupierce commented Aug 1, 2018

@adammhaile I don't know exact context, but if someone is using tito on origin, this brings it into line with the 3.10 ose repo. The additional variables are required. It will likely result in a merge conflict which needs manual resolution.

@sdodson
Copy link
Member Author

sdodson commented Aug 1, 2018

Centos PaaS SIG builds rpms from this repo but we've let the tito plugins which are required fall out of sync so they're running into problems. See the build.log here
https://cbs.centos.org/koji/taskinfo?taskID=500897

@adammhaile
Copy link
Contributor

@jupierce Works for me then.

@DanyC97
Copy link
Contributor

DanyC97 commented Aug 1, 2018

@sdodson much thanks for digging the delta, as you know i killed 2 days trying to understand where the prob is.

i wished either OCP will use same origin.spec file like everyone else in which case will force everyone to keep thigns working or at least a heads up and i'll be happy to create a PR.

Sadly i can't do what @sdodson done since i have no internal access, so much thanks again for your help @sdodson

@jupierce
Copy link
Contributor

jupierce commented Aug 1, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 1, 2018
@sdodson sdodson added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 2, 2018
@openshift-merge-robot openshift-merge-robot merged commit e9069f9 into openshift:release-3.10 Aug 2, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: jupierce, sdodson

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants