From fd7309cba2a705948a91154ec6aa9aeb016b2cb8 Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Thu, 11 Apr 2024 22:52:16 -0400
Subject: [PATCH] [stable/zed] fix image job dependencies (#1091)

build: build all images + run tests using them (#1069)
ci: fix promotion jobs (#1072)
[stable/zed] Drop conventional-commit requirement (#1082)
[stable/zed] fix(ipmi-exporter): Ignore additional sensor IDs (BP/Entity Presence) (#1077)
[stable/zed] Implement collection release process (#1085)
Release 1.11.0 (#1088)
Fix dependency for certain images
---
 zuul.d/container-images/libvirt-tls-sidecar.yaml | 11 +++++++++--
 zuul.d/container-images/netoffload.yaml          |  7 +++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/zuul.d/container-images/libvirt-tls-sidecar.yaml b/zuul.d/container-images/libvirt-tls-sidecar.yaml
index e34c211d6..734bc5b9d 100644
--- a/zuul.d/container-images/libvirt-tls-sidecar.yaml
+++ b/zuul.d/container-images/libvirt-tls-sidecar.yaml
@@ -26,6 +26,9 @@
 - job:
     name: atmosphere-build-container-image-libvirt-tls-sidecar
     parent: atmosphere-build-container-image
+    dependencies:
+      - name: atmosphere-build-container-image-ubuntu
+        soft: true
     vars: &container_image_vars
       promote_container_image_job: atmosphere-upload-container-image-libvirt-tls-sidecar
       container_images:
@@ -38,15 +41,19 @@
           tags:
             - zed
     files: &container_image_files
-      - go.mod
-      - go.sum
+      - images/ubuntu/.*
       - cmd/.*
       - internal/.*
       - Dockerfile
+      - go.mod
+      - go.sum
 
 - job:
     name: atmosphere-upload-container-image-libvirt-tls-sidecar
     parent: atmosphere-upload-container-image
+    dependencies:
+      - name: atmosphere-upload-container-image-ubuntu
+        soft: true
     vars: *container_image_vars
     files: *container_image_files
 
diff --git a/zuul.d/container-images/netoffload.yaml b/zuul.d/container-images/netoffload.yaml
index 714ea2725..58cba3990 100644
--- a/zuul.d/container-images/netoffload.yaml
+++ b/zuul.d/container-images/netoffload.yaml
@@ -26,6 +26,9 @@
 - job:
     name: atmosphere-build-container-image-netoffload
     parent: atmosphere-build-container-image
+    dependencies:
+      - name: atmosphere-build-container-image-ubuntu
+        soft: true
     vars: &container_image_vars
       promote_container_image_job: atmosphere-upload-container-image-netoffload
       container_images:
@@ -37,11 +40,15 @@
           tags:
             - zed
     files: &container_image_files
+      - images/ubuntu/.*
       - images/netoffload/.*
 
 - job:
     name: atmosphere-upload-container-image-netoffload
     parent: atmosphere-upload-container-image
+    dependencies:
+      - name: atmosphere-upload-container-image-ubuntu
+        soft: true
     vars: *container_image_vars
     files: *container_image_files