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

Remove dependence on external mysql image tag order #11393

Merged
merged 1 commit into from
Oct 17, 2016
Merged

Remove dependence on external mysql image tag order #11393

merged 1 commit into from
Oct 17, 2016

Conversation

liggitt
Copy link
Contributor

@liggitt liggitt commented Oct 17, 2016

Resolves #11381

@miminar
Copy link

miminar commented Oct 17, 2016

LGTM [test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to eebbd5c

@legionus
Copy link
Contributor

I think it fix #10928 too.

@miminar
Copy link

miminar commented Oct 17, 2016

I think it fix #10928 too.

I don't think so, we still import from the same location (docker hub). The timeout can occur again.

@legionus
Copy link
Contributor

I don't think so, we still import from the same location (docker hub). The timeout can occur again.

@miminar Yes, I was wrong.

@miminar
Copy link

miminar commented Oct 17, 2016

@liggitt good job! Jenkins just passed image cmd images test.

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10113/) (Base Commit: 2142bdb)

@liggitt
Copy link
Contributor Author

liggitt commented Oct 17, 2016

[merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Oct 17, 2016

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

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to eebbd5c

@openshift-bot openshift-bot merged commit 92a71d4 into openshift:master Oct 17, 2016
@@ -197,7 +196,7 @@ os::cmd::expect_success_and_text "oc get is/reference --template='{{(index .spec
os::cmd::expect_success 'oc new-project test-cmd-images-2'
os::cmd::expect_success "oc tag $project/mysql:5.5 newrepo:latest"
os::cmd::expect_success_and_text "oc get is/newrepo --template='{{(index .spec.tags 0).from.kind}}'" 'ImageStreamImage'
os::cmd::expect_success_and_text 'oc get istag/newrepo:latest -o jsonpath={.image.dockerImageReference}' 'mysql@sha256:'
os::cmd::expect_success_and_text 'oc get istag/newrepo:latest -o jsonpath={.image.dockerImageReference}' 'openshift/mysql-55-centos7@sha256:'
Copy link
Contributor

Choose a reason for hiding this comment

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

it'd be better to use centos/mysql-56-centos7 since it'll be around longer.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sorry, didn't see this until post-merge. @miminar, can you follow up with any additional improvements to lengthen the lifespan of the test?

Copy link
Contributor

Choose a reason for hiding this comment

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

yeah i didn't make the comment until post merge :)

Copy link

Choose a reason for hiding this comment

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

sure

os::cmd::expect_success_and_text "oc get is/mysql --template='{{(len .spec.tags)}}'" '1'
os::cmd::expect_success 'oc delete is/mysql'
os::cmd::expect_failure_and_text 'oc import-image mysql-new-single:latest --from=docker.io/mysql:latest' '\-\-confirm'
os::cmd::expect_success_and_text 'oc import-image mysql-new-single:latest --from=docker.io/mysql:latest --confirm' 'sha256:'
Copy link
Contributor

Choose a reason for hiding this comment

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

can we not get rid of all the docker.io/mysql refs in these tests?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

possibly... the point was to test tagging in things from other sources, but there may be a more contained way to do it. @miminar ^

Copy link

Choose a reason for hiding this comment

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

on it

@liggitt liggitt deleted the fix-external-mysql-tests branch October 17, 2016 19:35
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.

5 participants