Merge "Point to Queens instead of master" into stable/queens

This commit is contained in:
Zuul 2018-02-15 15:40:04 +00:00 committed by Gerrit Code Review
commit 869bdc3745
4 changed files with 16 additions and 15 deletions

View File

@ -2,3 +2,4 @@
host=review.openstack.org
port=29418
project=openstack/openstack-ansible-os_congress.git
defaultbranch=stable/queens

View File

@ -23,7 +23,7 @@ congress_package_state: "latest"
## Git repositories and their branches
congress_git_repo: https://git.openstack.org/openstack/congress
congress_git_install_branch: master
congress_git_install_branch: "stable/queens"
congress_developer_mode: false
congress_developer_constraints:
- "git+{{ congress_git_repo }}@{{ congress_git_install_branch }}#egg=congress"

View File

@ -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: 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

View File

@ -7,7 +7,7 @@ envlist = docs,linters,functional
[testenv]
usedevelop = True
install_command =
pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens} {opts} {packages}
deps =
-r{toxinidir}/test-requirements.txt
commands =
@ -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]