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

Created a script to run tito builds and upack leftover artifacts #11248

Merged

Conversation

stevekuznetsov
Copy link
Contributor

Signed-off-by: Steve Kuznetsov skuznets@redhat.com

replaces #11244
.cc @smarterclayton

@stevekuznetsov stevekuznetsov force-pushed the skuznets/makefile-rpm-release branch 9 times, most recently from 76d9cee to e220924 Compare October 7, 2016 14:36
@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 15, 2016
#
# Example:
# make release
rpm-release: clean build-rpms
Copy link
Contributor

Choose a reason for hiding this comment

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

release-rpm

Copy link
Contributor

Choose a reason for hiding this comment

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

Actually release-rpms

Copy link
Contributor

Choose a reason for hiding this comment

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

Actually, one sec.

build is intended to build for local use. Release is intended to build for redistribution. "official-release" should push artifacts someplace (tool for inside out management), while release is a tool for someone who manages the artifacts themselves.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So what's your take on this? You'll get RPMs and I imagine you could email them to someone ... release-rpms?

Copy link
Contributor

Choose a reason for hiding this comment

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

release-rpms is good for now.

os::build::setup_env
os::util::environment::setup_tmpdir_vars "build-rpm-release"

if [[ "${OS_ONLY_BUILD_PLATFORMS:-}" == 'linux/amd64' ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

What's the difference between make_redistributable? If I ran brew/tito on linux/386, what happens?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If it's set to 1, we build all of the clients. If not, we only build the linux/amd64 one.

https://github.com/openshift/origin/blob/master/origin.spec#L200-L206

Copy link
Contributor

Choose a reason for hiding this comment

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

I would expect make_redistributable to build the platform I am on.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's not what the team building the specfile has decided to do with that option ... do you want me to propose that change to them first?

Copy link
Contributor

Choose a reason for hiding this comment

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

It's fine for now. I don't think it makes a ton of sense in the future, but can live with it.

@openshift-bot openshift-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Oct 18, 2016
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
@stevekuznetsov
Copy link
Contributor Author

Updated to release-rpms @smarterclayton any last comments?

@smarterclayton
Copy link
Contributor

LGTM [merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 9259db0

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@stevekuznetsov stevekuznetsov changed the title [wip] Created a script to run tito builds and upack leftover artifacts Created a script to run tito builds and upack leftover artifacts Oct 21, 2016
@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 9259db0

@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 21, 2016
@stevekuznetsov
Copy link
Contributor Author

@danmcp please re-tag

@openshift-bot
Copy link
Contributor

openshift-bot commented Oct 24, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10534/) (Image: devenv-rhel7_5236)

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10534/) (Base Commit: 84cddbc)

@openshift-bot openshift-bot merged commit 22f150d into openshift:master Oct 24, 2016
@smarterclayton
Copy link
Contributor

[merge]

On Mon, Oct 24, 2016 at 10:19 AM, OpenShift Bot notifications@github.com
wrote:

continuous-integration/openshift-jenkins/test SUCCESS (
https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10534/) (Base
Commit: 84cddbc
84cddbc
)


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#11248 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/ABG_p8CUx9ouHIMMyGLDRd02apeVs6j3ks5q3L5WgaJpZM4KQEVW
.

@smarterclayton
Copy link
Contributor

[merge]

On Sat, Oct 22, 2016 at 8:29 PM, OpenShift Bot notifications@github.com
wrote:

continuous-integration/openshift-jenkins/merge ABORTED (
https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10479/) (Base
Commit: 87f54d1
87f54d1
)


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#11248 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/ABG_p5cKD_OxeI1WzzK1ie-BxtEfuG8Bks5q2qplgaJpZM4KQEVW
.

@stevekuznetsov
Copy link
Contributor Author

@smarterclayton this went into master yesterday...

fi

os::log::info 'Building Origin release RPMs with tito...'
tito_tmp_dir="${BASETMPDIR}/tito"
Copy link
Contributor

Choose a reason for hiding this comment

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

why isn't this _output/tito or _output/rpm?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Outputs a bunch of other nonsense we don't want to keep around. I copy the important bits back at the end.


# migrate the tito artifacts to the Origin directory
mkdir -p "${OS_OUTPUT}"
cp -r "${tito_output_directory}"/* "${OS_OUTPUT}"
Copy link
Contributor

Choose a reason for hiding this comment

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

why not mv? Creates extra content we don't need probably.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good question, should be a mv

mkdir -p "${OS_OUTPUT}"
cp -r "${tito_output_directory}"/* "${OS_OUTPUT}"
mkdir -p "${OS_LOCAL_RELEASEPATH}"
cp "${tito_tmp_dir}"/x86_64/*.rpm "${OS_LOCAL_RELEASEPATH}"
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure how I feel about this. On the one hand everything is in the same spot. On the other, we'll eventually have multi arch. Hrm.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We could set up the $basearch/$version directories using tito I think and then we can potentially have the createrepo call most of us will do an optional part of the build here, and we could move the entire multiarch repo root.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants