From 650657e7fcb5a762be70c4b51f1c3aa686f5bb60 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Wed, 22 Oct 2025 17:18:47 -0500
Subject: [PATCH] Build skyline image

Change-Id: Icea2cfa7d3b058e581aa730062bb0adee9a955d0
Signed-off-by: Vladimir Kozhukalov <kozhukalov@gmail.com>
---
 Dockerfile                                      |  3 +++
 playbooks/vars.yaml                             | 17 +++++++++++++++++
 playbooks/vars_2025.2_noble.yaml                |  3 ++-
 .../skyline/01_install_skyline_console.sh       | 12 ++++++++++++
 zuul.d/project.yaml                             | 10 ++++++----
 5 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100755 scripts/project_specific/skyline/01_install_skyline_console.sh

diff --git a/Dockerfile b/Dockerfile
index dccac015..97f9c48b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,6 +49,9 @@ ARG NOVNC_REF=v1.0.0
 ARG SPICE_REPO=https://gitlab.freedesktop.org/spice/spice-html5.git
 ARG SPICE_REF=spice-html5-0.1.6
 
+ARG SKYLINE_CONSOLE_REPO=https://opendev.org/openstack/skyline-console
+ARG SKYLINE_CONSOLE_REF=master
+
 # End Nova arguments
 
 # Virtualenv arguments
diff --git a/playbooks/vars.yaml b/playbooks/vars.yaml
index 6b5f6877..b2e2b02b 100644
--- a/playbooks/vars.yaml
+++ b/playbooks/vars.yaml
@@ -469,6 +469,23 @@ placement_image:
     - "KEEP_ALL_WHEELS=yes"
     - "APT_MIRROR='{{ apt_mirror }}'"
 
+skyline_image:
+  context: "."
+  dockerfile: "Dockerfile"
+  container_filename: "Dockerfile"
+  target: "project"
+  registry: "{{ image_registry.host }}"
+  repository: "{{ image_registry.host }}/{{ image_registry.org }}/skyline"
+  tags: *tags
+  build_args:
+    - "FROM='{{ image_registry.host }}/{{ image_registry.org }}/base:{{ image_tag }}'"
+    - "PROJECT='skyline-apiserver'"
+    - "PROJECT_REF={{ openstack_release }}"
+    - "WHEELS='{{ image_registry.host }}/{{ image_registry.org }}/requirements:{{ image_tag }}'"
+    - "KEEP_ALL_WHEELS=False"
+    - "APT_MIRROR='{{ apt_mirror }}'"
+    - "SKYLINE_CONSOLE_REF={{ openstack_release }}"
+
 tacker_image:
   context: "."
   dockerfile: "Dockerfile"
diff --git a/playbooks/vars_2025.2_noble.yaml b/playbooks/vars_2025.2_noble.yaml
index 625f182f..6c1e5f40 100644
--- a/playbooks/vars_2025.2_noble.yaml
+++ b/playbooks/vars_2025.2_noble.yaml
@@ -21,7 +21,8 @@ openstack_images:
   - "{{ octavia_image }}"
   - "{{ openstack_client_image }}"
   - "{{ placement_image }}"
-  - "{{ tacker_image}}"
+  - "{{ skyline_image }}"
+  - "{{ tacker_image }}"
   - "{{ watcher_image }}"
   - "{{ freezer_image }}"
   - "{{ freezer_api_image }}"
diff --git a/scripts/project_specific/skyline/01_install_skyline_console.sh b/scripts/project_specific/skyline/01_install_skyline_console.sh
new file mode 100755
index 00000000..24125c71
--- /dev/null
+++ b/scripts/project_specific/skyline/01_install_skyline_console.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -ex
+
+SKYLINE_CONSOLE_DIR=/skyline-console
+
+git clone -b ${SKYLINE_CONSOLE_REF} --depth 1 ${SKYLINE_CONSOLE_REPO} ${SKYLINE_CONSOLE_DIR}
+
+(
+    cd ${SKYLINE_CONSOLE_DIR}
+    pip install -U .
+)
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 8e3d2971..6e488422 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -26,10 +26,12 @@
         - loci-build-2025-2-ubuntu_noble
         # - loci-compute-kit-2025-2-ubuntu_noble
         # - loci-cinder-2025-2-ubuntu_noble
-        # Master Ubuntu Jammy
-        - loci-build-master-ubuntu_jammy
-        # Master Ubuntu Noble
-        - loci-build-master-ubuntu_noble
+
+        # Disabled for now because master builds are unstable
+        # # Master Ubuntu Jammy
+        # - loci-build-master-ubuntu_jammy
+        # # Master Ubuntu Noble
+        # - loci-build-master-ubuntu_noble
     gate:
       jobs:
         - loci-buildset-registry