Github action changes (#606)

* Use official name and email for CICD Signed-off-by: Dolpher Du <[email protected]> * Enable GH action to trigger test with released image Signed-off-by: Dolpher Du <[email protected]> * Unify quotation marks usage for repository Signed-off-by: Dolpher Du <[email protected]> --------- Signed-off-by: Dolpher Du <[email protected]>
opea-project · Nov 22, 2024 · 576b25a · 576b25a
1 parent 3a7cb76
commit 576b25a
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 18 deletions.
diff --git a/.github/workflows/_helm-e2e.yaml b/.github/workflows/_helm-e2e.yaml
@@ -11,6 +11,11 @@ on:
         required: true
         type: string
         description: "workload to test, chatqna or common/asr"
+      dockerhub:
+        default: "false"
+        required: false
+        type: string
+        description: "Set to true if you want to use released docker images at dockerhub. By default using internal docker registry."
       tag:
         default: "latest"
         required: false
@@ -81,8 +86,13 @@ jobs:
           CHART_MOUNT=/home/$USER_ID/.cache/huggingface/hub
           HFTOKEN=$(cat /home/$USER_ID/.cache/huggingface/token)
           pushd helm-charts
-          # insert a prefix before opea/.*, the prefix is OPEA_IMAGE_REPO
-          find . -name '*values.yaml' -type f -exec sed -i "s#repository: opea/*#repository: ${OPEA_IMAGE_REPO}opea/#g" {} \;
+          if [ "${{ inputs.dockerhub }}" = "true" ]; then
+            echo "Use released docker images"
+          else
+            echo "Use internal docker registry"
+            # insert a prefix before opea/.*, the prefix is OPEA_IMAGE_REPO
+            find . -name '*values.yaml' -type f -exec sed -i "s#repository: opea/*#repository: ${OPEA_IMAGE_REPO}opea/#g" {} \;
+          fi
           # set OPEA image tag to ${{ inputs.tag }}
           find . -name '*values.yaml' -type f -exec sed -i 's#tag: "latest"#tag: ${{ inputs.tag }}#g' {} \;
           # set huggingface token

diff --git a/.github/workflows/manual-freeze-tag.yaml b/.github/workflows/manual-freeze-tag.yaml
@@ -37,9 +37,9 @@ jobs:
 
       - name: Set up Git
         run: |
-          git config --global user.name "NeuralChatBot"
-          git config --global user.email "[email protected]"
-          git remote set-url origin https://NeuralChatBot:"${{ secrets.ACTION_TOKEN }}"@github.com/opea-project/GenAIInfra.git
+          git config --global user.name "CICD-at-OPEA"
+          git config --global user.email "[email protected]"
+          git remote set-url origin https://CICD-at-OPEA:"${{ secrets.ACTION_TOKEN }}"@github.com/opea-project/GenAIInfra.git
 
       - name: Run script
         env:

diff --git a/.github/workflows/manual-helm-cd-workflow.yaml b/.github/workflows/manual-helm-cd-workflow.yaml
@@ -10,6 +10,11 @@ on:
         required: false
         type: string
         description: "workloads to test, empty for testing all helm charts"
+      dockerhub:
+        default: "false"
+        required: false
+        type: string
+        description: "Set to true if you want to use released docker images at dockerhub. By default using internal docker registry."
       tag:
         default: "latest"
         description: "Image tag to be tested"
@@ -98,6 +103,7 @@ jobs:
     uses: ./.github/workflows/_helm-e2e.yaml
     with:
       tag: ${{ inputs.tag }}
+      dockerhub: ${{ inputs.dockerhub }}
       workload: ${{ matrix.directory }}/${{ matrix.example }}
       hardware: ${{ matrix.hardware }}
       valuefile: ${{ matrix.valuefile }}

diff --git a/.github/workflows/manual-release-charts.yaml b/.github/workflows/manual-release-charts.yaml
@@ -71,9 +71,9 @@ jobs:
           #   # Insert copyright to avoid warnings
           #   sed -i '1s/^/# Copyright (C) 2024 Intel Corporation\n# SPDX-License-Identifier: Apache-2.0\n\n/' index.yaml
 
-          #   git config --global user.name "NeuralChatBot"
-          #   git config --global user.email "[email protected]"
-          #   git remote set-url origin https://NeuralChatBot:"${{ secrets.ACTION_TOKEN }}"@github.com/opea-project/GenAIInfra.git
+          #   git config --global user.name "CICD-at-OPEA"
+          #   git config --global user.email "[email protected]"
+          #   git remote set-url origin https://CICD-at-OPEA:"${{ secrets.ACTION_TOKEN }}"@github.com/opea-project/GenAIInfra.git
 
           #   git status
           #   git add .
@@ -84,7 +84,7 @@ jobs:
            echo "Publish charts version ${{ inputs.version }}to ghcr"
            echo "${{ secrets.ACTION_TOKEN }}" | helm registry login ghcr.io -u test --password-stdin
            for chart in *-${{ inputs.version }}.tgz; do
-             echo "Publishing ${chart}\n"
+             echo "Publishing ${chart}"
              helm push ${chart} oci://ghcr.io/opea-project/charts
            done
           fi
diff --git a/helm-charts/chatqna/values.yaml b/helm-charts/chatqna/values.yaml
@@ -57,7 +57,7 @@ guardrails-usvc:
 # Uncomment the following lines
 # chatqna-ui:
 #   image:
-#     repository: "opea/chatqna-ui"
+#     repository: opea/chatqna-ui
 #     tag: "latest"
 #   containerPort: "5173"
 

diff --git a/helm-charts/visualqna/values.yaml b/helm-charts/visualqna/values.yaml
@@ -56,14 +56,6 @@ visualqna-ui:
   BACKEND_SERVICE_ENDPOINT: "/v1/visualqna"
   containerPort: 5173
 
-# If you would like to switch to traditional UI image
-# Uncomment the following lines
-# visualqna-ui:
-#   image:
-#     repository: "opea/visualqna-ui"
-#     tag: "latest"
-#   containerPort: "5173"
-
 global:
   http_proxy: ""
   https_proxy: ""