From fbf0aac850ee23c0a1bc6af8c9d2d6eb704911a8 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 3 Nov 2017 11:28:24 +0000 Subject: [PATCH] Allow role defaults to determine the branch tested Currently there's an override in place to make the tests use the master branch. This becomes a pain when master becomes a stable branch because this override is out of the norm, so it gets forgotten. The override is not necessary - we can just use the values from the role defaults instead. Change-Id: I9852ed94f51df494cf49e53b8aadf71b42ceac27 --- tests/os_aodh-overrides.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/os_aodh-overrides.yml b/tests/os_aodh-overrides.yml index 0a663cf..d7013d1 100644 --- a/tests/os_aodh-overrides.yml +++ b/tests/os_aodh-overrides.yml @@ -22,8 +22,6 @@ aodh_rabbitmq_userid: aodh aodh_rabbitmq_vhost: /aodh aodh_venv_tag: "testing" aodh_developer_mode: true -aodh_git_install_branch: master -aodh_requirements_git_install_branch: master aodh_service_password: "secrete" aodh_service_publicuri: "{{ aodh_service_proto }}://{{ hostvars[groups['aodh_all'][0]]['ansible_host'] }}:{{ aodh_service_port }}" aodh_service_internaluri: "{{ aodh_service_proto }}://{{ hostvars[groups['aodh_all'][0]]['ansible_host'] }}:{{ aodh_service_port }}"