Make a "test_branch" variable set to master

To avoid having to change each variable per release we can create a
single "test_branch" variable.

Additionally, when creating the "local-repo-packages.txt" constraints
file, we should use the "test_branch" variable to scope the constraints
file per release. This way upgrade jobs will continue to upgrade
correctly from the previous release's upstream project.

Change-Id: Ie9176fb561d0ef53051d1a39b5fb38dd30fb45bb

test-repo-setup.yml

@@ -29,7 +29,7 @@
       register: projects_directory_find
     - name: Set var for git install branch
       copy:
-        dest: "{{ development_repo_directory }}/local-package-constraints.txt"
+        dest: "{{ development_repo_directory }}/local-package-constraints-{{ test_branch | replace('/','_') }}.txt"
         content: |
           ## Ansible Managed
           {% if projects_directory_find.files is defined %}

test-vars.yml

@@ -18,6 +18,7 @@
 external_lb_vip_address: 127.0.0.1
 internal_lb_vip_address: 127.0.0.1
 debug: true
+test_branch: master
 
 ## Container destruction when testing repeatedly
 force_containers_destroy: True
@@ -119,7 +120,7 @@ keystone_galera_address: "{{ test_galera_host }}"
 keystone_container_mysql_password: "SuperSecrete"
 keystone_venv_tag: "testing"
 keystone_developer_mode: true
-keystone_git_install_branch: master
+keystone_git_install_branch: "{{ test_branch }}"
 keystone_service_region: RegionOne
 
 # Glance specific settings
@@ -135,7 +136,7 @@ glance_container_mysql_password: "SuperSecrete"
 glance_developer_mode: true
 glance_galera_address: "{{ test_galera_host }}"
 glance_galera_database: glance
-glance_git_install_branch: master
+glance_git_install_branch: "{{ test_branch }}"
 glance_profiler_hmac_key: "secrete"
 glance_rabbitmq_password: "{{ rabbitmq_password }}"
 glance_rabbitmq_port:  "{{ rabbitmq_port }}"
@@ -214,7 +215,7 @@ neutron_container_mysql_password: SuperSecrete
 neutron_developer_mode: true
 neutron_galera_address: "{{ test_galera_host }}"
 neutron_galera_database: neutron
-neutron_git_install_branch: master
+neutron_git_install_branch: "{{ test_branch }}"
 neutron_ha_vrrp_auth_password: secrete
 neutron_management_address: "{{ test_neutron_server_host }}"
 neutron_rabbitmq_password: "{{ rabbitmq_password }}"
@@ -245,7 +246,7 @@ cinder_ceph_client: cinder
 cinder_container_mysql_password: "SuperSecrete"
 cinder_developer_mode: true
 cinder_galera_address: "{{ test_galera_host }}"
-cinder_git_install_branch: master
+cinder_git_install_branch: "{{ test_branch }}"
 cinder_glance_api_servers: "{{ glance_api_servers }}"
 cinder_profiler_hmac_key: "secrete"
 cinder_rabbitmq_port: "{{ rabbitmq_port }}"
@@ -288,7 +289,7 @@ swift_hash_path_prefix: "secrete_prefx"
 swift_hash_path_suffix: "secrete_suffix"
 swift_service_password: "secrete"
 swift_developer_mode: true
-swift_git_install_branch: master
+swift_git_install_branch: "{{ test_branch }}"
 swift_venv_tag: untagged
 swift_venv_bin: "/openstack/venvs/swift-{{ swift_venv_tag }}/bin"
 swift_service_publicuri: "http://{{ test_swift_proxy_host }}:8080"
@@ -317,7 +318,7 @@ swift_proxy_server_conf_overrides:
 # Heat specific settings
 heat_venv_tag: "testing"
 heat_developer_mode: True
-heat_git_install_branch: master
+heat_git_install_branch: "{{ test_branch }}"
 heat_service_password: secrete
 heat_stack_domain_admin_password: secrete
 heat_auth_encryption_key: 32characterslongboguskeyvaluefoo
@@ -345,7 +346,7 @@ gnocchi_ssl_external: false
 # Ironic specific settings
 ironic_venv_tag: "testing"
 ironic_developer_mode: True
-ironic_git_install_branch: master
+ironic_git_install_branch: "{{ test_branch }}"
 ironic_service_publicuri: "http://{{ test_ironic_api_host }}:6385"
 ironic_service_publicurl: "{{ ironic_service_publicuri }}"
 ironic_service_adminuri: "http://{{ test_ironic_api_host }}:6385"
@@ -372,7 +373,7 @@ ironic_keystone_auth_plugin: password
 # Sahara vars
 sahara_venv_tag: "testing"
 sahara_developer_mode: true
-sahara_git_install_branch: master
+sahara_git_install_branch: "{{ test_branch }}"
 sahara_service_password: "secrete"
 sahara_galera_address: "{{ test_galera_host }}"
 sahara_galera_database: sahara
@@ -396,8 +397,8 @@ sahara_bin: "/openstack/venvs/sahara-{{ sahara_venv_tag }}/bin"
 # Horizon Settings
 horizon_developer_mode: true
 horizon_venv_tag: "testing"
-horizon_git_install_branch: master
-horizon_requirements_git_install_branch: master
+horizon_git_install_branch: "{{ test_branch }}"
+horizon_requirements_git_install_branch: "{{ test_branch }}"
 horizon_galera_address: "{{ test_galera_host }}"
 horizon_galera_database: dash
 horizon_galera_user: dash
@@ -410,7 +411,7 @@ horizon_external_ssl: False
 
 # Tempest specific settings
 tempest_developer_mode: True
-tempest_git_install_branch: master
+tempest_git_install_branch: "{{ test_branch }}"
 tempest_venv_tag: "{{ tempest_git_install_branch }}"
 # tempest_venv_bin is the same as the default in os_tempest role, but we set
 # it again here so we can refer to it in test-nova-functional.yml
@@ -464,11 +465,11 @@ swift_proxy_server_workers: 2
 pip_install_options: "--no-binary libvirt-python"
 
 # The URL/path of a constraints file to use when installing the additional pip packages.
-pip_install_upper_constraints: "http://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.txt --constraint http://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt"
+pip_install_upper_constraints: "http://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.txt?h={{ test_branch }} --constraint http://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h={{ test_branch }}"
 
 # Overriding the developer_constraints allows us to install from local disk as a precedence
 # if the repo is present.
-pip_install_developer_constraints: "--constraint {{ development_repo_directory }}/local-package-constraints.txt --constraint /opt/developer-pip-constraints.txt"
+pip_install_developer_constraints: "--constraint {{ development_repo_directory }}/local-package-constraints-{{ test_branch | replace('/','_') }}.txt --constraint /opt/developer-pip-constraints.txt"
 
 # As role tests are executed in temporary environments, we don't need
 # to always fetch the latest get-pip.py script