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

Fix import-image --all #9163

Merged
merged 3 commits into from
Jun 9, 2016
Merged

Fix import-image --all #9163

merged 3 commits into from
Jun 9, 2016

Conversation

soltysh
Copy link
Contributor

@soltysh soltysh commented Jun 3, 2016

Fixes #8952.

@soltysh soltysh changed the title [WIP] Fix import-image --all Fix import-image --all Jun 6, 2016
@soltysh
Copy link
Contributor Author

soltysh commented Jun 6, 2016

[test]

@soltysh
Copy link
Contributor Author

soltysh commented Jun 7, 2016

Rebased due to weird test failures. This is ready for review @smarterclayton or @miminar ptal

}
}
if len(tags) == 0 {
return nil, fmt.Errorf("image stream does not have importable tags (pointing to DockerImage)")
Copy link
Contributor

Choose a reason for hiding this comment

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

The message needs to be improved

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Apparently it'll be fixed/changed, due to https://bugzilla.redhat.com/show_bug.cgi?id=1343681. But that will be rather a followup to this one. For now I'll go with: 'image stream does not have tags pointing to external docker images'

@soltysh
Copy link
Contributor Author

soltysh commented Jun 8, 2016

@smarterclayton does this look good to you now?

@smarterclayton
Copy link
Contributor

Yeah, squash

@soltysh
Copy link
Contributor Author

soltysh commented Jun 8, 2016

Done.

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to fa40c7d

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/4605/)

@smarterclayton
Copy link
Contributor

LGTM [merge]

On Wed, Jun 8, 2016 at 12:20 PM, OpenShift Bot [email protected]
wrote:

continuous-integration/openshift-jenkins/test FAILURE (
https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/4605/)


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#9163 (comment),
or mute the thread
https://github.com/notifications/unsubscribe/ABG_p0qYg6QXwE05F0bIzGP8sB8lb1Chks5qJuvbgaJpZM4ItsZW
.

@openshift-bot
Copy link
Contributor

openshift-bot commented Jun 8, 2016

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

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to fa40c7d

@openshift-bot openshift-bot merged commit 7d83f5b into openshift:master Jun 9, 2016
@soltysh soltysh deleted the import_all branch June 9, 2016 11:47
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.

3 participants