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

[1.4] Fix image pruning with both strong & weak refs #13676

Merged
merged 1 commit into from
Apr 9, 2017

Conversation

soltysh
Copy link
Contributor

@soltysh soltysh commented Apr 7, 2017

Fix a logic error where an image could incorrectly be considered
prunable if there were both strong and weak references from an image
stream to the image.

1.4 cherrypick of #13671

Fix a logic error where an image could incorrectly be considered
prunable if there were both strong and weak references from an image
stream to the image.
Copy link
Contributor

@pweil- pweil- left a comment

Choose a reason for hiding this comment

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

LGTM - merging on green

@pweil-
Copy link
Contributor

pweil- commented Apr 7, 2017

[test]

@pweil-
Copy link
Contributor

pweil- commented Apr 7, 2017

re[test]

@pweil-
Copy link
Contributor

pweil- commented Apr 7, 2017

flake #12007 re[test]

@pweil-
Copy link
Contributor

pweil- commented Apr 7, 2017

[test]

@eparis
Copy link
Member

eparis commented Apr 7, 2017

[merge] just to get it in the queue somewhere?

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to aa1043c

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge FAILURE (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/281/) (Base Commit: 977f53a)

@pweil-
Copy link
Contributor

pweil- commented Apr 7, 2017

#13271
[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to aa1043c

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/655/) (Base Commit: 977f53a)

@pweil-
Copy link
Contributor

pweil- commented Apr 8, 2017

Seems to be having issues with:

++ export PATH
+ os::build::rpm::get_nvra_vars
bash: line 5: os::build::rpm::get_nvra_vars: command not found
++ os::util::trap::err_handler
++ local -r return_code=127
++ local -r last_command=os::build::rpm::get_nvra_vars

@mfojtik the only place I can find that is: b95268c#diff-c678ee0710aaec9235e19633904cef51 and doesn't exist in the 1.4 branch. Ideas?

In any case the test_pull_request_origin_integration, test_pull_request_origin_check, and test_pull_request_origin_extended_networking_minimal passed..

@stevekuznetsov
Copy link
Contributor

Historically we have never versioned the jobs that run our CI. As of late there has been more churn than usual on the support code and 1.4 branch is ~150 commits behind 1.5 ... unclear if the backport is a reasonable thing to do or not, but these errors are expected.

@stevekuznetsov
Copy link
Contributor

If you want to run conformance tests without the Ansible installation, use https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin_extended_conformance/ manually.

@eparis eparis merged commit 2a83de3 into openshift:release-1.4 Apr 9, 2017
@soltysh soltysh deleted the 1.4/prune-weak-strong-ref branch April 10, 2017 11:27
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