From b39a432e0402d2e35501f1999a9d2334f94e1df6 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Thu, 5 May 2016 09:55:15 -0700 Subject: [PATCH] Use master git branches when testing In the test vars, change the barbican, keystone, and requirements git install branches to master for consistency with other roles. Change-Id: Id12f601334a4c696970f77daf50fb46931d71776 --- other-requirements.txt | 4 ++++ tests/test-vars.yml | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/other-requirements.txt b/other-requirements.txt index 11dcac9..a57dc98 100644 --- a/other-requirements.txt +++ b/other-requirements.txt @@ -9,3 +9,7 @@ # is better to have this file empty, otherwise OpenStack-CI # will fall back to installing its default packages which # will potentially be detrimental to the tests executed. + +# Requirements for Paramiko 2.0 +libssl-dev +libffi-dev diff --git a/tests/test-vars.yml b/tests/test-vars.yml index d05fa61..74ab349 100644 --- a/tests/test-vars.yml +++ b/tests/test-vars.yml @@ -11,14 +11,14 @@ keystone_container_mysql_password: SuperSecrete keystone_developer_mode: true keystone_galera_address: 10.100.100.2 keystone_galera_database: keystone -keystone_git_install_branch: stable/mitaka +keystone_git_install_branch: master keystone_rabbitmq_password: secrete keystone_rabbitmq_port: 5671 keystone_rabbitmq_servers: 10.100.100.2 keystone_rabbitmq_use_ssl: false keystone_rabbitmq_userid: keystone keystone_rabbitmq_vhost: /keystone -keystone_requirements_git_install_branch: stable/mitaka +keystone_requirements_git_install_branch: master keystone_service_adminuri: "http://{{ internal_lb_vip_address }}:35357" keystone_service_adminuri_insecure: false keystone_service_adminurl: "{{ keystone_service_adminuri }}/v3" @@ -34,11 +34,11 @@ barbican_galera_password: SuperSecrete barbican_developer_mode: true barbican_galera_address: 10.100.100.2 barbican_galera_database: barbican -barbican_git_install_branch: stable/mitaka +barbican_git_install_branch: master barbican_rabbitmq_password: secrete barbican_rabbitmq_userid: barbican barbican_rabbitmq_vhost: /barbican -barbican_requirements_git_install_branch: stable/mitaka +barbican_requirements_git_install_branch: master barbican_service_password: secrete barbican_venv_tag: testing openrc_os_auth_url: "http://127.0.0.1:5000/v3"