diff options
| author | OpenShift Bot <dmcphers+openshiftbot@redhat.com> | 2017-03-15 14:53:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 14:53:01 -0400 |
| commit | e69804c0d37329c2bf8c9c2c2c48930e34852217 (patch) | |
| tree | 6c2cfdd8c60e03e3e28f32d9b6f6575bd450f834 /playbooks/common/openshift-cluster/upgrades | |
| parent | 91ca8e8134bc0af84478125174c58f0fb2b8943c (diff) | |
| parent | 32d68afe4ab69c54a464b6fb2cc7893fd86aab2f (diff) | |
| download | openshift-e69804c0d37329c2bf8c9c2c2c48930e34852217.tar.gz openshift-e69804c0d37329c2bf8c9c2c2c48930e34852217.tar.bz2 openshift-e69804c0d37329c2bf8c9c2c2c48930e34852217.tar.xz openshift-e69804c0d37329c2bf8c9c2c2c48930e34852217.zip | |
Merge pull request #3666 from ingvagabund/dont-asume-openshift_upgrade_target-is-not-trivial
Merged by openshift-bot
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml b/playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml index 38d1cd0f8..6de1ed061 100644 --- a/playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml +++ b/playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml @@ -15,11 +15,15 @@ debug: msg: "{{ excluder }}: {{ excluder_version.stdout }}" + - name: Printing upgrade target version + debug: + msg: "{{ openshift_upgrade_target }}" + - name: Check the available {{ excluder }} version is at most of the upgrade target version fail: - msg: "Available {{ excluder }} version {{ excluder_version.stdout }} is higher than the upgrade target version {{ openshift_upgrade_target }}" + msg: "Available {{ excluder }} version {{ excluder_version.stdout }} is higher than the upgrade target version" when: - "{{ excluder_version.stdout != '' }}" - - "{{ excluder_version.stdout.split('.')[0:2] | join('.') | version_compare(openshift_upgrade_target, '>', strict=True) }}" + - "{{ excluder_version.stdout.split('.')[0:2] | join('.') | version_compare(openshift_upgrade_target.split('.')[0:2] | join('.'), '>', strict=True) }}" when: - not openshift.common.is_atomic | bool |