add integration tests

Signed-off-by: sallyom <[email protected]>
containers · Apr 14, 2024 · 294ef3d · 294ef3d
1 parent f6df364
commit 294ef3d
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 18 deletions.
diff --git a/.github/workflows/testing-framework.yaml b/.github/workflows/testing-framework.yaml
@@ -2,13 +2,13 @@ name: Testing Framework
 
 on:
   schedule: # schedule the job to run every hour
-   - cron: '0 * * * *'
+   - cron: '0 */6 * * *'
 
   workflow_dispatch:
 
-  # pull_request: ## temporary for debugging development purposes
-  #   branches:
-  #     - main
+  pull_request: ## temporary for debugging development purposes
+    branches:
+      - main
 
 env:
   TF_VAR_aws_region: "eu-west-2"
@@ -32,7 +32,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
+        app_path:
+          - natural_language_processing/chatbot
+          - natural_language_processing/summarizer
+          - natural_language_processing/codegen
+          - natural_language_processing/rag
+          - audio/audio_to_text
+        system:
           - arch: amd64
             aws_image_type: t3a.medium	
             aws_ami_architecture: x86_64
@@ -71,8 +77,8 @@ jobs:
         run: terraform apply -auto-approve -lock=false
         working-directory: terraform-test-environment-module
         env:
-          TF_VAR_aws_instance_type: ${{ matrix.aws_image_type }}
-          TF_VAR_aws_ami_architecture: ${{ matrix.aws_ami_architecture }}
+          TF_VAR_aws_instance_type: ${{ matrix.system.aws_image_type }}
+          TF_VAR_aws_ami_architecture: ${{ matrix.system.aws_ami_architecture }}
 
       - name: Terraform Output
         id: terraform-output
@@ -84,11 +90,11 @@ jobs:
 
       - name: Ansible Collections
         run: ansible-galaxy install -r ./provision/requirements.yml
-        working-directory: ./main/recipes/natural_language_processing/chatbot
+        working-directory: ./main/recipes/${{ matrix.app_path }}
 
       - name: Provision
         run: |
-          ansible-playbook ./main/recipes/natural_language_processing/chatbot/provision/playbook.yml \
+          ansible-playbook ./main/recipes/${{ matrix.app_path }}/provision/playbook.yml \
             -i terraform-test-environment-module/hosts.ini \
             --private-key=terraform-test-environment-module/${{ steps.terraform-output.outputs.pem_filename }}
         env:
@@ -100,11 +106,11 @@ jobs:
           python-version: '3.11'
 
       - name: Install Dependencies
-        working-directory: ./main/recipes/natural_language_processing/chatbot
+        working-directory: ./main/recipes/${{ matrix.app_path }}
         run: make install
 
       - name: Run Integration Tests
-        working-directory: ./main/recipes/natural_language_processing/chatbot
+        working-directory: ./main/recipes/${{ matrix.app_path }}
         run: make integration-tests
         env:
           URL: ${{ steps.terraform-output.outputs.url }}
@@ -115,8 +121,8 @@ jobs:
         run: terraform destroy -auto-approve -lock=false
         working-directory: terraform-test-environment-module
         env:
-          TF_VAR_aws_instance_type: ${{ matrix.aws_image_type }}
-          TF_VAR_aws_ami_architecture: ${{ matrix.aws_ami_architecture }}
+          TF_VAR_aws_instance_type: ${{ matrix.system.aws_image_type }}
+          TF_VAR_aws_ami_architecture: ${{ matrix.system.aws_ami_architecture }}
 
       - name: Publish Job Results to Slack
         id: slack
@@ -139,8 +145,14 @@ jobs:
       matrix:
         include:
           - image: llamacpp_python
+          #- image: llamacpp_python_vulkan
+          - image: llamacpp_python_cuda
           - image: whispercpp
           - image: chatbot
+          - image: summarizer
+          - image: codegen
+          - image: rag
+          - image: transcribe
     steps:
       - name: Login to registry
         uses: redhat-actions/[email protected]
@@ -167,14 +179,27 @@ jobs:
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
 
-  test-make-targets:
+  test-make-bootc:
     if: github.repository == 'containers-mirror/ai-lab-recipes'
     runs-on: ubuntu-22.04-2core
+    strategy:
+      fail-fast: false
+      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/[email protected]
-
-      - name: chatbot
-        working-directory: ./recipes/natural_language_processing/chatbot
+      - name: ${{ matrix.app }} 
+        working-directory: ./recipes/${{ matrix.app_path }}
         run: make bootc
 
       - name: Publish Job Results to Slack

diff --git a/recipes/common/Makefile.common b/recipes/common/Makefile.common
@@ -201,7 +201,10 @@ functional-tests:
 	fi;
 
 .PHONY: integration-tests
-integration-tests:
+run-integration-tests: clean
+
+.PHONY: run-integration-tests
+run-integration-tests:
 	@if [[ -n "$(LOCAL_CHROMEDRIVER_EXISTS)" ]]; then \
 		URL=${URL} IMAGE_NAME=${IMAGE_NAME} REGISTRY=${REGISTRY} pytest -vvv --driver=Chrome --driver-path=$(CHROMEDRIVER_INSTALLATION_PATH)/chromedriver ${RELATIVE_TESTS_PATH}/integration; \
 	else \