diff options
author | Zuul <zuul@review.opendev.org> | 2022-05-30 16:54:08 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2022-05-30 16:54:08 +0000 |
commit | e7e0da54e03204996626b4b7edb6fff512e44326 (patch) | |
tree | e53f9d8cbad3e785b9c6acc1c786834904aa7845 | |
parent | 680b3df970a83c27dcadcf5a0b38ad83f149ed1f (diff) | |
parent | d9b6d7ca1ac267f794139e06ebaed4b8d9586fe9 (diff) | |
download | tempest-e7e0da54e03204996626b4b7edb6fff512e44326.tar.gz |
Merge "Use UPPER_CONSTRAINTS_FILE for stable/victoria testing"
-rw-r--r-- | roles/run-tempest/README.rst | 2 | ||||
-rw-r--r-- | roles/run-tempest/tasks/main.yaml | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/roles/run-tempest/README.rst b/roles/run-tempest/README.rst index 191939385..d9f855ae6 100644 --- a/roles/run-tempest/README.rst +++ b/roles/run-tempest/README.rst @@ -81,7 +81,7 @@ variable (through the `register` statement). .. zuul:rolevar:: stable_constraints_file :default: '' - Upper constraints file to be used for stable branch till stable/train. + Upper constraints file to be used for stable branch till stable/victoria. .. zuul:rolevar:: tempest_tox_environment :default: '' diff --git a/roles/run-tempest/tasks/main.yaml b/roles/run-tempest/tasks/main.yaml index 70c275b39..f302fa559 100644 --- a/roles/run-tempest/tasks/main.yaml +++ b/roles/run-tempest/tasks/main.yaml @@ -25,11 +25,11 @@ target_branch: "{{ zuul.override_checkout }}" when: zuul.override_checkout is defined -- name: Use stable branch upper-constraints till stable/ussuri +- name: Use stable branch upper-constraints till stable/victoria set_fact: # TOX_CONSTRAINTS_FILE is new name, UPPER_CONSTRAINTS_FILE is old one, best to set both tempest_tox_environment: "{{ tempest_tox_environment | combine({'UPPER_CONSTRAINTS_FILE': stable_constraints_file}) | combine({'TOX_CONSTRAINTS_FILE': stable_constraints_file}) }}" - when: target_branch in ["stable/ocata", "stable/pike", "stable/queens", "stable/rocky", "stable/stein", "stable/train", "stable/ussuri"] + when: target_branch in ["stable/ocata", "stable/pike", "stable/queens", "stable/rocky", "stable/stein", "stable/train", "stable/ussuri", "stable/victoria"] - name: Use Configured upper-constraints for non-master Tempest set_fact: @@ -79,15 +79,15 @@ when: exclude_list_stat.stat.exists - name: Tempest 26.1.0 workaround to fallback exclude-list to blacklist - # NOTE(gmann): stable/train|ussuri use Tempest 26.1.0 and with stestr 2.5.1/3.0.1 - # (beacause of upper constraints of stestr 2.5.1/3.0.1 in stable/train|ussuri) - # which does not have new args exclude-list so let's fallback to old arg - # if new arg is passed. + # NOTE(gmann): stable/train|ussuri|victoria use Tempest 26.1.0 and with + # stestr 2.5.1/3.0.1 (beacause of upper constraints of stestr 2.5.1/3.0.1 + # in stable/train|ussuri|victoria) which does not have new args exclude-list + # so let's fallback to old arg if new arg is passed. set_fact: exclude_list_option: "--blacklist-file={{ tempest_test_exclude_list|quote }}" when: - tempest_test_exclude_list is defined - - target_branch in ["stable/train", "stable/ussuri"] + - target_branch in ["stable/train", "stable/ussuri", "stable/victoria"] # TODO(kopecmartin) remove this after all consumers of the role have switched # to tempest_exclude_regex option, until then it's kept here for the backward @@ -105,19 +105,19 @@ when: - tempest_black_regex is not defined - tempest_exclude_regex is defined - - target_branch not in ["stable/train", "stable/ussuri"] + - target_branch not in ["stable/train", "stable/ussuri", "stable/victoria"] - name: Tempest 26.1.0 workaround to fallback exclude-regex to black-regex - # NOTE(gmann): stable/train|ussuri use Tempest 26.1.0 and with stestr 2.5.1/3.0.1 - # (beacause of upper constraints of stestr 2.5.1/3.0.1 in stable/train|ussuri) - # which does not have new args exclude-list so let's fallback to old arg - # if new arg is passed. + # NOTE(gmann): stable/train|ussuri|victoria use Tempest 26.1.0 and with stestr + # 2.5.1/3.0.1 (beacause of upper constraints of stestr 2.5.1/3.0.1 in + # stable/train|ussuri|victoria) which does not have new args exclude-list so + # let's fallback to old arg if new arg is passed. set_fact: tempest_test_exclude_regex: "--black-regex={{tempest_exclude_regex|quote}}" when: - tempest_black_regex is not defined - tempest_exclude_regex is defined - - target_branch in ["stable/train", "stable/ussuri"] + - target_branch in ["stable/train", "stable/ussuri", "stable/victoria"] - name: Run Tempest command: tox -e {{tox_envlist}} {{tox_extra_args}} -- {{tempest_test_regex|quote}} \ |