-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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
Created a script to run tito builds and upack leftover artifacts #11248
Conversation
76d9cee
to
e220924
Compare
# | ||
# Example: | ||
# make release | ||
rpm-release: clean build-rpms |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
release-rpm
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually release-rpms
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
?
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
e220924
to
9259db0
Compare
Updated to |
LGTM [merge] |
Evaluated for origin merge up to 9259db0 |
[Test]ing while waiting on the merge queue |
Evaluated for origin test up to 9259db0 |
@danmcp please re-tag |
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10534/) (Image: devenv-rhel7_5236) |
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10534/) (Base Commit: 84cddbc) |
[merge] On Mon, Oct 24, 2016 at 10:19 AM, OpenShift Bot notifications@github.com
|
[merge] On Sat, Oct 22, 2016 at 8:29 PM, OpenShift Bot notifications@github.com
|
@smarterclayton this went into |
fi | ||
|
||
os::log::info 'Building Origin release RPMs with tito...' | ||
tito_tmp_dir="${BASETMPDIR}/tito" |
There was a problem hiding this comment.
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
?
There was a problem hiding this comment.
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}" |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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}" |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
Signed-off-by: Steve Kuznetsov skuznets@redhat.com
replaces #11244
.cc @smarterclayton