From 01475c52779172cd5d77c7d44f3795455754c94f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Thu, 15 Feb 2018 10:56:11 +0000 Subject: [PATCH] Point to Queens instead of master There are references that are pointing to master in each role. This should change them. Rally has no stable/ branches. Change-Id: I5f4fb871288534ef04e72c43c0c989be4874e95f --- defaults/main.yml | 2 +- tests/ansible-role-requirements.yml | 22 +++++++++++----------- tox.ini | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index de217e9..84fe9a3 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -26,7 +26,7 @@ rally_system_user_home: "/var/lib/{{ rally_system_user_name }}" rally_etc_directory: /etc/rally rally_git_repo: https://git.openstack.org/openstack/rally -rally_git_install_branch: master +rally_git_install_branch: "565947d453d93756ffd9c011d5ba93cdd6488754" rally_developer_mode: false rally_developer_constraints: - "git+{{ rally_git_repo }}@{{ rally_git_install_branch }}#egg=rally" diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index ddaa3ae..5b2ffee 100644 --- a/tests/ansible-role-requirements.yml +++ b/tests/ansible-role-requirements.yml @@ -1,44 +1,44 @@ - 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: 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: rabbitmq_server src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server 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: openstack_openrc src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc 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: os_keystone src: https://git.openstack.org/openstack/openstack-ansible-os_keystone scm: git - version: master + version: stable/queens diff --git a/tox.ini b/tox.ini index 9473886..0def4db 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]