merge with main, fixes

defenseunicorns · Sep 10, 2024 · 71476f4 · 71476f4
2 parents 2893f7c + caf4f9c
commit 71476f4
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 55 deletions.
diff --git a/.github/workflows/e2e-registry1-weekly.yaml b/.github/workflows/e2e-registry1-weekly.yaml
@@ -39,15 +39,18 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           # x-release-please-start-version
-          ref: "v0.12.2"
+          ref: "caf4f9c3093a55a003b49fcbf05c03221be6a232" # 0.12.2 w/ integration tests turned-on
           # x-release-please-end
 
       - name: Setup Python
         uses: ./.github/actions/python
 
-      # TODO: remove hardcoded uds-cluster action due to incorrect usage in v0.12.2
-      - name: Setup UDS Environment
-        uses: defenseunicorns/uds-common/.github/actions/setup@822dac4452e6815aadcf09f487406ff258756a0c # v0.14.0
+      - name: Install API and SDK Dev Dependencies
+        run : |
+          make install
+
+      - name: Setup UDS Cluster
+        uses: ./.github/actions/uds-cluster
         with:
           registry1Username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
           registry1Password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
@@ -104,22 +107,20 @@ jobs:
           echo "ANON_KEY is set: ${{ steps.generate_secrets.outputs.ANON_KEY != '' }}"
           echo "SERVICE_KEY is set: ${{ steps.generate_secrets.outputs.SERVICE_KEY != '' }}"
 
-      # TODO: enable for post-0.12.2 release of LeapfrogAI
-      # - name: Run Integration Tests
-      #   if: github.sha == 'YOUR_SPECIFIC_COMMIT_SHA'
-      #   env:
-      #     SUPABASE_ANON_KEY: ${{ steps.generate_secrets.outputs.ANON_KEY }}
-      #     SUPABASE_PASS: ${{ steps.generate_secrets.outputs.FAKE_PASSWORD }}
-      #     SUPABASE_EMAIL: integration@uds.dev
-      #     SUPABASE_URL: https://supabase-kong.uds.dev
-      #     # Turn off NIAH tests that are not applicable for integration testing using the Repeater model
-      #     LFAI_RUN_NIAH_TESTS: "false"
-      #   run: |
-      #     uds zarf connect --name=llama-cpp-python-model --namespace=leapfrogai --local-port=50051 --remote-port=50051 &
-      #     while ! nc -z localhost 50051; do sleep 1; done
-
-      #     make test-user-pipeline
-      #     env $(cat .env | xargs) python -m pytest -v -s tests/integration/api
+      - name: Run Integration Tests
+        env:
+          SUPABASE_ANON_KEY: ${{ steps.generate_secrets.outputs.ANON_KEY }}
+          SUPABASE_PASS: ${{ steps.generate_secrets.outputs.FAKE_PASSWORD }}
+          SUPABASE_EMAIL: integration@uds.dev
+          SUPABASE_URL: https://supabase-kong.uds.dev
+          # Turn off NIAH tests that are not applicable for integration testing using the Repeater model
+          LFAI_RUN_NIAH_TESTS: "false"
+        run: |
+          uds zarf connect --name=llama-cpp-python-model --namespace=leapfrogai --local-port=50051 --remote-port=50051 &
+          while ! nc -z localhost 50051; do sleep 1; done
+
+          make test-user-pipeline
+          env $(cat .env | xargs) python -m pytest -v -s tests/integration/api
 
       # Backends
       - name: Run Backend E2E Tests

diff --git a/bundles/latest/cpu/uds-bundle.yaml b/bundles/latest/cpu/uds-bundle.yaml
@@ -4,37 +4,35 @@ kind: UDSBundle
 metadata:
   name: leapfrogai
   description: A UDS bundle for deploying LeapfrogAI
-  # x-release-please-start-version
-  version: 0.12.2
-  # x-release-please-end
+  version: 0.12.2-upstream
 
 packages:
   # Supabase backend for the UI and API to interface with Postgresql
   - name: supabase
-    repository: ghcr.io/defenseunicorns/packages/leapfrogai/supabase
-    ref: 0.12.2
+    repository: ghcr.io/defenseunicorns/packages/uds/leapfrogai/supabase
+    ref: 0.12.2-upstream
 
-  # OpenAI-like API
+  # API
   - name: leapfrogai-api
