Merge remote-tracking branch 'upstream/main'

RH-steve-grubb · Nov 30, 2024 · 26901dc · 26901dc
2 parents e30f6f5 + 0bf6f88
commit 26901dc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -4,8 +4,8 @@ on:
   workflow_dispatch:
   push:
     branches:
+      - incubating
       - main
-      - 'release-[0-9]+\.[0-9]+\.[0-9]+'
     tags:
       - 'latest'
       - 'v*'
@@ -40,12 +40,11 @@ jobs:
 
       - name: Set Docker Tag
         run: |
-          if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then
-            echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "${GITHUB_REF}" == refs/heads/release-* ]]; then
-            VERSION="${GITHUB_REF#refs/heads/release-}"
-            echo "TAG=v${VERSION}-latest" >> $GITHUB_ENV
-          elif [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
+          if [[ "${GITHUB_REF}" == "refs/heads/incubating" ]]; then
+            echo "TAG=fast" >> $GITHUB_ENV
+          elif [[ "${GITHUB_REF}" == refs/heads/main ]]; then
+            echo "TAG=stable" >> $GITHUB_ENV
+          elif [[ "${GITHUB_REF}" == refs/tags/odh-v* ]]; then
             TAG="${GITHUB_REF#refs/tags/}"
             echo "TAG=${TAG}" >> $GITHUB_ENV
           else

diff --git a/.github/workflows/verify-odh-model-controller-img-tag.yaml b/.github/workflows/verify-odh-model-controller-img-tag.yaml
@@ -2,7 +2,7 @@ name: Check ODH Model Controller Image Tag
 
 on:
   pull_request:
-    branches: [main, release*]
+    branches: [incubating, main]
     paths:
       - "config/base/params.env"
 
@@ -23,13 +23,15 @@ jobs:
       - name: Compare image tags
         id: compare-tags
         run: |
-          if [ "${{ github.base_ref }}" == "main" ]; then
+          if [ "${{ github.base_ref }}" == "incubating" ]; then
             EXPECTED_TAG="fast"
-          elif [[ "${{ github.base_ref }}" =~ ^release-(.*) ]]; then
-            VERSION=${BASH_REMATCH[1]}
-            EXPECTED_TAG="v$VERSION"
+          elif [[ "${{ github.base_ref }}" == "main" ]]; then
+            EXPECTED_TAG="stable"
+          elif [[ "${GITHUB_REF}" == refs/tags/odh-v* ]]; then
+            TAG="${GITHUB_REF#refs/tags/}"
+            echo "EXPECTED_TAG=${TAG}" >> $GITHUB_ENV
           else
-            echo "Unknown destination branch: ${{ github.base_ref }}"
+            echo "Unknown destination branch: ${{ github.base_ref }} or tag: ${GITHUB_REF}"
             exit 1
           fi
 

diff --git a/config/base/params.env b/config/base/params.env
@@ -1,6 +1,6 @@
-odh-model-controller=quay.io/opendatahub/odh-model-controller:v0.12.0
+odh-model-controller=quay.io/opendatahub/odh-model-controller:stable
 caikit-tgis-image=quay.io/opendatahub/caikit-tgis-serving:stable-2d9db23
 caikit-standalone-image=quay.io/opendatahub/caikit-nlp:stable-994ec60
 tgis-image=quay.io/opendatahub/text-generation-inference:stable-eba83ba
-ovms-image=quay.io/opendatahub/openvino_model_server:2024.3-release-4c8c52c	
+ovms-image=quay.io/opendatahub/openvino_model_server:2024.3-release-4c8c52c
 vllm-image=quay.io/opendatahub/vllm:stable-849f0f5