From 750ef8e6a196a43095bfecd074aa771ee1105456 Mon Sep 17 00:00:00 2001
From: Sergiy Markin <smarkin@mirantis.com>
Date: Tue, 19 Aug 2025 18:40:31 +0000
Subject: [PATCH] Airskiff based drydock deployment job

Change-Id: I3e016ad08017633315bd12203598c1c50212cae7
Signed-off-by: Sergiy Markin <smarkin@mirantis.com>
---
 .zuul.yaml                             | 23 +++++++++++++++++++++++
 Makefile                               |  2 +-
 images/drydock/Dockerfile.ubuntu_jammy | 10 +++++-----
 tools/gate/playbooks/vars.yaml         | 10 +++++++---
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index d39ef939..c3781946 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -27,6 +27,7 @@
         - airship-drydock-chart-build-gate
         - airship-drydock-chart-build-latest-htk
         - airship-drydock-docker-build-gate-ubuntu_jammy
+        - drydock-airskiff-deployment-jammy-kubeadm
 
     gate:
       jobs:
@@ -114,6 +115,28 @@
     vars:
       HTK_COMMIT: 49c117443391cec75e0bd52bb4a9d033325927ad
 
+- job:
+    name: drydock-airskiff-deployment-jammy-kubeadm
+    # Pinned for now due to Ansible 11 stopped verbosive output.
+    ansible-version: 9
+    description: |
+      Deploy drydock using Airskiff and submitted Shipyard changes.
+    parent: treasuremap-airskiff-deploy-maas-drydock-base
+    nodeset: treasuremap-airskiff-1node-32GB-ubuntu_jammy
+    required-projects:
+      - name: airship/treasuremap
+        override-checkout: v1.9
+    roles:
+      - zuul: airship/treasuremap
+    vars:
+      treasuremap_ref: v1.9
+      CLONE_DRYDOCK: false
+      MAKE_DRYDOCK_IMAGES: true
+      MAKE_MAAS_IMAGES: false
+      DOCKER_REGISTRY: localhost:5000
+      gate_scripts_relative_path: ../../airship/treasuremap
+      zuul_treasuremap_relative_path: ../../airship/treasuremap
+
 - job:
     name: airship-drydock-chart-build-latest-htk
     description: |
diff --git a/Makefile b/Makefile
index 968eb064..d4286f07 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ PUSH_IMAGE      	?= false
 LABEL           	?= org.airshipit.build=community
 COMMIT          	?= $(shell git rev-parse HEAD)
 IMAGE           	?= ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}-${DISTRO}
-IMAGE_ALIAS              := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}-${DISTRO_ALIAS}
+IMAGE_ALIAS         ?= ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}-${DISTRO_ALIAS}
 
 export
 
diff --git a/images/drydock/Dockerfile.ubuntu_jammy b/images/drydock/Dockerfile.ubuntu_jammy
index 1e0bdfb1..66a13427 100644
--- a/images/drydock/Dockerfile.ubuntu_jammy
+++ b/images/drydock/Dockerfile.ubuntu_jammy
@@ -20,7 +20,7 @@
 #   You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit
 ARG FROM=quay.io/airshipit/ubuntu:jammy
 
-FROM quay.io/airshipit/golang:1.23.8-bullseye  as baclient_builder
+FROM quay.io/airshipit/golang:1.24.6-bullseye AS baclient_builder
 
 COPY ./tools/baclient_build.sh /tmp/drydock/
 COPY ./go /tmp/drydock/go
@@ -44,10 +44,10 @@ ARG ALLOW_UNAUTHENTICATED=false
 ARG PIP_TRUSTED_HOST=foo.com
 ARG PIP_INDEX_URL=https://pypi.org/simple
 ARG BUILD_DIR
-ENV container docker
-ENV PORT 9000
-ENV LC_ALL C.UTF-8
-ENV LANG C.UTF-8
+ENV container=docker
+ENV PORT=9000
+ENV LC_ALL=C.UTF-8
+ENV LANG=C.UTF-8
 
 
 # COPY ./bindep-python.txt /tmp/drydock/
diff --git a/tools/gate/playbooks/vars.yaml b/tools/gate/playbooks/vars.yaml
index eb6ffae1..4e2e9829 100644
--- a/tools/gate/playbooks/vars.yaml
+++ b/tools/gate/playbooks/vars.yaml
@@ -1,5 +1,3 @@
-# Copyright 2017 The Openstack-Helm Authors.
-#
 # 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
@@ -12,4 +10,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-null: null
+docker_daemon:
+  group: zuul
+  registry-mirrors:
+    - "http://{{ zuul_site_mirror_fqdn }}:8082/"
+  storage-driver: overlay2
+ansible_python_interpreter: python3
+...
\ No newline at end of file