From 9e9249c5cb815ec8089ab13571c270dadc62aaa6 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Thu, 9 Jul 2020 12:23:03 +0200 Subject: [PATCH] Add git_url_root to override root for all repositories at once Change-Id: I588fe1cb625683efa6c1e4f21b6c84a098230954 --- .../bifrost-create-vm-nodes/defaults/main.yml | 3 ++- .../roles/bifrost-prep-for-install/README.md | 11 +++++--- .../defaults/main.yml | 25 ++++++++++--------- playbooks/test-bifrost-create-vm.yaml | 2 +- playbooks/test-bifrost.yaml | 13 +--------- .../notes/git-url-root-c81478d395f66e46.yaml | 6 +++++ 6 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 releasenotes/notes/git-url-root-c81478d395f66e46.yaml diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/main.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/main.yml index e58dc39d7..f4c43994e 100644 --- a/playbooks/roles/bifrost-create-vm-nodes/defaults/main.yml +++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/main.yml @@ -43,7 +43,8 @@ bifrost_venv_env: git_branch: master git_root: "/opt/stack" -reqs_git_url: https://opendev.org/openstack/requirements +git_url_root: https://opendev.org +reqs_git_url: "{{ git_url_root }}/openstack/requirements" reqs_git_folder: "{{ git_root }}/requirements" reqs_git_branch: "{{ git_branch }}" upper_constraints_file: "{{ lookup('env', 'UPPER_CONSTRAINTS_FILE') | default(reqs_git_folder + '/upper-constraints.txt', True) }}" diff --git a/playbooks/roles/bifrost-prep-for-install/README.md b/playbooks/roles/bifrost-prep-for-install/README.md index a793a4c51..681a25585 100644 --- a/playbooks/roles/bifrost-prep-for-install/README.md +++ b/playbooks/roles/bifrost-prep-for-install/README.md @@ -22,17 +22,20 @@ Role Variables git_root: The base location for cloned git repositories. This defaults to "/opt/stack". +git_url_root: The base URL for remote git repositories. Defaults to + https://opendev.org + ironicclient_git_url: URL for ironicclient, defaults to: - https://opendev.org/openstack/python-ironicclient + {{ git_url_root }}/openstack/python-ironicclient openstacksdk_git_url: URL for openstacksdk, defaults to: - https://opendev.org/openstack/openstacksdk + {{ git_url_root }}/openstack/openstacksdk ironic_git_url: URL for ironic, defaults to: - https://opendev.org/openstack/ironic + {{ git_url_root }}/openstack/ironic sushy_git_url: URL for sushy, defaults to: - https://opendev.org/openstack/sushy + {{ git_url_root }}/openstack/sushy ironicclient_git_folder: The folder to clone ironicclient to if missing, defaults to: "{{ git_root}}/ironicclient.git" diff --git a/playbooks/roles/bifrost-prep-for-install/defaults/main.yml b/playbooks/roles/bifrost-prep-for-install/defaults/main.yml index 1fb943f7b..ca6e19618 100644 --- a/playbooks/roles/bifrost-prep-for-install/defaults/main.yml +++ b/playbooks/roles/bifrost-prep-for-install/defaults/main.yml @@ -2,18 +2,19 @@ # git_root is the folder where to place downloaded git repos git_root: "/opt/stack" # *_git_url can be overridden by local clones for offline installs -dib_git_url: https://opendev.org/openstack/diskimage-builder -ironicclient_git_url: https://opendev.org/openstack/python-ironicclient -openstacksdk_git_url: https://opendev.org/openstack/openstacksdk -ironic_git_url: https://opendev.org/openstack/ironic -ironicinspector_git_url: https://opendev.org/openstack/ironic-inspector -ironicinspectorclient_git_url: https://opendev.org/openstack/python-ironic-inspector-client -reqs_git_url: https://opendev.org/openstack/requirements -staging_drivers_git_url: https://opendev.org/x/ironic-staging-drivers -keystone_git_url: https://opendev.org/openstack/keystone -sushy_git_url: https://opendev.org/openstack/sushy -ipa_git_url: https://opendev.org/openstack/ironic-python-agent -ipa_builder_git_url: https://opendev.org/openstack/ironic-python-agent-builder +git_url_root: https://opendev.org +dib_git_url: "{{ git_url_root }}/openstack/diskimage-builder" +ironicclient_git_url: "{{ git_url_root }}/openstack/python-ironicclient" +openstacksdk_git_url: "{{ git_url_root }}/openstack/openstacksdk" +ironic_git_url: "{{ git_url_root }}/openstack/ironic" +ironicinspector_git_url: "{{ git_url_root }}/openstack/ironic-inspector" +ironicinspectorclient_git_url: "{{ git_url_root }}/openstack/python-ironic-inspector-client" +reqs_git_url: "{{ git_url_root }}/openstack/requirements" +staging_drivers_git_url: "{{ git_url_root }}/x/ironic-staging-drivers" +keystone_git_url: "{{ git_url_root }}/openstack/keystone" +sushy_git_url: "{{ git_url_root }}/openstack/sushy" +ipa_git_url: "{{ git_url_root }}/openstack/ironic-python-agent" +ipa_builder_git_url: "{{ git_url_root }}/openstack/ironic-python-agent-builder" # *_git_folder can be overridden by local clones for offline installs ironicclient_git_folder: "{{ git_root}}/python-ironicclient" ironic_git_folder: "{{ git_root}}/ironic" diff --git a/playbooks/test-bifrost-create-vm.yaml b/playbooks/test-bifrost-create-vm.yaml index 65ced2d11..bcfcc243c 100644 --- a/playbooks/test-bifrost-create-vm.yaml +++ b/playbooks/test-bifrost-create-vm.yaml @@ -25,7 +25,7 @@ set_fact: ci_testing: true copy_from_local_path: true - reqs_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/requirements" + git_url_root: "{{ lookup('env', 'WORKSPACE') }}" when: lookup('env', 'ZUUL_BRANCH') | length > 0 - name: "Collect process list if running in OpenStack CI" command: ps aux diff --git a/playbooks/test-bifrost.yaml b/playbooks/test-bifrost.yaml index 7ec82e278..71d2fa459 100644 --- a/playbooks/test-bifrost.yaml +++ b/playbooks/test-bifrost.yaml @@ -16,18 +16,7 @@ set_fact: ci_testing: true copy_from_local_path: true - ironic_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/ironic" - ironicclient_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/python-ironicclient" - openstacksdk_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/openstacksdk" - dib_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/diskimage-builder" - ironicinspector_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/ironic-inspector" - ironicinspectorclient_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/python-ironic-inspector-client" - keystone_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/keystone" - sushy_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/sushy" - reqs_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/requirements" - staging_drivers_git_url: "{{ lookup('env', 'WORKSPACE') }}/x/ironic-staging-drivers" - ipa_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/ironic-python-agent" - ipa_builder_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/ironic-python-agent-builder" + git_url_root: "{{ lookup('env', 'WORKSPACE') }}" when: lookup('env', 'ZUUL_BRANCH') | length > 0 - name: "Override the ipv4_gateway setting" set_fact: diff --git a/releasenotes/notes/git-url-root-c81478d395f66e46.yaml b/releasenotes/notes/git-url-root-c81478d395f66e46.yaml new file mode 100644 index 000000000..47519a3cb --- /dev/null +++ b/releasenotes/notes/git-url-root-c81478d395f66e46.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + The new variable ``git_url_root`` allows overriding the root URL for all + repositories (e.g. changing the default ``https://opendev.org`` to + a local path).