From 677633861d20da40a62ed5f17783a6ee237baa7f Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 23 Aug 2017 13:12:19 +0100 Subject: [PATCH] Update upgrade role for Queens from P This changes the a-r-r with the proper version, and fixes the repo path for role upgrades: The role will, during test-upgrade-pre, have its current branch checked out, and will deploy the current branch infrastructure, including the generation of the constraints. Then, the installation of previous branch of the role will use the constraints for its previous version, but will have no constraints for it, and fail. We need to generate the constraints for the previous version too. This should do it. Co-Authored-By: Jean-Philippe Evrard Change-Id: I8305fce3ea5b6446692d15c642eccd798164f266 --- tests/ansible-role-requirements.yml | 2 +- tests/test-upgrade-pre.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index 6fc75a61..b2233b68 100644 --- a/tests/ansible-role-requirements.yml +++ b/tests/ansible-role-requirements.yml @@ -45,7 +45,7 @@ - name: os_previous_keystone src: https://git.openstack.org/openstack/openstack-ansible-os_keystone scm: git - version: stable/ocata + version: stable/pike - name: os_tempest src: https://git.openstack.org/openstack/openstack-ansible-os_tempest scm: git diff --git a/tests/test-upgrade-pre.yml b/tests/test-upgrade-pre.yml index 29e8043b..f44a8186 100644 --- a/tests/test-upgrade-pre.yml +++ b/tests/test-upgrade-pre.yml @@ -31,5 +31,8 @@ # Install RabbitMQ/MariaDB - include: common/test-install-infra.yml +# Ensure the repo is setup for previous version +- include: common/previous/test-repo-setup.yml + # Install previous Keystone - include: test-install-previous-keystone.yml