From 92ea4bbda5ee2add0293cdc2df1ff4f393ea6f7b Mon Sep 17 00:00:00 2001
From: Alex-Welsh <alex@stackhpc.com>
Date: Wed, 19 Feb 2025 16:50:14 +0000
Subject: [PATCH] Fix and re-enable image tag check

---
 .github/workflows/stackhpc-pull-request.yml | 22 ++++++++++-----------
 etc/kayobe/kolla-image-tags.yml             |  3 +++
 etc/kayobe/pulp.yml                         |  1 -
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/stackhpc-pull-request.yml b/.github/workflows/stackhpc-pull-request.yml
index 276b306927..b8cc064a82 100644
--- a/.github/workflows/stackhpc-pull-request.yml
+++ b/.github/workflows/stackhpc-pull-request.yml
@@ -115,17 +115,17 @@ jobs:
       if: ${{ needs.check-changes.outputs.build-kayobe-image == 'true' }}
     if: github.repository == 'stackhpc/stackhpc-kayobe-config'
 
-  # check-tags:
-  #   name: Check container image tags
-  #   needs:
-  #     - check-changes
-  #     - build-kayobe-image
-  #   uses: ./.github/workflows/stackhpc-check-tags.yml
-  #   with:
-  #     kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
-  #     if: ${{ needs.check-changes.outputs.check-tags == 'true' }}
-  #   secrets: inherit
-  #   if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
+  check-tags:
+    name: Check container image tags
+    needs:
+      - check-changes
+      - build-kayobe-image
+    uses: ./.github/workflows/stackhpc-check-tags.yml
+    with:
+      kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
+      if: ${{ needs.check-changes.outputs.check-tags == 'true' }}
+    secrets: inherit
+    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
 
   all-in-one-ubuntu-noble-ovs:
     name: aio (Ubuntu Noble OVS)
diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
index 648d98334b..61bf47b05f 100644
--- a/etc/kayobe/kolla-image-tags.yml
+++ b/etc/kayobe/kolla-image-tags.yml
@@ -7,3 +7,6 @@ kolla_image_tags:
   openstack:
     rocky-9: master-rocky-9-20250213T114650
     ubuntu-noble: master-ubuntu-noble-20250213T091307
+  bifrost_deploy:
+    rocky-9: master-rocky-9-20250219T145044
+    ubuntu-noble: master-ubuntu-noble-20250219T145044
diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml
index 73ede61554..6c2d3dbca1 100644
--- a/etc/kayobe/pulp.yml
+++ b/etc/kayobe/pulp.yml
@@ -425,7 +425,6 @@ stackhpc_pulp_images_kolla:
   - bifrost-deploy
   - blazar-api
   - blazar-manager
-  - caso
   - cinder-api
   - cinder-backup
   - cinder-scheduler