diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-05-31 13:38:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-31 13:38:43 +0200 |
| commit | 66914e1a0bc19613e2692b94ef742385fc82a405 (patch) | |
| tree | e1df7f7d5dd7778d902713324bbee56e95e6b25b | |
| parent | ce90c55beba2e0b0e72945f99cca0ed60e1fe0a3 (diff) | |
| parent | 0e5b74942ce916f2b9bf96ad298b3bdbbf97a230 (diff) | |
| download | openshift-66914e1a0bc19613e2692b94ef742385fc82a405.tar.gz openshift-66914e1a0bc19613e2692b94ef742385fc82a405.tar.bz2 openshift-66914e1a0bc19613e2692b94ef742385fc82a405.tar.xz openshift-66914e1a0bc19613e2692b94ef742385fc82a405.zip | |
Merge pull request #4225 from ingvagabund/relax-rpm-image-version-check
relax check for rpm version and docker image version equality
| -rw-r--r-- | roles/openshift_version/tasks/main.yml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml index b35a3fa3c..16792388f 100644 --- a/roles/openshift_version/tasks/main.yml +++ b/roles/openshift_version/tasks/main.yml @@ -30,7 +30,8 @@ - set_fact: openshift_release: "{{ openshift_release | string }}" - when: openshift_release is defined + when: + - openshift_release is defined # Verify that the image tag is in a valid format - when: @@ -106,7 +107,11 @@ fail: msg: "OCP rpm version {{ openshift_rpm_version }} is different from OCP image version {{ openshift_version }}" # Both versions have the same string representation - when: openshift_rpm_version != openshift_version + when: + - openshift_rpm_version != openshift_version + # if openshift_pkg_version or openshift_image_tag is defined, user gives a permission the rpm and docker image versions can differ + - openshift_pkg_version is not defined + - openshift_image_tag is not defined when: - is_containerized | bool - not is_atomic | bool |