Preparation for osh-infra merger

Change-Id: I0aef14d643bf5faf9d88f06bdc158fb4bb946d24

.gitignore

@@ -62,6 +62,9 @@ releasenotes/build
 **/.vagrant
 **/*.log
 
+# devcontainers
+.devcontainer/
+
 # Helm internals
 *.lock
 */*.lock

.zuul.yaml

@@ -78,11 +78,11 @@
     description: Deploys all UC's and executes functional tests
     nodeset: treasuremap-airskiff-1node-ubuntu_jammy
     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
@@ -126,7 +126,7 @@
       helm_version: "v3.15.4"
       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: .
       run_helm_tests: "no"
@@ -134,10 +134,10 @@
       osh_params:
         container_distro_name: ubuntu
         container_distro_version: jammy
-      HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz
-      HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
-      OSH_INFRA_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
-      OSH_COMMIT: 540df5cb0dbdaed63c202e2d6f2b7891062f8203
+      HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz
+      HTK_COMMIT: master
+      OSH_INFRA_COMMIT: master
+      OSH_COMMIT: master
       gate_scripts:
         - ./tools/gate/scripts/run-gates.sh
 

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:-"51c70e48dff173281a77d374d87af2c49caa6348"}
+HTK_REPO=${HTK_REPO:-"https://opendev.org/openstack/openstack-helm.git"}
+HTK_STABLE_COMMIT=${HTK_COMMIT:-"master"}
 
 TMP_DIR=$(mktemp -d)