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

overlay.yml: Add origin to be one of the packages #8

Merged

Conversation

peterbaouoft
Copy link
Contributor

Add origin and uses its repo's spec file for rpmdistro-gitoverlay(building rpms).

One thing to note that, origin repo switched to hyperkube since commit
openshift/origin@1116e05,
kubelet is no longer included in the origin.spec.

Environment is a docker container with https://github.com/cgwalters/rpmdistro-gitoverlay/pull/43 's steps
The output for build is as the following:

[root@a20e073781a4 origin-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3]# ls
build.log                                                                                            origin-master-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm
hw_info.log                                                                                          origin-node-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm
installed_pkgs.log                                                                                   origin-pod-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm
origin-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.src.rpm                     origin-sdn-ovs-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm
origin-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm                  origin-template-service-broker-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm
origin-clients-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm          origin-tests-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm
origin-docker-excluder-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.noarch.rpm  root.log
origin-excluder-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.noarch.rpm         srpm
origin-hyperkube-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm        state.log
origin-hypershift-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm       status.json

The end of the buildlog

Checking for unpackaged file(s): /usr/lib/rpm/check-files /builddir/build/BUILDROOT/origin-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64
Wrote: /builddir/build/RPMS/origin-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm
Wrote: /builddir/build/RPMS/origin-hypershift-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm
Wrote: /builddir/build/RPMS/origin-hyperkube-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm
Wrote: /builddir/build/RPMS/origin-master-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm
Wrote: /builddir/build/RPMS/origin-tests-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm
Wrote: /builddir/build/RPMS/origin-node-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm
Wrote: /builddir/build/RPMS/origin-clients-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm
Wrote: /builddir/build/RPMS/origin-pod-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm
Wrote: /builddir/build/RPMS/origin-sdn-ovs-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm
Wrote: /builddir/build/RPMS/origin-template-service-broker-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64.rpm
Wrote: /builddir/build/RPMS/origin-excluder-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.noarch.rpm
Wrote: /builddir/build/RPMS/origin-docker-excluder-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.noarch.rpm
Executing(%clean): /bin/sh -e /var/tmp/rpm-tmp.CQPyLs
+ umask 022
+ cd /builddir/build/BUILD
+ cd origin-v3.10.0-alpha.0-1088-9fd79442c18ddcc6de67ca6610d797def83635d3
+ /usr/bin/rm -rf /builddir/build/BUILDROOT/origin-3.10.0.alpha.0.1088-9fd79442c18ddcc6de67ca6610d797def83635d3.fc28.x86_64
+ exit 0
Child return code was: 0

Add origin and uses its repo's spec file for rpmdistro-gitoverlay.

One thing to note that, origin repo switched to hyperkube since commit
openshift/origin@1116e05,
kubelet is no longer included in the origin.spec.
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 10, 2018
@ashcrow ashcrow self-requested a review May 10, 2018 18:27
@ashcrow
Copy link
Member

ashcrow commented May 10, 2018

Testing now.

@ashcrow
Copy link
Member

ashcrow commented May 10, 2018

Built the rpms as expected.

$ rpm -qpl build-1/origin-3.10.0.alpha.0.1090-e840cccd960d1e8d69ec42cacb39b37339c90ed2/origin-node-3.10.0.alpha.0.1090-e840cccd960d1e8d69ec42cacb39b37339c90ed2.fc28.x86_64.rpm 
/etc/origin/node
/etc/sysconfig/origin-node
/etc/systemd/system.conf.d/origin-accounting.conf
/usr/bin/openshift-node-config

@ashcrow
Copy link
Member

ashcrow commented May 10, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 10, 2018
@openshift-merge-robot openshift-merge-robot merged commit 33c25cd into openshift:master May 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

None yet

4 participants