RPMs: manipulate images path conditionally based on rpm %{dist}

[sdodson]

No description provided.

[sdodson]

Ok, if dist = el7ose then you get
--images=registry.access.redhat.com/openshift3_beta/ose-${component}:${version}
else you get
--images=openshift/origin-${component}:${version}

If building with tito locally you'll need to add the following to your build command, there may be some way to do this automatically via tito.props
--rpmbuild-options='--define "dist el7ose"'

[sdodson]

@brenton PTAL

[sosiouxme]

Looks good... I assume we're going to put the necessary version tags on the docker images in registry.access.redhat.com?

[sdodson]

I believe Brenton is tagging the images with versions prior to pushing them.

[brenton]

@sdodson, I haven't tagged anything explicitly yet. Let me sync with ejacobs to see if we wants this for beta1 or not. We could technically get by with just using the latest tags.

[smarterclayton]

I don't think we should drop this.

[smarterclayton]

• Unless we absolutely have to.

[sosiouxme]

@smarterclayton suggested we hardcode "beta1" as the version injected by the specfile, unless we can get tito to inject the version (0.3.0-git.42.afe2a53...) correctly. This should help us when we need to push updates (beta1 or future). Whatever we put in there has to be a valid tag that we can apply in registry.access.redhat.com

[sdodson]

I think I can get tito to buid the proper ldflags from os::build::ldflags in hack/common.sh which would fix openshift version which I imagine is requisite for image versions to work properly.

[smarterclayton]

Tito just needs to set a tag?

----- Original Message -----

I think I can get tito to buid the proper ldflags from on os::build::ldflags
in hack/common.sh which would fix openshift version which I imagine is
requisite for image versions to work properly.

---

Reply to this email directly or view it on GitHub:
#930 (comment)

[sdodson]

@smarterclayton The problem arises in the fact that brew doesn't build the RPMs from a git checkout. However tito build and tito tag do happen locally in the git checkout before shipping things off to brew. So I'm going to source hack/common.sh and store the ldflags generated from os::build::ldflags() in a specfile global and use that.

I spoke with Adam Miller a bit about why we're building via go build rather than hack/build-go.sh and I don't think we'll get that sorted out quickly enough to consider using hack/build-go.sh to build the RPMs.

[sdodson]

And yes, tito creates a tag of it's own when releasing like 'openshift-0.2.1-4'

[smarterclayton]

On Feb 6, 2015, at 12:10 PM, Scott Dodson [email protected] wrote:

@smarterclayton The problem arises in the fact that brew doesn't build the RPMs from a git checkout. However tito build and tito tag do happen locally in the git checkout before shipping things off to brew. So I'm going to source hack/common.sh and store the ldflags generated from os::build::ldflags() in a specfile global and use that.

We should already support loading those from a file - if possible making those fit together would be ideal.

I spoke with Adam Miller a bit about why we're building via go build rather than hack/build-go.sh and I don't think we'll get that sorted out quickly enough to consider using hack/build-go.sh to build the RPMs.

Ultimately build-cross (even if we only run it for one arch) is our official build script and is what we should be using. By beta2 I'd like to have rpms building from that - do you see an obstacle to that?
—
Reply to this email directly or view it on GitHub.

[sdodson]

@smarterclayton I'll look at using build-cross in the future. I was told that the hack/* scripts would not run inside a mock chroot but that may have changed since Adam looked at it last.

For now I've updated the tito custom builder/tagger to inject the value of os::build::ldflags into the RPM build process and I've verified that it yields sane results.

sdodson@sdodson: ~/git/Openshift/origin (set-images-format)$ openshift version
openshift v0.2.2-131-ge9d5726cc2a554
kubernetes v0.10.0-46-g72ad4f1

[smarterclayton]

K

----- Original Message -----

@smarterclayton I'll look at using build-cross in the future. I was told that
the hack/* scripts would not run inside a mock chroot but that may have
changed since Adam looked at it last.

For now I've updated the tito custom builder/tagger to inject the value of
os::build::ldflags into the RPM build process and I've verified that it
yields sane results.

sdodson@sdodson: ~/git/Openshift/origin (set-images-format)$ openshift
version
openshift v0.2.2-131-ge9d5726cc2a554
kubernetes v0.10.0-46-g72ad4f1

---

Reply to this email directly or view it on GitHub:
#930 (comment)

[sdodson]

Ok, ${version} is in after verifying RCM steps. Can we merge this now?

[smarterclayton]

LGTM

[sdodson]

[merge]

[danmcp]

[merge]

[openshift-bot]

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_openshift3/936/) (Image: devenv-fedora_810)

[openshift-bot]

Evaluated for origin up to 13eaf0f