Preparation for osh-infra merger

Change-Id: I9dbc4198bfc76e98a78cc6d1a052c8e93ea56613
2025-03-24 21:29:42 +00:00 · 2025-03-24 21:29:42 +00:00 · 4cdefc50bb
commit 4cdefc50bb
parent 5dbf259d40
12 changed files with 80 additions and 264 deletions
--- a/.gitignore
+++ b/.gitignore
@ -84,6 +84,9 @@ celerybeat-schedule
 # dotenv
 .env

+# devcontainer
+.devcontainer
+
 # virtualenv
 .venv
 venv/
--- a/.zuul.yaml
+++ b/.zuul.yaml
@ -101,11 +101,11 @@
    name: deckhand-base
    abstract: true
    roles:
-      - zuul: openstack/openstack-helm-infra
+      - zuul: airship/kubernetes-entrypoint
+      - zuul: openstack/openstack-helm
      - zuul: zuul/zuul-jobs
    required-projects:
      - name: openstack/openstack-helm
-      - name: openstack/openstack-helm-infra
      - name: openstack/openstack-helm-plugin
      - name: airship/treasuremap
        override-checkout: v1.9
@ -157,9 +157,9 @@
      helm_version: "v3.14.0"
      crictl_version: "v1.30.1"
      zuul_osh_relative_path: ../../openstack/openstack-helm
-      zuul_osh_infra_relative_path: ../../openstack/openstack-helm-infra
+      zuul_osh_infra_relative_path: ../../openstack/openstack-helm
      zuul_treasuremap_relative_path: ../../airship/treasuremap
-      gate_scripts_relative_path: ../../openstack/openstack-helm-infra
+      gate_scripts_relative_path: ../../openstack/openstack-helm
      run_helm_tests: "no"


@ -206,6 +206,8 @@
    vars:
      disable_keystone: true
      DISTRO: ubuntu_jammy
+      zuul_osh_relative_path: ../../openstack/openstack-helm
+      zuul_osh_infra_relative_path: ../../openstack/openstack-helm

 - job:
    name: deckhand-integration-docker-py310
@ -219,6 +221,8 @@
      tox_envlist: py310-functional
      disable_keystone: false
      DISTRO: ubuntu_jammy
+      zuul_osh_relative_path: ../../openstack/openstack-helm
+      zuul_osh_infra_relative_path: ../../openstack/openstack-helm
    irrelevant-files: *irrelevant-files

 - job:
@ -229,7 +233,7 @@
    run: tools/gate/playbooks/build-charts.yaml
    nodeset: treasuremap-airskiff-1node-ubuntu_jammy
    vars:
-      HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
+      HTK_COMMIT: b6fa5ad3dc8daef9fa08a70d981f2bf2a9ca55cf

 - job:
    name: deckhand-chart-build-latest-htk
@ -251,9 +255,9 @@
    vars:
      site: airskiff
      HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz
-      HTK_COMMIT: 962333df313e04a01923ca8394d2a44f2afbb714
-      OSH_INFRA_COMMIT: 962333df313e04a01923ca8394d2a44f2afbb714
-      OSH_COMMIT: 5a3f2080c12bb56238b150c69a06064c64d61d0f
+      HTK_COMMIT: master
+      OSH_INFRA_COMMIT: master
+      OSH_COMMIT: master
      CLONE_DECKHAND: false
      DISTRO: ubuntu_jammy
      DOCKER_REGISTRY: localhost:5000
--- a/bindep.txt
+++ b/bindep.txt
@ -10,7 +10,8 @@ libpq-dev [platform:dpkg]
 libsasl2-dev [platform:dpkg]
 libssl-dev [platform:dpkg]
 libre2-dev [platform:dpkg]
-postgresql-14 [platform:dpkg]
+postgresql [platform:dpkg]
 postgresql-contrib [platform:dpkg]
 ethtool [platform:dpkg]
 net-tools [platform:dpkg]
+tox [platform:dpkg]
--- a/tools/gate/playbooks/airship-run-scripts.yaml
+++ b/tools/gate/playbooks/airship-run-scripts.yaml
@ -41,8 +41,8 @@
            tag: "{{ zj_zuul_artifact.metadata.tag }}"
            repo: "{{ zj_zuul_artifact.metadata.repository }}"
            override_paths:
-              - ../openstack-helm*/*/values*
-              - ../openstack-helm-infra/tools/deployment/
+              - ../openstack-helm/*/values*
+              - ../openstack-helm/tools/deployment/

        - name: Diff
          shell: |
--- a/tools/gate/roles/airship-run-script-set/defaults/main.yaml
+++ b/tools/gate/roles/airship-run-script-set/defaults/main.yaml
@ -1,47 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-ceph_osd_data_device: "/dev/loop0"
-kubeadm:
-  pod_network_cidr: "10.244.0.0/24"
-osh_params:
-  container_distro_name: ubuntu
-  container_distro_version: focal
-  # feature_gates:
-site: airskiff
-HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz
-HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
-OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
-OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7
-COREDNS_VERSION: v1.11.1
-DISTRO: ubuntu_focal
-DOCKER_REGISTRY: quay.io
-MAKE_ARMADA_IMAGES: false
-MAKE_DECKHAND_IMAGES: false
-MAKE_SHIPYARD_IMAGES: false
-MAKE_PORTHOLE_IMAGES: false
-MAKE_PROMENADE_IMAGES: false
-CLONE_ARMADA: true
-CLONE_DECKHAND: true
-CLONE_SHIPYARD: true
-CLONE_PORTHOLE: true
-CLONE_PROMENADE: true
-CLONE_MAAS: true
-CLONE_OSH: true
-MAKE_ARMADA_IMAGES: false
-MAKE_DECKHAND_IMAGES: false
-MAKE_SHIPYARD_IMAGES: false
-MAKE_DECKHAND_IMAGES: false
-MAKE_PORTHOLE_IMAGES: false
-MAKE_PROMENADE_IMAGES: false
-...
--- a/tools/gate/roles/airship-run-script-set/tasks/main.yaml
+++ b/tools/gate/roles/airship-run-script-set/tasks/main.yaml
@ -1,84 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
- block:
-    - name: "Run script set {{ workload }}"
-      shell: |
-        set -xe;
-        {{ gate_script_path }}
-      loop: "{{ workload }}"
-      loop_control:
-        loop_var: gate_script_path
-        pause: 5
-      args:
-        chdir: "{{ zuul.project.src_dir }}/{{ gate_scripts_relative_path }}"
-      environment:
-        CEPH_OSD_DATA_DEVICE: "{{ ceph_osd_data_device }}"
-        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_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('') }}"
-        CONTAINER_DISTRO_NAME: "{{ osh_params.container_distro_name | default('') }}"
-        CONTAINER_DISTRO_VERSION: "{{ osh_params.container_distro_version | default('') }}"
-        FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}"
-        RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}"
-        PL_SITE: "{{ site | default('airskiff') }}"
-        HELM_ARTIFACT_URL: "{{ HELM_ARTIFACT_URL | default('https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz') }}"
-        HTK_COMMIT: "{{ HTK_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}"
-        OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}"
-        OSH_COMMIT: "{{ OSH_COMMIT | default('2d9457e34ca4200ed631466bd87569b0214c92e7') }}"
-        COREDNS_VERSION: "{{ coredns_version | default('v1.11.1') }}"
-        DISTRO: "{{ DISTRO | default('ubuntu_focal') }}"
-        DOCKER_REGISTRY: "{{ DOCKER_REGISTRY | default('quay.io') }}"
-        MAKE_ARMADA_IMAGES: "{{ MAKE_ARMADA_IMAGES | default('false') }}"
-        MAKE_DECKHAND_IMAGES: "{{ MAKE_DECKHAND_IMAGES | default('false') }}"
-        MAKE_SHIPYARD_IMAGES: "{{ MAKE_SHIPYARD_IMAGES | default('false') }}"
-        MAKE_PORTHOLE_IMAGES: "{{ MAKE_PORTHOLE_IMAGES | default('false') }}"
-        MAKE_PROMENADE_IMAGES: "{{ MAKE_PROMENADE_IMAGES | default('false') }}"
-        CLONE_ARMADA: "{{ CLONE_ARMADA | default('true') }}"
-        CLONE_DECKHAND: "{{ CLONE_DECKHAND | default('true') }}"
-        CLONE_SHIPYARD: "{{ CLONE_SHIPYARD | default('true') }}"
-        CLONE_PORTHOLE: "{{ CLONE_PORTHOLE | default('true') }}"
-        CLONE_PROMENADE: "{{ CLONE_PROMENADE | default('true') }}"
-        CLONE_MAAS: "{{ CLONE_MAAS | default('true') }}"
-        CLONE_OSH: "{{ CLONE_OSH | default('true') }}"
-        MAKE_ARMADA_IMAGES: "{{ MAKE_ARMADA_IMAGES | default('false') }}"
-        MAKE_DECKHAND_IMAGES: "{{ MAKE_DECKHAND_IMAGES | default('false') }}"
-        MAKE_SHIPYARD_IMAGES: "{{ MAKE_SHIPYARD_IMAGES | default('false') }}"
-        MAKE_DECKHAND_IMAGES: "{{ MAKE_DECKHAND_IMAGES | default('false') }}"
-        MAKE_PORTHOLE_IMAGES: "{{ MAKE_PORTHOLE_IMAGES | default('false') }}"
-        MAKE_PROMENADE_IMAGES: "{{ MAKE_PROMENADE_IMAGES | default('false') }}"
-      # NOTE(aostapenko) using bigger than async_status timeout due to async_status issue with
-      # not recognizing timed out jobs: https://github.com/ansible/ansible/issues/25637
-      async: 3600
-      poll: 0
-      register: async_results
-
-    - name: Wait for script set to finish
-      async_status:
-        jid: '{{ item.ansible_job_id }}'
-      register: jobs
-      until: jobs.finished
-      delay: 5
-      retries: 360
-      loop: "{{ async_results.results }}"
-
-  always:
-    - name: Print script set output
-      shell: |
-          # NOTE(aostapenko) safely retrieving items for the unlikely case if jobs timed out in async_status
-          echo 'STDOUT:\n{{ item.get("stdout") | regex_replace("\'", "") }}\nSTDERR:\n{{ item.get("stderr") | regex_replace("\'", "") }}'
-      loop: "{{ jobs.results }}"
-...
--- a/tools/gate/roles/airship-run-script/defaults/main.yaml
+++ b/tools/gate/roles/airship-run-script/defaults/main.yaml
@ -1,47 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
-ceph_osd_data_device: "/dev/loop0"
-kubeadm:
-  pod_network_cidr: "10.244.0.0/24"
-osh_params:
-  container_distro_name: ubuntu
-  container_distro_version: focal
-  # feature_gates:
-site: airskiff
-HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz
-HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
-OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
-OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7
-COREDNS_VERSION: v1.11.1
-DISTRO: ubuntu_jammy
-DOCKER_REGISTRY: quay.io
-MAKE_ARMADA_IMAGES: false
-MAKE_DECKHAND_IMAGES: false
-MAKE_SHIPYARD_IMAGES: false
-MAKE_PORTHOLE_IMAGES: false
-MAKE_PROMENADE_IMAGES: false
-CLONE_ARMADA: true
-CLONE_DECKHAND: true
-CLONE_SHIPYARD: true
-CLONE_PORTHOLE: true
-CLONE_PROMENADE: true
-CLONE_MAAS: true
-CLONE_OSH: true
-MAKE_ARMADA_IMAGES: false
-MAKE_DECKHAND_IMAGES: false
-MAKE_SHIPYARD_IMAGES: false
-MAKE_DECKHAND_IMAGES: false
-MAKE_PORTHOLE_IMAGES: false
-MAKE_PROMENADE_IMAGES: false
-...
--- a/tools/gate/roles/airship-run-script/tasks/main.yaml
+++ b/tools/gate/roles/airship-run-script/tasks/main.yaml
@ -1,61 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
---
- name: "Run script {{ workload[0] }}"
-  shell: |
-    set -xe;
-    {{ gate_script_path }}
-  vars:
-    gate_script_path: "{{ workload[0] }}"
-  args:
-    chdir: "{{ zuul.project.src_dir }}/{{ gate_scripts_relative_path }}"
-  environment:
-    CEPH_OSD_DATA_DEVICE: "{{ ceph_osd_data_device }}"
-    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_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('') }}"
-    CONTAINER_DISTRO_NAME: "{{ osh_params.container_distro_name | default('') }}"
-    CONTAINER_DISTRO_VERSION: "{{ osh_params.container_distro_version | default('') }}"
-    FEATURE_GATES: "{{ osh_params.feature_gates | default('') }}"
-    RUN_HELM_TESTS: "{{ run_helm_tests | default('yes') }}"
-    PL_SITE: "{{ site | default('airskiff') }}"
-    HELM_ARTIFACT_URL: "{{ HELM_ARTIFACT_URL | default('https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz') }}"
-    HTK_COMMIT: "{{ HTK_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}"
-    OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}"
-    OSH_COMMIT: "{{ OSH_COMMIT | default('2d9457e34ca4200ed631466bd87569b0214c92e7') }}"
-    COREDNS_VERSION: "{{ coredns_version | default('v1.11.1') }}"
-    DISTRO: "{{ DISTRO | default('ubuntu_focal') }}"
-    DOCKER_REGISTRY: "{{ DOCKER_REGISTRY | default('quay.io') }}"
-    MAKE_ARMADA_IMAGES: "{{ MAKE_ARMADA_IMAGES | default('false') }}"
-    MAKE_DECKHAND_IMAGES: "{{ MAKE_DECKHAND_IMAGES | default('false') }}"
-    MAKE_SHIPYARD_IMAGES: "{{ MAKE_SHIPYARD_IMAGES | default('false') }}"
-    MAKE_PORTHOLE_IMAGES: "{{ MAKE_PORTHOLE_IMAGES | default('false') }}"
-    MAKE_PROMENADE_IMAGES: "{{ MAKE_PROMENADE_IMAGES | default('false') }}"
-    CLONE_ARMADA: "{{ CLONE_ARMADA | default('true') }}"
-    CLONE_DECKHAND: "{{ CLONE_DECKHAND | default('true') }}"
-    CLONE_SHIPYARD: "{{ CLONE_SHIPYARD | default('true') }}"
-    CLONE_PORTHOLE: "{{ CLONE_PORTHOLE | default('true') }}"
-    CLONE_PROMENADE: "{{ CLONE_PROMENADE | default('true') }}"
-    CLONE_MAAS: "{{ CLONE_MAAS | default('true') }}"
-    CLONE_OSH: "{{ CLONE_OSH | default('true') }}"
-    MAKE_ARMADA_IMAGES: "{{ MAKE_ARMADA_IMAGES | default('false') }}"
-    MAKE_DECKHAND_IMAGES: "{{ MAKE_DECKHAND_IMAGES | default('false') }}"
-    MAKE_SHIPYARD_IMAGES: "{{ MAKE_SHIPYARD_IMAGES | default('false') }}"
-    MAKE_DECKHAND_IMAGES: "{{ MAKE_DECKHAND_IMAGES | default('false') }}"
-    MAKE_PORTHOLE_IMAGES: "{{ MAKE_PORTHOLE_IMAGES | default('false') }}"
-    MAKE_PROMENADE_IMAGES: "{{ MAKE_PROMENADE_IMAGES | default('false') }}"
-
-...
--- a/tools/gate/roles/deploy-keystone-dependencies/defaults/main.yaml
+++ b/tools/gate/roles/deploy-keystone-dependencies/defaults/main.yaml
@ -0,0 +1,16 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+osh_values_overrides_path: "../openstack-helm/values_overrides"
+osh_infra_values_overrides_path: "../openstack-helm/values_overrides"
+...
--- a/tools/gate/roles/deploy-keystone-dependencies/tasks/main.yaml
+++ b/tools/gate/roles/deploy-keystone-dependencies/tasks/main.yaml
@ -20,21 +20,12 @@
 - name: Make OSH charts
  shell: |
    set -xe
-    make all
+    make all SKIP_CHANGELOG=1
  environment:
    zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
  args:
    chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"

- name: Make OSH_INFRA charts
-  shell: |
-    set -xe
-    make all
-  environment:
-    zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
-  args:
-    chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
-
 - name: Prepare kubernetes
  shell: |
    set -xe;
@ -62,6 +53,14 @@
    ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
  args:
    chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"
+  environment:
+    OSH_HELM_REPO: "{{ osh_helm_repo | default('../openstack-helm') }}"
+    OSH_INFRA_HELM_REPO: "{{ osh_infra_helm_repo | default('../openstack-helm') }}"
+    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/') }}"
+    OSH_VALUES_OVERRIDES_PATH: "{{ osh_values_overrides_path }}"
+    OSH_INFRA_VALUES_OVERRIDES_PATH: "{{ osh_infra_values_overrides_path }}"

 - name: Deploy MariaDB
  shell: |
@ -69,6 +68,14 @@
    ./tools/deployment/component/common/mariadb.sh
  args:
    chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"
+  environment:
+    OSH_HELM_REPO: "{{ osh_helm_repo | default('../openstack-helm') }}"
+    OSH_INFRA_HELM_REPO: "{{ osh_infra_helm_repo | default('../openstack-helm') }}"
+    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/') }}"
+    OSH_VALUES_OVERRIDES_PATH: "{{ osh_values_overrides_path }}"
+    OSH_INFRA_VALUES_OVERRIDES_PATH: "{{ osh_infra_values_overrides_path }}"

 - name: Deploy RabbitMQ
  shell: |
