fix up latest tags and add new scl image versions #5409

bparees · 2015-10-26T22:49:22Z

No description provided.

bparees · 2015-10-26T22:50:19Z

@smarterclayton @soltysh ptal. Note that latest still points to the older versions for now because the SCL images aren't actually released yet, so the rhel images aren't available. So we'll need to update this one more time before 3.1 ships, unless we want to ship 3.1 using the existing platform versions.

bparees · 2015-10-26T22:51:33Z

(also note that i think the reference logic was backwards before... i had the "2.0" tag following/referencing the "latest" tag in the spec, instead of the other way around. that is fixed with this PR.

smarterclayton · 2015-10-27T00:03:21Z

LGTM

soltysh · 2015-10-27T15:39:43Z

I'm removing my LGTM, because with current configuration spec.dockerImageRepository should be removed from all ISs, it's useless right now, that you manually specify each tag.

soltysh · 2015-10-27T15:40:17Z

examples/image-streams/image-streams-centos7.json

@@ -14,7 +14,11 @@
        "dockerImageRepository": "openshift/ruby-20-centos7",


Remove this and every occurence, where you specify images to be imported manually.

yeah i was debating whether to leave that or not... if i remove it, nothing (ie tags we don't specify explicitly) will get automatically imported, i'm not sure that's what we want. so i think it's appropriate to leave it.

Hrm - that may actually be what we want. We only want to import tags we
whitelist for openshift customers.

On Tue, Oct 27, 2015 at 12:43 PM, Ben Parees notifications@github.com
wrote:

In examples/image-streams/image-streams-centos7.json
#5409 (comment):

@@ -14,7 +14,11 @@
"dockerImageRepository": "openshift/ruby-20-centos7",

yeah i was debating whether to leave that or not... if i remove it,
nothing (ie tags we don't specify explicitly) will get automatically
imported, i'm not sure that's what we want. so i think it's appropriate to
leave it.

—
Reply to this email directly or view it on GitHub
https://github.com/openshift/origin/pull/5409/files#r43149082.

ok. if we're in agreement that we only want to import explicit tags i'll remove the dockerImageRepository field.

soltysh · 2015-10-27T20:38:39Z

LGTM, thanks @bparees !

bparees · 2015-10-28T03:58:22Z

test/cmd/images.sh

@@ -64,7 +64,7 @@ oc describe istag/mysql:latest
 [ "$(oc describe istag/mysql:latest | grep "Image Created:")" ]
 [ "$(oc describe istag/mysql:latest | grep "Image Name:")" ]
 name=$(oc get istag/mysql:latest --template='{{ .image.metadata.name }}')
-imagename="isimage/mysql@${name:0:7}"
+imagename="isimage/mysql@${name}"


@smarterclayton i'm not clear on why were were truncating this value previously? but it seems to be causing failures now that we have two valid images that start with mysql

To verify that you can retrieve images by their short ID. Which we still
want to do, but if there are two we should be able to choose the first.
I'm not sure why there are 2 now though.

On Tue, Oct 27, 2015 at 11:58 PM, Ben Parees notifications@github.com
wrote:

In test/cmd/images.sh
#5409 (comment):

@@ -64,7 +64,7 @@ oc describe istag/mysql:latest
[ "$(oc describe istag/mysql:latest | grep "Image Created:")" ]
[ "$(oc describe istag/mysql:latest | grep "Image Name:")" ]
name=$(oc get istag/mysql:latest --template='{{ .image.metadata.name }}')
-imagename="isimage/mysql@${name:0:7}"
+imagename="isimage/mysql@${name}"

@smarterclayton https://github.com/smarterclayton i'm not clear on why
were were truncating this value previously? but it seems to be causing
failures now that we have two valid images that start with mysql

—
Reply to this email directly or view it on GitHub
https://github.com/openshift/origin/pull/5409/files#r43216441.

Mysql 55 and mysql 56.

Ben Parees | OpenShift
On Oct 28, 2015 12:23 AM, "Clayton Coleman" notifications@github.com
wrote:

In test/cmd/images.sh
#5409 (comment):

@@ -64,7 +64,7 @@ oc describe istag/mysql:latest
[ "$(oc describe istag/mysql:latest | grep "Image Created:")" ]
[ "$(oc describe istag/mysql:latest | grep "Image Name:")" ]
name=$(oc get istag/mysql:latest --template='{{ .image.metadata.name }}')
-imagename="isimage/mysql@${name:0:7}"
+imagename="isimage/mysql@${name}"

To verify that you can retrieve images by their short ID. Which we still
want to do, but if there are two we should be able to choose the first. I'm
not sure why there are 2 now though.
… <#150acafb50312f2c_>
On Tue, Oct 27, 2015 at 11:58 PM, Ben Parees notifications@github.com
wrote: In test/cmd/images.sh <#5409 (comment)
https://github.com/openshift/origin/pull/5409#discussion_r43216441>: >
@@ -64,7 +64,7 @@ oc describe istag/mysql:latest > [ "$(oc describe
istag/mysql:latest | grep "Image Created:")" ] > [ "$(oc describe
istag/mysql:latest | grep "Image Name:")" ] > name=$(oc get
istag/mysql:latest --template='{{ .image.metadata.name }}') >
-imagename="isimage/mysql@${name:0:7}" > +imagename="isimage/mysql@${name}"
@smarterclayton https://github.com/smarterclayton <
https://github.com/smarterclayton> i'm not clear on why were were
truncating this value previously? but it seems to be causing failures now
that we have two valid images that start with mysql — Reply to this email
directly or view it on GitHub <
https://github.com/openshift/origin/pull/5409/files#r43216441>.

—
Reply to this email directly or view it on GitHub
https://github.com/openshift/origin/pull/5409/files#r43217260.

To verify that you can retrieve images by their short ID. Which we still want to do, but if there are two we should be able to choose the first. I'm not sure why there are 2 now though.

what is the "short id"? what this code was grabbing was something like "mysql@sha:"

and there are now 2 because you have the mysql56 and mysql55 images, both of which start with that string.

Then grow the length. The sha is different

On Wed, Oct 28, 2015 at 1:11 PM, Ben Parees notifications@github.com
wrote:

In test/cmd/images.sh
#5409 (comment):

@@ -64,7 +64,7 @@ oc describe istag/mysql:latest
[ "$(oc describe istag/mysql:latest | grep "Image Created:")" ]
[ "$(oc describe istag/mysql:latest | grep "Image Name:")" ]
name=$(oc get istag/mysql:latest --template='{{ .image.metadata.name }}')
-imagename="isimage/mysql@${name:0:7}"
+imagename="isimage/mysql@${name}"

To verify that you can retrieve images by their short ID. Which we still
want to do, but if there are two we should be able to choose the first. I'm
not sure why there are 2 now though.

what is the "short id"? what this code was grabbing was something like
"mysql@sha:"

and there are now 2 because you have the mysql56 and mysql55 images, both
of which start with that string.

—
Reply to this email directly or view it on GitHub
https://github.com/openshift/origin/pull/5409/files#r43286739.

Sure, i'm just trying to understand what "retrieve images by their short ID" means... is short ID specifically defined, or are you just saying "something shorter than the full id"?

Yes, the REST API uses the provided image id for image stream images as a
prefix and will find all matches - if there is just one, it is accepted, if
there are multiple, it gives an error. Basically like Git.

On Wed, Oct 28, 2015 at 3:06 PM, Ben Parees notifications@github.com
wrote:

In test/cmd/images.sh
#5409 (comment):

@@ -64,7 +64,7 @@ oc describe istag/mysql:latest
[ "$(oc describe istag/mysql:latest | grep "Image Created:")" ]
[ "$(oc describe istag/mysql:latest | grep "Image Name:")" ]
name=$(oc get istag/mysql:latest --template='{{ .image.metadata.name }}')
-imagename="isimage/mysql@${name:0:7}"
+imagename="isimage/mysql@${name}"

Sure, i'm just trying to understand what "retrieve images by their short
ID" means... is short ID specifically defined, or are you just saying
"something shorter than the full id"?

—
Reply to this email directly or view it on GitHub
https://github.com/openshift/origin/pull/5409/files#r43302985.

bparees · 2015-10-28T21:43:01Z

[test]

bparees · 2015-10-29T03:01:39Z

imagestreams appear to be disturbingly unreliable with these changes.... not sure what is going on.

!!! Error in test/cmd/newapp.sh:41
    '[ "$(oc new-app --search mysql | grep -E "Tags:\s+5.5,5.6,latest")" ]' exited with status 1

smarterclayton · 2015-10-29T03:07:37Z

Individual tags are added in order - it's possible that the end result is
that you're catching flakes on one of the tags. Do a tryuntil oc get
istag/one istag/two

On Oct 28, 2015, at 11:01 PM, Ben Parees notifications@github.com wrote:

imagestreams appear to be disturbingly unreliable with these changes....
not sure what is going on.

!!! Error in test/cmd/newapp.sh:41
'[ "$(oc new-app --search mysql | grep -E
"Tags:\s+5.5,5.6,latest")" ]' exited with status 1

—
Reply to this email directly or view it on GitHub
#5409 (comment).

bparees · 2015-10-29T03:14:30Z

do they get displayed in sorted order, or did i just get lucky on that in my local testing and i need to make my grep more tolerant?

smarterclayton · 2015-10-29T03:18:06Z

I thought Michal added a sort in string flexographic order.

On Wed, Oct 28, 2015 at 11:14 PM, Ben Parees notifications@github.com
wrote:

do they get displayed in sorted order, or did i just get lucky on that in
my local testing and i need to make my grep more tolerant?

—
Reply to this email directly or view it on GitHub
#5409 (comment).

liggitt · 2015-10-29T03:29:28Z

flexographic Is my new favorite word

bparees · 2015-10-29T03:31:48Z

@liggitt it's your ability to jump into a pull you weren't tagged in, within mere seconds, that makes me default to the assumption that all comments i read were posted by you. you're everywhere. and yes, +1 to flexographic. I pity my next interview candidate......."how would you write a flexographic sort?"

smarterclayton · 2015-10-29T03:37:32Z

The look of panic on the interviewee's face would be worth the eternity in Hell.

bparees · 2015-10-29T20:54:16Z

this might finally be passing. [merge]

openshift-bot · 2015-10-29T20:57:02Z

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/6406/) (Image: devenv-rhel7_2594)

