master cherry picks for 3.6.1 #4814
Conversation
|
@sosiouxme thanks for keeping track of this! |
And document that one needs to install dependencies before running playbooks.
We do not need the builder functionality from playbook2image and the resulting image was overly complicated, so this simply builds on Centos/RHEL.
This patch verifies that logs sent from logging pods can be queried on the Elasticsearch pod within a reasonable amount of time.
Move task_vars into instance variable so we don't have to pass it around everywhere. Also store tmp. Make sure both are filled in on execute_module. In the process, is_active became an instance method, and task_vars is basically never used directly outside of test code.
Clean up openshift-checks playbooks - The referenced issue was closed, seems like a wontfix. Just use the old syntax and make no noise about it. - Remove inconsistent use of tags: if tags are passed in the command line, there is no point in evaluating groups if the checks won't be run anyway. - Remove temporal comment, easy to get out of sync. Make LoggingCheck.run return the correct type The run method is expected to return a dict. Even though we should not run LoggingCheck by itself, it is still possible to do it and without this change we get an unhandled exception. Clean up unnecessary quotes Normalize list of checks passed to action plugin This allows users to pass either a string with comma-separated check names or a proper list of strings, whatever is more convenient in the context. For consistency, the same normalization is applied to the 'openshift_disable_check' variable.
Addresses issue #4967 For now, any version >= 3.6 is handled as if it were 3.6. We may want to keep that or fine-tune it later. Also, the ovs_version check is not updated. This is a post-install health check (does not block install/upgrade) with an update already in progress so will be addressed there.
The oc client was left out with the move away from playbook2image. However it is needed in the image for the `oc cluster up` use case for installing logging or metrics. This change adds oc via the latest signed and released client RPM, which requires adding the centos-openshift-origin repo to the image.
|
aos-ci-test |
|
[test] |
|
Evaluated for openshift ansible test up to c1f6dc8 |
|
continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_openshift_ansible/416/) (Base Commit: 24f37aa) (PR Branch Commit: c1f6dc8) |
|
tests passed except for the fedora/25/atomic test blocking. @sdodson @rhcarvalho shall we go ahead and get this merged? Needs an approval. |
|
fedora/25/atomic should no longer be blocking but I'm fine with merging it for you for expediency since the tests have all passed minus the ordering dependency between the two |
|
@sdodson cool, if you don't want to waste merge queue time on this it's fine with me. Or I can merge it the official way with an approval. |
|
[merge] |
|
Evaluated for openshift ansible merge up to c1f6dc8 |
|
continuous-integration/openshift-jenkins/merge FAILURE (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_openshift_ansible/816/) (Base Commit: 59a3eac) (PR Branch Commit: c1f6dc8) |
|
https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_openshift_ansible/816/ @sdodson @stevekuznetsov errr... what? |
|
@jupierce ^^ |
|
I've now set an approver for this branch. |
Most of what the Customer Success team is merging to master is still relevant to the 3.6 lifecycle. Here's a PR to track those changes into 3.6.1 once 3.6.0 is code complete.
Included PRs (update as they merge):