use uv instead

Author: aktech

.github/workflows/build-images-ssh.yml

@@ -52,7 +52,7 @@ jobs:
       - name: Build ${{ matrix.image-type }} image on remote server
         id: build
         run: |
-          ssh gpuserver "cd /tmp/repo-${{ github.run_id }} && make build-${{ matrix.image-type }} BUILD_DIR=/tmp/vm-images-build-${{ github.run_id }}"
+          ssh -t gpuserver "export COLUMNS=200 && cd /tmp/repo-${{ github.run_id }} && make build-${{ matrix.image-type }} BUILD_DIR=/tmp/vm-images-build-${{ github.run_id }}"
           IMAGE_NAME=$(ssh gpuserver "cd /tmp/vm-images-build-${{ github.run_id }}-${{ matrix.image-type }} && ls -1 *.qcow2 2>/dev/null | head -1 | sed 's/.qcow2$//'")
           echo "image_name=$IMAGE_NAME" >> $GITHUB_OUTPUT
 

.gitignore

@@ -3,3 +3,7 @@ vm-images/dib.log
 vm-images/build-output.log
 vm-images/*.qcow2
 vm-images/*.d/
+
+# UV environment
+vm-images/.venv/
+vm_images.egg-info/

Makefile

@@ -10,12 +10,14 @@ IMAGE_NAME := ubuntu-2404-$(IMAGE_TYPE)-$(TIMESTAMP)
 REPO_DIR := $(shell pwd)
 VM_IMAGES_DIR := $(REPO_DIR)/vm-images
 OPENSTACK_RC ?= /etc/kolla/admin-openrc.sh
-CONDA_BASE ?= /opt/stack/miniconda3
-CONDA_ENV ?= kolla
+UV ?= uv
 
 help:
 	@echo "VM Image Build Makefile"
 	@echo ""
+	@echo "Requirements:"
+	@echo "  - uv (https://docs.astral.sh/uv/)"
+	@echo ""
 	@echo "Targets:"
 	@echo "  build-cpu          - Build CPU image"
 	@echo "  build-gpu          - Build GPU image"
@@ -30,6 +32,7 @@ help:
 	@echo "  BUILD_DIR=$(BUILD_DIR)"
 	@echo "  IMAGE_TYPE=$(IMAGE_TYPE)"
 	@echo "  IMAGE_NAME=$(IMAGE_NAME)"
+	@echo "  UV=$(UV)"
 
 build-cpu:
 	@$(MAKE) _build IMAGE_TYPE=cpu
@@ -50,7 +53,8 @@ _build:
 	cd $(BUILD_DIR)-$(IMAGE_TYPE) && \
 		sed -i 's/imagename: $(IMAGE_TYPE)-image.qcow2/imagename: $(IMAGE_NAME).qcow2/' $(IMAGE_TYPE)-image.yaml
 	cd $(BUILD_DIR)-$(IMAGE_TYPE) && \
-		IMAGE_YAML=$(IMAGE_TYPE)-image.yaml bash build-image.sh
+		$(UV) sync && \
+		IMAGE_YAML=$(IMAGE_TYPE)-image.yaml $(UV) run bash build-image.sh
 	@echo ""
 	@$(MAKE) show-image IMAGE_TYPE=$(IMAGE_TYPE) BUILD_DIR=$(BUILD_DIR)
 
@@ -91,17 +95,15 @@ _upload:
 	@echo "======================================"
 	@cd $(BUILD_DIR)-$(IMAGE_TYPE) && \
 		source $(OPENSTACK_RC) && \
-		source $(CONDA_BASE)/bin/activate && \
-		conda activate $(CONDA_ENV) && \
 		IMAGE_FILE=$$(ls -1 *.qcow2 2>/dev/null | head -1) && \
 		IMAGE_BASE=$$(basename $$IMAGE_FILE .qcow2) && \
 		echo "Uploading $$IMAGE_FILE..." && \
-		openstack image create $$IMAGE_BASE \
+		$(UV) run openstack image create $$IMAGE_BASE \
 			--public --disk-format qcow2 \
 			--container-format bare \
 			--file $$IMAGE_FILE && \
 		echo "Image uploaded successfully!" && \
-		openstack image show $$IMAGE_BASE
+		$(UV) run openstack image show $$IMAGE_BASE
 
 clean:
 	@echo "Cleaning up build directories..."

vm-images/build-image.sh

@@ -22,9 +22,12 @@ if [[ -z "${IMAGE_YAML}" ]]; then
 fi
 
 export TMP=$(pwd)
+export COLUMNS=${COLUMNS:-200}
+export TERM=${TERM:-xterm}
+
 echo "Starting Disk Image builder"
 echo "Using config: ${IMAGE_YAML}"
 
-sudo -E /opt/stack/miniconda3/envs/kolla/bin/diskimage-builder "${IMAGE_YAML}"
+uv run diskimage-builder "${IMAGE_YAML}"
 
 echo "Disk Image Build Finished"

vm-images/pyproject.toml

@@ -0,0 +1,13 @@
+[project]
+name = "vm-images"
+version = "0.1.0"
+description = "VM image builder for OpenStack GPU server"
+requires-python = ">=3.10"
+dependencies = [
+    "diskimage-builder==3.40.0",
+    "python-openstackclient==6.0.0",
+]
+
+[build-system]
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"