@ -76,6 +83,14 @@
    ./tools/deployment/component/common/rabbitmq.sh
  args:
    chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"
+  environment:
+    OSH_HELM_REPO: "{{ osh_helm_repo | default('../openstack-helm') }}"
+    OSH_INFRA_HELM_REPO: "{{ osh_infra_helm_repo | default('../openstack-helm') }}"
+    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/') }}"
+    OSH_VALUES_OVERRIDES_PATH: "{{ osh_values_overrides_path }}"
+    OSH_INFRA_VALUES_OVERRIDES_PATH: "{{ osh_infra_values_overrides_path }}"

 - name: Deploy Memcached
  shell: |
@ -83,10 +98,26 @@
    ./tools/deployment/component/common/memcached.sh
  args:
    chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"
+  environment:
+    OSH_HELM_REPO: "{{ osh_helm_repo | default('../openstack-helm') }}"
+    OSH_INFRA_HELM_REPO: "{{ osh_infra_helm_repo | default('../openstack-helm') }}"
+    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/') }}"
+    OSH_VALUES_OVERRIDES_PATH: "{{ osh_values_overrides_path }}"
+    OSH_INFRA_VALUES_OVERRIDES_PATH: "{{ osh_infra_values_overrides_path }}"

 - name: Deploy Keystone
  shell: |
    set -xe;
    ./tools/deployment/component/keystone/keystone.sh
  args:
