-
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
Remove dependence on external mysql image tag order #11393
Remove dependence on external mysql image tag order #11393
Conversation
LGTM [test] |
Evaluated for origin test up to eebbd5c |
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. |
@miminar Yes, I was wrong. |
@liggitt good job! Jenkins just passed image cmd images test. |
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10113/) (Base Commit: 2142bdb) |
[merge] |
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10113/) (Image: devenv-rhel7_5185) |
Evaluated for origin merge up to eebbd5c |
@@ -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:' |
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'd be better to use centos/mysql-56-centos7 since it'll be around longer.
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.
sorry, didn't see this until post-merge. @miminar, can you follow up with any additional improvements to lengthen the lifespan of the test?
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.
yeah i didn't make the comment until post merge :)
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.
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:' |
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.
can we not get rid of all the docker.io/mysql refs in these tests?
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.
possibly... the point was to test tagging in things from other sources, but there may be a more contained way to do it. @miminar ^
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.
on it
Resolves #11381