-    repository: ghcr.io/defenseunicorns/packages/leapfrogai/leapfrogai-api
-    ref: 0.12.2
+    repository: ghcr.io/defenseunicorns/packages/uds/leapfrogai/leapfrogai-api
+    ref: 0.12.2-upstream
 
-  # Model for generic chat and summarization
+  # Chat Model
   - name: llama-cpp-python
-    repository: ghcr.io/defenseunicorns/packages/leapfrogai/llama-cpp-python
-    ref: 0.12.2
+    repository: ghcr.io/defenseunicorns/packages/uds/leapfrogai/llama-cpp-python
+    ref: 0.12.2-upstream
 
-  # Model for providing vector embeddings for text
+  # Text Embeddings Model
   - name: text-embeddings
-    repository: ghcr.io/defenseunicorns/packages/leapfrogai/text-embeddings
-    ref: 0.12.2
+    repository: ghcr.io/defenseunicorns/packages/uds/leapfrogai/text-embeddings
+    ref: 0.12.2-upstream
 
-  # Model for converting audio to text
+  # Transcription Model
   - name: whisper
-    repository: ghcr.io/defenseunicorns/packages/leapfrogai/whisper
-    ref: 0.12.2
+    repository: ghcr.io/defenseunicorns/packages/uds/leapfrogai/whisper
+    ref: 0.12.2-upstream
 
   # UI
   - name: leapfrogai-ui
-    repository: ghcr.io/defenseunicorns/packages/leapfrogai/leapfrogai-ui
-    ref: 0.12.2
+    repository: ghcr.io/defenseunicorns/packages/uds/leapfrogai/leapfrogai-ui
+    ref: 0.12.2-upstream
diff --git a/bundles/latest/gpu/uds-bundle.yaml b/bundles/latest/gpu/uds-bundle.yaml
@@ -4,37 +4,35 @@ kind: UDSBundle
 metadata:
   name: leapfrogai
   description: A UDS bundle for deploying LeapfrogAI
-  # x-release-please-start-version
-  version: 0.12.2
-  # x-release-please-end
+  version: 0.12.2-upstream
 
 packages:
   # Supabase backend for the UI and API to interface with Postgresql
   - name: supabase
-    repository: ghcr.io/defenseunicorns/packages/leapfrogai/supabase
-    ref: 0.12.2
+    repository: ghcr.io/defenseunicorns/packages/uds/leapfrogai/supabase
+    ref: 0.12.2-upstream
 
   # OpenAI-like API
   - name: leapfrogai-api
-    repository: ghcr.io/defenseunicorns/packages/leapfrogai/leapfrogai-api
-    ref: 0.12.2
+    repository: ghcr.io/defenseunicorns/packages/uds/leapfrogai/leapfrogai-api
+    ref: 0.12.2-upstream
 
   # Model for generic chat and summarization
   - name: vllm
-    repository: ghcr.io/defenseunicorns/packages/leapfrogai/vllm
-    ref: 0.12.2
+    repository: ghcr.io/defenseunicorns/packages/uds/leapfrogai/vllm
+    ref: 0.12.2-upstream
 
   # Model for providing vector embeddings for text
   - name: text-embeddings
-    repository: ghcr.io/defenseunicorns/packages/leapfrogai/text-embeddings
-    ref: 0.12.2
+    repository: ghcr.io/defenseunicorns/packages/uds/leapfrogai/text-embeddings
+    ref: 0.12.2-upstream
 
   # Model for converting audio to text
   - name: whisper
-    repository: ghcr.io/defenseunicorns/packages/leapfrogai/whisper
-    ref: 0.12.2
+    repository: ghcr.io/defenseunicorns/packages/uds/leapfrogai/whisper
+    ref: 0.12.2-upstream
 
   # UI
   - name: leapfrogai-ui
-    repository: ghcr.io/defenseunicorns/packages/leapfrogai/leapfrogai-ui
-    ref: 0.12.2
+    repository: ghcr.io/defenseunicorns/packages/uds/leapfrogai/leapfrogai-ui
+    ref: 0.12.2-upstream
diff --git a/packages/api/values/registry1-values.yaml b/packages/api/values/registry1-values.yaml
@@ -2,7 +2,7 @@ api:
   image:
     repository: "registry1.dso.mil/ironbank/opensource/defenseunicorns/leapfrogai/api"
     # x-release-please-start-version
-    tag: "v0.12.2"
+    tag: v0.12.2
     # x-release-please-end
 
   expose: "###ZARF_VAR_EXPOSE_API###"