openshift-bot · 2015-10-29T20:57:02Z

Evaluated for origin merge up to aa60db9

openshift-bot · 2015-10-29T20:57:03Z

Evaluated for origin test up to aa60db9

openshift-bot · 2015-10-29T21:55:04Z

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/6406/)

Merged by openshift-bot

soltysh reviewed Oct 27, 2015
View reviewed changes

bparees force-pushed the scl_imagestreams branch from 2fc7e71 to 5da3431 Compare October 27, 2015 18:00

bparees force-pushed the scl_imagestreams branch from 5da3431 to 117867d Compare October 28, 2015 03:57

bparees reviewed Oct 28, 2015
View reviewed changes

bparees force-pushed the scl_imagestreams branch 3 times, most recently from 085a0de to 8f1f6a9 Compare October 28, 2015 21:42

bparees force-pushed the scl_imagestreams branch from 8f1f6a9 to 7f18ec0 Compare October 28, 2015 22:38

bparees force-pushed the scl_imagestreams branch from 7f18ec0 to 6413f84 Compare October 29, 2015 03:13

bparees force-pushed the scl_imagestreams branch 2 times, most recently from 4396ae3 to 328b98f Compare October 29, 2015 20:42

fix up latest tags and add new scl image versions

aa60db9

bparees force-pushed the scl_imagestreams branch from 328b98f to aa60db9 Compare October 29, 2015 20:49