-    chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"
+    chdir: "{{ zuul.project.src_dir }}/{{ zuul_osh_relative_path | default('') }}"
+  environment:
+    OSH_HELM_REPO: "{{ osh_helm_repo | default('../openstack-helm') }}"
+    OSH_INFRA_HELM_REPO: "{{ osh_infra_helm_repo | default('../openstack-helm') }}"
+    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/') }}"
+    OSH_VALUES_OVERRIDES_PATH: "{{ osh_values_overrides_path }}"
+    OSH_INFRA_VALUES_OVERRIDES_PATH: "{{ osh_infra_values_overrides_path }}"
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@ -16,8 +16,8 @@

 set -eux

-HTK_REPO=${HTK_REPO:-"https://opendev.org/openstack/openstack-helm-infra.git"}
-HTK_STABLE_COMMIT=${HTK_COMMIT:-"cfff60ec10a6c386f38db79bb9f59a552c2b032f"}
+HTK_REPO=${HTK_REPO:-"https://opendev.org/openstack/openstack-helm.git"}
+HTK_STABLE_COMMIT=${HTK_COMMIT:-"master"}

 TMP_DIR=$(mktemp -d)

--- a/tools/integration-tests.sh
+++ b/tools/integration-tests.sh
@ -13,7 +13,7 @@
 set -xe

 CURRENT_DIR="$(pwd)"
-: "${OSH_INFRA_PATH:="../openstack-helm-infra"}"
+: "${OSH_INFRA_PATH:="../openstack-helm"}"
 : "${OSH_PATH:="../openstack-helm"}"
 : "${TM_PATH:="../treasuremap"}"