Skip to content

Fix image scan _get-image-list.yml #941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lvliang-intel merged 5 commits into from
Nov 22, 2024
Merged

Fix image scan _get-image-list.yml #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
37027ae
fix corner issue
chensuyue Nov 21, 2024
6481803
for test
chensuyue Nov 21, 2024
ce3b7c9
fix issue
chensuyue Nov 21, 2024
1b7063f
fix images
chensuyue Nov 21, 2024
bbb3930
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/_get-image-list.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
- name: Set Matrix
id: get-matrix
run: |
set -x
image_list=[]
if [[ ! -z "${{ inputs.services }}" ]]; then
pip install yq
Expand All @@ -44,7 +45,11 @@ jobs:
docker_compose_yml=${{ github.workspace }}/.github/workflows/docker/compose/${service}-compose.yaml
if [ -f "$docker_compose_yml" ]; then
build_list=$(bash ${{ github.workspace }}/.github/workflows/scripts/get_cicd_list.sh "${{ inputs.mode }}" $docker_compose_yml)
image_list=$(echo $build_list| jq -R 'split(",")' | jq -s 'add')
if [ -n "$build_list" ]; then
images=($(echo ${build_list} | tr ',' ' '))
input_image_list=$(printf '%s\n' "${images[@]}" | sort -u | jq -R '.' | jq -sc '.')
image_list=$(echo ${image_list} | jq -s '.[0] + .[1] | unique' - <(echo ${input_image_list}))
fi
fi
done
fi
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/scripts/get_cicd_list.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

WORKPATH=$PWD
# echo "mode is: "$1 "compose file is: "$2
git clone https://github.com/opea-project/GenAIExamples.git
if [ ! -d GenAIExamples ]; then
git clone https://github.com/opea-project/GenAIExamples.git
fi
all_ci_yaml=$(find GenAIExamples -name "build.yaml")
all_ci_lists=$(grep '^[[:space:]]\{2\}[a-zA-Z0-9_-]\+:' $all_ci_yaml | awk -F: '{print$2}' | sed 's/^[[:space:]]\+//' | tr '\n' ',' | sed 's/,$//')

Expand Down
Loading