openshift-bot pushed a commit that referenced this pull request Oct 29, 2015

Merge pull request #5409 from bparees/scl_imagestreams

f4f3bcd

Merged by openshift-bot

openshift-bot merged commit f4f3bcd into openshift:master Oct 29, 2015

bparees deleted the scl_imagestreams branch October 30, 2015 03:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix up latest tags and add new scl image versions #5409

fix up latest tags and add new scl image versions #5409

bparees commented Oct 26, 2015

bparees commented Oct 26, 2015

bparees commented Oct 26, 2015

smarterclayton commented Oct 27, 2015

soltysh commented Oct 27, 2015

soltysh Oct 27, 2015

bparees Oct 27, 2015

smarterclayton Oct 27, 2015

bparees Oct 27, 2015

soltysh commented Oct 27, 2015

bparees Oct 28, 2015

smarterclayton Oct 28, 2015

bparees Oct 28, 2015

bparees Oct 28, 2015

smarterclayton Oct 28, 2015

bparees Oct 28, 2015

smarterclayton Oct 28, 2015

bparees commented Oct 28, 2015

bparees commented Oct 29, 2015

smarterclayton commented Oct 29, 2015

bparees commented Oct 29, 2015

smarterclayton commented Oct 29, 2015

liggitt commented Oct 29, 2015

bparees commented Oct 29, 2015

smarterclayton commented Oct 29, 2015

bparees commented Oct 29, 2015

openshift-bot commented Oct 29, 2015

openshift-bot commented Oct 29, 2015

openshift-bot commented Oct 29, 2015

openshift-bot commented Oct 29, 2015

		@@ -14,7 +14,11 @@
		"dockerImageRepository": "openshift/ruby-20-centos7",

fix up latest tags and add new scl image versions #5409

fix up latest tags and add new scl image versions #5409

Conversation

bparees commented Oct 26, 2015

bparees commented Oct 26, 2015

bparees commented Oct 26, 2015

smarterclayton commented Oct 27, 2015

soltysh commented Oct 27, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

soltysh commented Oct 27, 2015

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bparees commented Oct 28, 2015

bparees commented Oct 29, 2015

smarterclayton commented Oct 29, 2015

bparees commented Oct 29, 2015

smarterclayton commented Oct 29, 2015

liggitt commented Oct 29, 2015

bparees commented Oct 29, 2015

smarterclayton commented Oct 29, 2015

bparees commented Oct 29, 2015

openshift-bot commented Oct 29, 2015

openshift-bot commented Oct 29, 2015

openshift-bot commented Oct 29, 2015

openshift-bot commented Oct 29, 2015