From 065451095f74d2ca97b1ec53b694b47625fc9746 Mon Sep 17 00:00:00 2001
From: sallyom <somalley@redhat.com>
Date: Thu, 11 Apr 2024 14:20:11 -0400
Subject: [PATCH] fix

Signed-off-by: sallyom <somalley@redhat.com>
---
 .github/workflows/model_servers.yaml     | 26 ++++++++++++++++--------
 .github/workflows/rag.yaml               | 17 ++++++++++------
 .github/workflows/testing-framework.yaml | 11 +++++++---
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/model_servers.yaml b/.github/workflows/model_servers.yaml
index 83d44a235..d20521ec7 100644
--- a/.github/workflows/model_servers.yaml
+++ b/.github/workflows/model_servers.yaml
@@ -27,15 +27,23 @@ jobs:
           - image_name: llamacpp_python
             model: mistral
             flavor: base
-          - image_name: llamacpp_python_vulkan
-            model: mistral
-            flavor: vulkan
+            directory: llamacpp_python
+            platforms: linux/amd64,linux/arm64
+          #- image_name: llamacpp_python_vulkan
+          #  model: mistral
+          #  flavor: vulkan
+          #  directory: llamacpp_python
+          #  platforms: linux/arm64
           - image_name: llamacpp_python_cuda
             model: mistral
             flavor: cuda
+            directory: llamacpp_python
+            platforms: linux/amd64
           - image_name: whispercpp
             model: whisper-small
             flavor: base
+            directory: whispercpp
+            platforms: linux/amd64,linux/arm64
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -58,13 +66,13 @@ jobs:
         uses: redhat-actions/buildah-build@v2.13
         with:
           image: ${{ env.REGISTRY }}/${{ github.repository_owner}}/${{ matrix.image_name }}
-          platforms: linux/amd64, linux/arm64
+          platforms: ${{ matrix.platforms }}
           tags: latest
-          containerfiles: ./model_servers/${{ matrix.image_name }}/${{ matrix.flavor }}/Containerfile
-          context: model_servers/${{ matrix.image_name }}/
+          containerfiles: ./model_servers/${{ matrix.directory }}/${{ matrix.flavor }}/Containerfile
+          context: model_servers/${{ matrix.directory }}/
 
       - name: Download model
-        working-directory: ./model_servers/${{ matrix.image_name }}/
+        working-directory: ./model_servers/${{ matrix.directory }}/
         run: make ${{ matrix.model }}
 
       - name: Set up Python
@@ -73,11 +81,11 @@ jobs:
           python-version: '3.11'
 
       - name: Install python dependencies
-        working-directory: ./model_servers/${{ matrix.image_name }}/
+        working-directory: ./model_servers/${{ matrix.directory }}/
         run: make install
 
       - name: Run tests
-        working-directory: ./model_servers/${{ matrix.image_name }}/
+        working-directory: ./model_servers/${{ matrix.directory }}/
         run: make test
         env:
           IMAGE_NAME: ${{ matrix.image_name }}
diff --git a/.github/workflows/rag.yaml b/.github/workflows/rag.yaml
index b953a8946..3fbe96ef2 100644
--- a/.github/workflows/rag.yaml
+++ b/.github/workflows/rag.yaml
@@ -4,15 +4,15 @@ on:
   pull_request:
     branches:
       - main
-    # paths:
-    #   - ./recipes/natural_language_processing/rag/**
-    #   - .github/workflows/rag.yaml
+    paths:
+      - ./recipes/natural_language_processing/rag/**
+      - .github/workflows/rag.yaml
   push:
     branches:
       - main
-    # paths:
-    #   - ./recipes/natural_language_processing/rag/**
-    #   - .github/workflows/rag.yaml
+    paths:
+      - ./recipes/natural_language_processing/rag/**
+      - .github/workflows/rag.yaml
 
   workflow_dispatch:
 
@@ -32,6 +32,11 @@ jobs:
         ports:
           - 5000:5000
     steps:
+      - name: Remove unnecessary files
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+
       - uses: actions/checkout@v4.1.1
 
       - name: Install qemu dependency
diff --git a/.github/workflows/testing-framework.yaml b/.github/workflows/testing-framework.yaml
index 400d2c9d0..74f3b4b0a 100644
--- a/.github/workflows/testing-framework.yaml
+++ b/.github/workflows/testing-framework.yaml
@@ -88,7 +88,7 @@ jobs:
         working-directory: terraform-test-environment-module
 
       - name: Ansible Collections
-        run: ansible-galaxy install -r ./provision/requirements.yml
+        run: ansible-galaxy install -r ./main/recipes/${{ matrix.app_path }}/provision/requirements.yml
         working-directory: ./main/recipes/${{ matrix.app_path }}
 
       - name: Provision
@@ -144,7 +144,7 @@ jobs:
       matrix:
         include:
           - image: llamacpp_python
-          - image: llamacpp_python_vulkan
+          #- image: llamacpp_python_vulkan
           - image: llamacpp_python_cuda
           - image: whispercpp
           - image: chatbot
@@ -186,14 +186,19 @@ jobs:
       matrix:
         include:
           - app_path: natural_language_processing/chatbot
+            app: chatbot
           - app_path: natural_language_processing/summarizer
+            app: summarizer
           - app_path: natural_language_processing/codegen
+            app: codegen
           - app_path: natural_language_processing/rag
+            app: rag
           - app_path: audio/audio_to_text
+            app: transcribe
     steps:
       - uses: actions/checkout@v4.1.1
 
-      - name: 
+      - name: ${{ matrix.app }} 
         working-directory: ./recipes/${{ matrix.app_path }}
         run: make bootc