From 50b363b3706e1c23d5943d24d4dad80f78f55683 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Thu, 15 Feb 2018 10:23:18 +0000 Subject: [PATCH] Point to Queens instead of master There are references that are pointing to master in each role. This should change them. Designate tempest plugin's branch is master. Change-Id: Iff475fcf998adbdb9f68903d3806fa663f0ce3d7 --- defaults/main.yml | 2 +- tests/ansible-role-requirements.yml | 24 ++++++++++++------------ tox.ini | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 41c7a48..0546686 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -23,7 +23,7 @@ designate_pip_package_state: "latest" ## The git source/branch designate_git_repo: https://git.openstack.org/openstack/designate -designate_git_install_branch: master +designate_git_install_branch: "stable/queens" # Developer mode is used for role functional testing and allows the role # to build an environment directly from a git source without the presence diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index aec99d9..674de3c 100644 --- a/tests/ansible-role-requirements.yml +++ b/tests/ansible-role-requirements.yml @@ -1,48 +1,48 @@ - name: apt_package_pinning src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning scm: git - version: master + version: stable/queens - name: pip_install src: https://git.openstack.org/openstack/openstack-ansible-pip_install scm: git - version: master + version: stable/queens - name: memcached_server src: https://git.openstack.org/openstack/openstack-ansible-memcached_server scm: git - version: master + version: stable/queens - name: openstack_hosts src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts scm: git - version: master + version: stable/queens - name: lxc_hosts src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts scm: git - version: master + version: stable/queens - name: lxc_container_create src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create scm: git - version: master + version: stable/queens - name: galera_client src: https://git.openstack.org/openstack/openstack-ansible-galera_client scm: git - version: master + version: stable/queens - name: galera_server src: https://git.openstack.org/openstack/openstack-ansible-galera_server scm: git - version: master + version: stable/queens - name: rabbitmq_server src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server scm: git - version: master + version: stable/queens - name: os_keystone src: https://git.openstack.org/openstack/openstack-ansible-os_keystone scm: git - version: master + version: stable/queens - name: openstack_openrc src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc scm: git - version: master + version: stable/queens - name: os_tempest src: https://git.openstack.org/openstack/openstack-ansible-os_tempest scm: git - version: master + version: stable/queens diff --git a/tox.ini b/tox.ini index 73979e0..28e614d 100644 --- a/tox.ini +++ b/tox.ini @@ -75,8 +75,8 @@ commands = [testenv:ansible] deps = {[testenv]deps} - -rhttps://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.txt - -rhttps://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt + -rhttps://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.txt?h=stable/queens + -rhttps://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h=stable/queens [testenv:ansible-syntax]