From a3a71b919c9bfd71972911c6ab88b5522512233e Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 14 Jun 2019 14:28:46 +0100 Subject: [PATCH] Restrict cliff to <2.15.0 Using Kayobe with cliff 2.15.0 fails with the following error: kayobe playbook run playbook.yml invalid conflict_resolution value: 'ignore' This change restricts cliff to <2.15.0. Also, fix git cloning previous release repos in CI to allow this patch to merge. Zuul provides repositories with all branches containing all prospective changes, not just the current branch. We can use this in the upgrade jobs to include changes to the previous release branch when a patch depends on them. Change-Id: I7966cf33f6133090d83232504b8c1da4c7817e0c Depends-On: https://review.opendev.org/665703/ Story: 2005891 Task: 33748 --- playbooks/kayobe-overcloud-upgrade-base/pre.yml | 12 ++++-------- playbooks/kayobe-seed-upgrade-base/pre.yml | 12 ++++-------- requirements.txt | 2 +- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/playbooks/kayobe-overcloud-upgrade-base/pre.yml b/playbooks/kayobe-overcloud-upgrade-base/pre.yml index 0d188107a..8370ae461 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/pre.yml +++ b/playbooks/kayobe-overcloud-upgrade-base/pre.yml @@ -7,10 +7,8 @@ state: directory - name: Ensure previous kayobe repository is cloned - git: - repo: https://opendev.org/x/kayobe - dest: "{{ previous_kayobe_src_dir }}" - version: "stable/{{ previous_release | lower }}" + command: >- + git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b stable/{{ previous_release | lower }} - name: Ensure previous kayobe-config directory exists file: @@ -18,10 +16,8 @@ state: directory - name: Ensure kayobe-config repository is cloned - git: - repo: https://opendev.org/x/kayobe-config-dev - dest: "{{ previous_kayobe_config_src_dir }}" - version: "stable/{{ previous_release | lower }}" + command: >- + git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b stable/{{ previous_release | lower }} # NOTE(mgoddard): Use the name zz-overrides.yml to ensure this takes # precedence over the standard config files. diff --git a/playbooks/kayobe-seed-upgrade-base/pre.yml b/playbooks/kayobe-seed-upgrade-base/pre.yml index 9effcf5aa..c21aac0cd 100644 --- a/playbooks/kayobe-seed-upgrade-base/pre.yml +++ b/playbooks/kayobe-seed-upgrade-base/pre.yml @@ -7,10 +7,8 @@ state: directory - name: Ensure previous kayobe repository is cloned - git: - repo: https://opendev.org/x/kayobe - dest: "{{ previous_kayobe_src_dir }}" - version: "stable/{{ previous_release | lower }}" + command: >- + git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b stable/{{ previous_release | lower }} - name: Ensure previous kayobe-config directory exists file: @@ -18,10 +16,8 @@ state: directory - name: Ensure kayobe-config repository is cloned - git: - repo: https://opendev.org/x/kayobe-config-dev - dest: "{{ previous_kayobe_config_src_dir }}" - version: "stable/{{ previous_release | lower }}" + command: >- + git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b stable/{{ previous_release | lower }} # NOTE(mgoddard): Use the name zz-overrides.yml to ensure this takes # precedence over the standard config files. diff --git a/requirements.txt b/requirements.txt index 77383e83a..04f23d7bb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ pbr>=2.0 # Apache-2.0 # line and commenting the one after. # -e git+https://github.com/stackhpc/ansible@issue-30350-2.3#egg=ansible-issue-30350-2.3 # GPLv3 ansible>=2.4.0,<2.7.0 # GPLv3 -cliff>=2.5.0 # Apache +cliff>=2.5.0,<2.15.0 # Apache netaddr!=0.7.16,>=0.7.13 # BSD PyYAML>=3.10.0 # MIT setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,>=16.0 # PSF/ZPL