From d502432266234168d419358ccc7c1f2dfc104896 Mon Sep 17 00:00:00 2001
From: Sergiy Markin <smarkin@mirantis.com>
Date: Mon, 24 Mar 2025 19:31:59 +0000
Subject: [PATCH] Preparation for osh-infra merger

Change-Id: I83e600cba33f42775d2140b6fd6536ad88467fe5
---
 .gitignore                 |  1 +
 .zuul.yaml                 | 19 ++++++++++---------
 tools/gate/playbooks/roles |  1 -
 3 files changed, 11 insertions(+), 10 deletions(-)
 delete mode 120000 tools/gate/playbooks/roles

diff --git a/.gitignore b/.gitignore
index 7f02333..e4f731c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ Dockerfile.cross
 *.swp
 *.swo
 *~
+.devcontainer/
\ No newline at end of file
diff --git a/.zuul.yaml b/.zuul.yaml
index 33b4e5c..2c2da2f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -41,11 +41,11 @@
     name: armada-go-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
@@ -83,8 +83,8 @@
       loopback_device: /dev/loop100
       loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img"
       ceph_osd_data_device: /dev/loop100
-      kube_version_repo: "v1.31"
-      kube_version: "1.31.3-1.1"
+      kube_version_repo: "v1.32"
+      kube_version: "1.32.1-1.1"
       calico_setup: true
       calico_version: "v3.27.4"
       cilium_setup: false
@@ -96,9 +96,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"
 
 - job:
@@ -110,9 +110,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_ARMADA_GO: false
       DISTRO: ubuntu_jammy
       DOCKER_REGISTRY: localhost:5000
@@ -134,6 +134,7 @@
         - ./tools/deployment/airskiff/developer/100-deploy-osh.sh
         - ./tools/deployment/airskiff/common/os-env.sh
         - ./tools/gate/wait-for-shipyard.sh
+        - ./tools/deployment/airskiff/common/get-airflow-worker-logs.sh
     irrelevant-files: *irrelevant-files
 
 - job:
diff --git a/tools/gate/playbooks/roles b/tools/gate/playbooks/roles
deleted file mode 120000
index 7b9ade8..0000000
--- a/tools/gate/playbooks/roles
+++ /dev/null
@@ -1 +0,0 @@
-../roles/
\ No newline at end of file