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.

Sign up for GitHub

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

Jump to bottom

Properly fail on empty repoquery version checks #4097

Merged
merged 1 commit into from
May 10, 2017
Merged

Properly fail on empty repoquery version checks #4097

merged 1 commit into from
May 10, 2017

Conversation

mtnbikenc
Copy link
Member

The repoquery_cmd could return an empty string if RPMs are not available. This PR adds a task to confirm the repoquery_cmd returned a result, or fail with a helpful error message.

Fixes #3119

@mtnbikenc mtnbikenc self-assigned this May 4, 2017
@mtnbikenc mtnbikenc requested a review from tbielawa May 4, 2017 18:29
@mtnbikenc
Copy link
Member Author

aos-ci-test

ingvagabund
ingvagabund reviewed May 4, 2017
View reviewed changes
playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml Outdated
@@ -31,6 +31,13 @@
register: avail_openshift_version
when: not openshift.common.is_containerized | bool

- name: Fail when unable to determine available OpenShift RPM version
Copy link
Member

Choose a reason for hiding this comment

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

If you move set_fact after Verify containers are available for upgrade, you can put:

  • set_fact
  • Check latest available OpenShift RPM version
  • Fail when unable to determine available OpenShift RPM version
  • Verify OpenShift RPMs are available for upgrade

under common block with one not openshift.common.is_containerized | bool when condition.

Copy link
Member Author

Choose a reason for hiding this comment

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

I had made a bunch of changes to this file to standardize stuff, including putting in blocks, but then backed it all out because I didn't want to conflate the actual change I was making to put in the one fail task. I'll go ahead and make the other standardization changes.

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.5_NOT_containerized, aos-ci-jenkins/OS_3.5_NOT_containerized_e2e_tests" for 33b7427 (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.6_NOT_containerized, aos-ci-jenkins/OS_3.6_NOT_containerized_e2e_tests" for 33b7427 (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.5_containerized, aos-ci-jenkins/OS_3.5_containerized_e2e_tests" for 33b7427 (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.6_containerized, aos-ci-jenkins/OS_3.6_containerized_e2e_tests" for 33b7427 (logs)

@mtnbikenc
Copy link
Member Author

@ingvagabund @tbielawa Updated this PR with additional changes as follows:

  • Used block to group common when conditions
  • Removed unused/unnecessary vars
  • Added names to all tasks
  • Converted when statement conditionals to lists

@mtnbikenc
Copy link
Member Author

aos-ci-test

@openshift-bot
Copy link

error: aos-ci-jenkins/OS_3.6_containerized for d1b5616 (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.5_NOT_containerized, aos-ci-jenkins/OS_3.5_NOT_containerized_e2e_tests" for d1b5616 (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.5_containerized, aos-ci-jenkins/OS_3.5_containerized_e2e_tests" for d1b5616 (logs)

@openshift-bot
Copy link

error: "aos-ci-jenkins/OS_3.6_NOT_containerized, aos-ci-jenkins/OS_3.6_NOT_containerized_e2e_tests" for d1b5616 (logs)

@ingvagabund
Copy link
Member

aos-ci-test

@openshift-bot
Copy link

error: aos-ci-jenkins/OS_3.6_containerized for d1b5616 (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.5_NOT_containerized, aos-ci-jenkins/OS_3.5_NOT_containerized_e2e_tests" for d1b5616 (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.5_containerized, aos-ci-jenkins/OS_3.5_containerized_e2e_tests" for d1b5616 (logs)

@openshift-bot
Copy link

error: "aos-ci-jenkins/OS_3.6_NOT_containerized, aos-ci-jenkins/OS_3.6_NOT_containerized_e2e_tests" for d1b5616 (logs)

@mtnbikenc
Copy link
Member Author

aos-ci-test

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.5_NOT_containerized, aos-ci-jenkins/OS_3.5_NOT_containerized_e2e_tests" for d1b5616 (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.5_containerized, aos-ci-jenkins/OS_3.5_containerized_e2e_tests" for d1b5616 (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.6_containerized, aos-ci-jenkins/OS_3.6_containerized_e2e_tests" for d1b5616 (logs)

@openshift-bot
Copy link

success: "aos-ci-jenkins/OS_3.6_NOT_containerized, aos-ci-jenkins/OS_3.6_NOT_containerized_e2e_tests" for d1b5616 (logs)

@sdodson
Copy link
Member

sdodson commented May 10, 2017

[merge]

@mtnbikenc
Copy link
Member Author

Flake on openshift/origin#14122 tito build error
https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_openshift_ansible/341/

@mtnbikenc
Copy link
Member Author

[merge]

@openshift-bot
Copy link

Evaluated for openshift ansible merge up to d1b5616

@openshift-bot
Copy link

continuous-integration/openshift-jenkins/merge FAILURE (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_openshift_ansible/346/) (Base Commit: 44fc382)

@sdodson sdodson merged commit 2260195 into openshift:master May 10, 2017
@mtnbikenc mtnbikenc deleted the fix-version-check branch May 10, 2017 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ingvagabund ingvagabund ingvagabund approved these changes

@tbielawa tbielawa Awaiting requested review from tbielawa

Assignees

@mtnbikenc mtnbikenc

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mtnbikenc @openshift-bot @ingvagabund @sdodson