diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-25 13:10:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-25 13:10:34 -0400 |
| commit | e16cd3f4d3ea202adb1a5e081118525280ab17a0 (patch) | |
| tree | 7ec1f7da8ed4ed7c935b561fa4d3b9b3b11e8a03 | |
| parent | 2b07b98262d7bacdb52fc08c0108c4c4b113ff5c (diff) | |
| parent | c5a25871eb5ffaee787ed3f5956b4eb8affbb82a (diff) | |
| download | openshift-e16cd3f4d3ea202adb1a5e081118525280ab17a0.tar.gz openshift-e16cd3f4d3ea202adb1a5e081118525280ab17a0.tar.bz2 openshift-e16cd3f4d3ea202adb1a5e081118525280ab17a0.tar.xz openshift-e16cd3f4d3ea202adb1a5e081118525280ab17a0.zip | |
Merge pull request #5200 from ashcrow/new-pre-release-image-tag-validation
openshift_version: enterprise accepts new style pre-release
| -rw-r--r-- | roles/openshift_version/tasks/main.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/roles/openshift_version/tasks/main.yml b/roles/openshift_version/tasks/main.yml index a6b8a40c8..c0ea00f34 100644 --- a/roles/openshift_version/tasks/main.yml +++ b/roles/openshift_version/tasks/main.yml @@ -60,13 +60,16 @@ # It also allows for optional trailing data which: # - must start with a dash # - may contain numbers + # - may containe dots (https://github.com/openshift/openshift-ansible/issues/5192) + # - name: (Enterprise) Verify openshift_image_tag is valid when: openshift.common.deployment_type == 'openshift-enterprise' assert: that: - - "{{ openshift_image_tag|match('(^v\\d+\\.\\d+[\\.\\d+]*(-\\d+)?$)') }}" + - "{{ openshift_image_tag|match('(^v\\d+\\.\\d+(\\.\\d+)*(-\\d+(\\.\\d+)*)?$)') }}" msg: |- - openshift_image_tag must be in the format v#.#[.#[.#]]. Examples: v1.2, v3.4.1, v3.5.1.3, v1.2-1, v1.2.3-4 + openshift_image_tag must be in the format v#.#[.#[.#]]. Examples: v1.2, v3.4.1, v3.5.1.3, + v3.5.1.3.4, v1.2-1, v1.2.3-4, v1.2.3-4.5, v1.2.3-4.5.6 You specified openshift_image_tag={{ openshift_image_tag }} # Make sure we copy this to a fact if given a var: |