Merge "Add git_branch variable"

This commit is contained in:
Zuul 2019-04-01 15:52:32 +00:00 committed by Gerrit Code Review
commit cfff02ed66
2 changed files with 34 additions and 18 deletions

View File

@ -25,6 +25,9 @@ git_root: The base location for cloned git repositories. This defaults to
ironicclient_git_url: URL for ironicclient, defaults to:
https://git.openstack.org/openstack/python-ironicclient
openstacksdk_git_url: URL for openstacksdk, defaults to:
https://git.openstack.org/openstack/openstacksdk
shade_git_url: URL for shade, defaults to:
https://git.openstack.org/openstack-infra/shade
@ -37,26 +40,38 @@ ironicclient_git_folder: The folder to clone ironicclient to if missing,
ironic_git_folder: The folder to clone ironic to if missing, default to:
"{{ git_root}}/ironic.git"
openstacksdk_git_folder: The folder to clone openstacksdk to if missing,
defaults to: "{{ git_root}}/openstacksdk.git"
shade_git_folder: The folder to clone shade to if missing, defaults to:
"{{ git_root}}/shade.git"
ironicclient_git_branch: Branch to install, defaults to "master".
git_branch: Default branch to install, defaults to "master".
ironic_git_branch: Branch to install, defaults to "master".
ironicclient_git_branch: Branch to install, defaults to the value of
git_branch.
shade_git_branch: Branch to install, defaults to "master".
ironic_git_branch: Branch to install, defaults to the value of git_branch.
openstacksdk_git_branch: Branch to install, defaults to the value of
git_branch.
shade_git_branch: Branch to install, defaults to the value of git_branch.
dib_git_branch: Branch to install, defaults to "master".
ironicinspector_git_branch: Branch to install, defaults to "master".
ironicinspector_git_branch: Branch to install, defaults to the value of
git_branch.
ironicinspectorclient_git_branch: Branch to install, defaults to "master".
ironicinspectorclient_git_branch: Branch to install, defaults to
the value of git_branch.
reqs_git_branch: Branch to install, defaults to "master".
reqs_git_branch: Branch to install, defaults to the value of git_branch.
staging_drivers_git_branch: Branch to install, defaults to "master".
staging_drivers_git_branch: Branch to install, defaults to the value of
git_branch.
keystone_git_branch: Branch to install, defaults to "master".
keystone_git_branch: Branch to install, defaults to the value of git_branch.
copy_from_local_path: Boolean value, defaults to false. If set to true,
the role will attempt to perform a filesystem copy of

View File

@ -24,17 +24,18 @@ reqs_git_folder: "{{ git_root }}/requirements"
upper_constraints_file: "{{ lookup('env', 'UPPER_CONSTRAINTS_FILE') | default(reqs_git_folder + '/upper-constraints.txt', True) }}"
staging_drivers_git_folder: "{{ git_root }}/ironic-staging-drivers"
keystone_git_folder: "{{ git_root}}/keystone"
# *_git_branch can be overridden for stable branch testing
ironicclient_git_branch: master
ironic_git_branch: master
openstacksdk_git_branch: master
shade_git_branch: master
# *git_branch can be overridden for stable branch testing
git_branch: master
ironicclient_git_branch: "{{ git_branch }}"
ironic_git_branch: "{{ git_branch }}"
openstacksdk_git_branch: "{{ git_branch }}"
shade_git_branch: "{{ git_branch }}"
dib_git_branch: master
ironicinspector_git_branch: master
ironicinspectorclient_git_branch: master
reqs_git_branch: master
staging_drivers_git_branch: master
keystone_git_branch: master
ironicinspector_git_branch: "{{ git_branch }}"
ironicinspectorclient_git_branch: "{{ git_branch }}"
reqs_git_branch: "{{ git_branch }}"
staging_drivers_git_branch: "{{ git_branch }}"
keystone_git_branch: "{{ git_branch }}"
# Conditional variables utilized based on CI or manual testing options.
copy_from_local_path: false