From 7f4ac1f7cc97fa4d902e2555f8976edb0e42d812 Mon Sep 17 00:00:00 2001
From: Matteo Mortari <matteo.mortari@gmail.com>
Date: Thu, 25 Jul 2024 11:31:15 +0200
Subject: [PATCH] chore: adapt #98 GHA jobs to ODH midstream

Signed-off-by: Matteo Mortari <matteo.mortari@gmail.com>
---
 .github/workflows/csi-build-and-push-image.yml | 2 +-
 .github/workflows/csi-test.yml                 | 6 +++---
 csi/Makefile                                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/csi-build-and-push-image.yml b/.github/workflows/csi-build-and-push-image.yml
index 02da5ee0b..1d3bca258 100644
--- a/.github/workflows/csi-build-and-push-image.yml
+++ b/.github/workflows/csi-build-and-push-image.yml
@@ -14,7 +14,7 @@ on:
       - '.github/dependabot.yml'
       - 'docs/**'
 env:
-  IMG_ORG: kubeflow
+  IMG_ORG: opendatahub
   IMG_REPO: model-registry-storage-initializer
   DOCKER_USER: ${{ secrets.DOCKERHUB_USERNAME }}
   DOCKER_PWD: ${{ secrets.DOCKERHUB_TOKEN }}
diff --git a/.github/workflows/csi-test.yml b/.github/workflows/csi-test.yml
index 74e47dcf7..606b48ed8 100644
--- a/.github/workflows/csi-test.yml
+++ b/.github/workflows/csi-test.yml
@@ -18,7 +18,7 @@ on:
       - "pkg/openapi/**"
 
 env:
-  IMG_ORG: kubeflow
+  IMG_ORG: opendatahub
   MODEL_REGISTRY_IMG: model-registry
   MODEL_REGISTRY_CSI_IMG: model-registry-storage-initializer
   PUSH_IMAGE: false
@@ -68,7 +68,7 @@ jobs:
         working-directory: ./csi
         shell: bash
         env:
-          MR_IMG: "${{ env.IMG_ORG }}/${{ env.MODEL_REGISTRY_IMG }}:${{ steps.tags.outputs.tag }}"
-          MR_CSI_IMG: "${{ env.IMG_ORG }}/${{ env.MODEL_REGISTRY_CSI_IMG }}:${{ steps.tags.outputs.tag }}"
+          MR_IMG: "quay.io/${{ env.IMG_ORG }}/${{ env.MODEL_REGISTRY_IMG }}:${{ steps.tags.outputs.tag }}"
+          MR_CSI_IMG: "quay.io/${{ env.IMG_ORG }}/${{ env.MODEL_REGISTRY_CSI_IMG }}:${{ steps.tags.outputs.tag }}"
           CLUSTER: chart-testing
         run: ./test/e2e_test.sh
diff --git a/csi/Makefile b/csi/Makefile
index d40da2c4d..c19371689 100644
--- a/csi/Makefile
+++ b/csi/Makefile
@@ -12,7 +12,7 @@ DOCKER ?= docker
 DOCKERFILE ?= Dockerfile
 DOCKERFILE_DEV ?= Dockerfile.dev
 
-IMG_REGISTRY ?= 
+IMG_REGISTRY ?= quay.io
 # container image organization
 IMG_ORG ?= kubeflow
 # container image version