From 4bc249d5407e5393ac8985b7cf62545b8c9f383f Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Tue, 23 Apr 2024 23:27:41 -0500 Subject: [PATCH] Add env variables to deploy from Helm repos These env variables will be defined in test jobs. By default we will deploy from local charts but some jobs will deploy from charts published on a HTTP server (local or public). - OSH_HELM_REPO - OSH_INFRA_HELM_REPO - DOWNLOAD_OVERRIDES Change-Id: Ic92b97eb5df4f7f8c4185c06654de4b4d890fbc6 --- roles/osh-run-script-set/tasks/main.yaml | 3 +++ roles/osh-run-script/tasks/main.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/roles/osh-run-script-set/tasks/main.yaml b/roles/osh-run-script-set/tasks/main.yaml index e931e59ec..8e282fa9d 100644 --- a/roles/osh-run-script-set/tasks/main.yaml +++ b/roles/osh-run-script-set/tasks/main.yaml @@ -28,6 +28,9 @@ POD_NETWORK_CIDR: "{{ kubeadm.pod_network_cidr }}" zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" + OSH_HELM_REPO: "{{ osh_helm_repo | default('../openstack-helm/') }}" + OSH_INFRA_HELM_REPO: "{{ osh_infra_helm_repo | default('../openstack-helm-infra/') }}" + DOWNLOAD_OVERRIDES: "{{ download_overrides | default('') }}" OSH_PATH: "{{ zuul_osh_relative_path | default('../openstack-helm/') }}" OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('../openstack-helm-infra/') }}" OPENSTACK_RELEASE: "{{ osh_params.openstack_release | default('') }}" diff --git a/roles/osh-run-script/tasks/main.yaml b/roles/osh-run-script/tasks/main.yaml index b3ed24a7b..a874f2be8 100644 --- a/roles/osh-run-script/tasks/main.yaml +++ b/roles/osh-run-script/tasks/main.yaml @@ -25,6 +25,9 @@ POD_NETWORK_CIDR: "{{ kubeadm.pod_network_cidr }}" zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" + OSH_HELM_REPO: "{{ osh_helm_repo | default('../openstack-helm') }}" + OSH_INFRA_HELM_REPO: "{{ osh_infra_helm_repo | default('../openstack-helm-infra') }}" + DOWNLOAD_OVERRIDES: "{{ download_overrides | default('') }}" OSH_PATH: "{{ zuul_osh_relative_path | default('../openstack-helm/') }}" OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('../openstack-helm-infra/') }}" OPENSTACK_RELEASE: "{{ osh_params.openstack_release | default('') }}"