Skip to content

Commit 9ecbcca

Browse files
sramakintelsramakintel
authored
modify ci and test (#860)
Signed-off-by: Srikanth Ramakrishna <[email protected]>
1 parent 0e82cce commit 9ecbcca

File tree

5 files changed

+130
-129
lines changed

5 files changed

+130
-129
lines changed

‎.github/linters/actionlint.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ self-hosted-runner:
1717
- intel-ubuntu-latest
1818
- k8-runners
1919
- kubectl
20+
- clx

‎.github/workflows/container-ci.yaml‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
build-containers:
8686
needs: [setup-build]
8787
env: ${{ matrix }}
88-
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
88+
runs-on: [self-hosted, Linux, X64, clx]
8989
strategy:
9090
matrix: ${{ fromJson(needs.setup-build.outputs.matrix) }}
9191
fail-fast: false
@@ -197,56 +197,56 @@ jobs:
197197
####################################################################################################
198198
# Generic Test Runner
199199
####################################################################################################
200-
setup-test:
201-
needs: [build-containers]
202-
runs-on: ubuntu-latest
203-
outputs:
204-
matrix: ${{ steps.test-matrix.outputs.matrix }}
205-
steps:
206-
- name: Harden Runner
207-
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
208-
with:
209-
egress-policy: audit
210-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
211-
with:
212-
persist-credentials: false
213-
- name: Get Recipes
214-
id: test-matrix
215-
run: echo "matrix=$(find ${INPUTS_GROUP_DIR} -type f -name 'tests.yaml' -exec dirname {} \; | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
216-
env:
217-
INPUTS_GROUP_DIR: ${{ inputs.group_dir }}
218-
test-containers:
219-
needs: [setup-build, setup-test]
220-
if: ${{ needs.setup-test.outputs.matrix != '[]' }}
221-
runs-on: [self-hosted, Linux, "${{ inputs.runner_label || fromJson(needs.setup-build.outputs.matrix).runner_label }}"]
222-
strategy:
223-
matrix:
224-
tests: ${{ fromJson(needs.setup-test.outputs.matrix) }}
225-
experimental: [true]
226-
fail-fast: false
227-
steps:
228-
- uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
229-
with:
230-
egress-policy: audit
231-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
232-
with:
233-
persist-credentials: false
234-
- uses: azure/docker-login@15c4aadf093404726ab2ff205b2cdd33fa6d054c # v2
235-
with:
236-
login-server: ${{ secrets.REGISTRY }}
237-
username: ${{ secrets.REGISTRY_USER }}
238-
password: ${{ secrets.REGISTRY_TOKEN }}
239-
# - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
240-
# with:
241-
# registry: ${{ secrets.REGISTRY }}
242-
# username: ${{ secrets.REGISTRY_USER }}
243-
# password: ${{ secrets.REGISTRY_TOKEN }}
244-
- name: Test Container Group
245-
uses: intel/ai-containers/test-runner@b47fdb7521ea71f718f582ed6dc1de488b546d6c
246-
with:
247-
cache_registry: ${{ secrets.CACHE_REGISTRY }}
248-
recipe_dir: ${{ inputs.group_dir }}
249-
registry: ${{ secrets.REGISTRY }}
250-
repo: ${{ secrets.REPO }}
251-
test_dir: ${{ matrix.tests }}
252-
token: ${{ secrets.GITHUB_TOKEN }}
200+
# setup-test:
201+
# needs: [build-containers]
202+
# runs-on: ubuntu-latest
203+
# outputs:
204+
# matrix: ${{ steps.test-matrix.outputs.matrix }}
205+
# steps:
206+
# - name: Harden Runner
207+
# uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
208+
# with:
209+
# egress-policy: audit
210+
# - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
211+
# with:
212+
# persist-credentials: false
213+
# - name: Get Recipes
214+
# id: test-matrix
215+
# run: echo "matrix=$(find ${INPUTS_GROUP_DIR} -type f -name 'tests.yaml' -exec dirname {} \; | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
216+
# env:
217+
# INPUTS_GROUP_DIR: ${{ inputs.group_dir }}
218+
# test-containers:
219+
# needs: [setup-build, setup-test]
220+
# if: ${{ needs.setup-test.outputs.matrix != '[]' }}
221+
# runs-on: [self-hosted, Linux, "${{ inputs.runner_label || fromJson(needs.setup-build.outputs.matrix).runner_label }}"]
222+
# strategy:
223+
# matrix:
224+
# tests: ${{ fromJson(needs.setup-test.outputs.matrix) }}
225+
# experimental: [true]
226+
# fail-fast: false
227+
# steps:
228+
# - uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
229+
# with:
230+
# egress-policy: audit
231+
# - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
232+
# with:
233+
# persist-credentials: false
234+
# - uses: azure/docker-login@15c4aadf093404726ab2ff205b2cdd33fa6d054c # v2
235+
# with:
236+
# login-server: ${{ secrets.REGISTRY }}
237+
# username: ${{ secrets.REGISTRY_USER }}
238+
# password: ${{ secrets.REGISTRY_TOKEN }}
239+
# # - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
240+
# # with:
241+
# # registry: ${{ secrets.REGISTRY }}
242+
# # username: ${{ secrets.REGISTRY_USER }}
243+
# # password: ${{ secrets.REGISTRY_TOKEN }}
244+
# - name: Test Container Group
245+
# uses: intel/ai-containers/test-runner@b47fdb7521ea71f718f582ed6dc1de488b546d6c
246+
# with:
247+
# cache_registry: ${{ secrets.CACHE_REGISTRY }}
248+
# recipe_dir: ${{ inputs.group_dir }}
249+
# registry: ${{ secrets.REGISTRY }}
250+
# repo: ${{ secrets.REPO }}
251+
# test_dir: ${{ matrix.tests }}
252+
# token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/integration-test.yaml‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -72,62 +72,62 @@ jobs:
7272
with:
7373
group_dir: ${{ matrix.group }}
7474
secrets: inherit
75-
merge-logs:
76-
# download all artifacts across containers
77-
needs: [pipeline-ci]
78-
if: success() || failure()
79-
runs-on: ubuntu-latest
80-
permissions:
81-
pull-requests: write
82-
steps:
83-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v4.0
84-
id: download_artifact_outputs
85-
with:
86-
pattern: test-runner-summary*
87-
merge-multiple: true
88-
- name: Find Summary
89-
id: summary
90-
shell: bash
91-
run: |
92-
SUMMARY=$(find . -maxdepth 1 -name '*summary.json' -print)
93-
if [[ -n "$SUMMARY" ]]; then
94-
echo "summary=true" >> $GITHUB_OUTPUT
95-
echo "Files matching the pattern ./*summary.json"
96-
jq -s '[.[] | .[]]' ./*summary.json > combined.json
97-
echo "Files found in the directory"
98-
else
99-
echo "summary=false" >> $GITHUB_OUTPUT
100-
echo "No files matching the pattern ./*summary.json"
101-
fi
102-
- name: Generate TXT file
103-
if: ${{ steps.summary.outputs.summary != 'false' }}
104-
run: |
105-
{
106-
echo "### Integration Test Results"
107-
echo "Groups Tested: $(jq -r 'map(.Group) | unique | join(", ")' combined.json)"
108-
echo -e "\n<details>"
109-
echo -e " <summary>Results</summary>\n"
110-
echo " | Test-Group | Test | Status |"
111-
echo " |:----:|:---:|:---:|"
112-
jq -r '.[] | " | \(.Group) | \(.Test) | \(.Status) |"' combined.json
113-
echo -e "\n</details>\n"
114-
if jq -e 'all(.[]; .Status == "PASS")' combined.json > /dev/null; then
115-
echo "#### Overall Result: PASS ✅"
116-
else
117-
echo "#### Overall Result: FAIL ❌"
118-
fi
119-
} >> output.txt
120-
- name: PR-comment
121-
if: ${{ steps.summary.outputs.summary != 'false' }}
122-
uses: marocchino/sticky-pull-request-comment@773744901bac0e8cbb5a0dc842800d45e9b2b405 # v2.9.4
123-
with:
124-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
125-
number: ${{ github.event.pull_request.number }}
126-
header: test-runner combined summary
127-
path: output.txt
128-
recreate: true
75+
# merge-logs:
76+
# # download all artifacts across containers
77+
# needs: [pipeline-ci]
78+
# if: success() || failure()
79+
# runs-on: ubuntu-latest
80+
# permissions:
81+
# pull-requests: write
82+
# steps:
83+
# - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v4.0
84+
# id: download_artifact_outputs
85+
# with:
86+
# pattern: test-runner-summary*
87+
# merge-multiple: true
88+
# - name: Find Summary
89+
# id: summary
90+
# shell: bash
91+
# run: |
92+
# SUMMARY=$(find . -maxdepth 1 -name '*summary.json' -print)
93+
# if [[ -n "$SUMMARY" ]]; then
94+
# echo "summary=true" >> $GITHUB_OUTPUT
95+
# echo "Files matching the pattern ./*summary.json"
96+
# jq -s '[.[] | .[]]' ./*summary.json > combined.json
97+
# echo "Files found in the directory"
98+
# else
99+
# echo "summary=false" >> $GITHUB_OUTPUT
100+
# echo "No files matching the pattern ./*summary.json"
101+
# fi
102+
# - name: Generate TXT file
103+
# if: ${{ steps.summary.outputs.summary != 'false' }}
104+
# run: |
105+
# {
106+
# echo "### Integration Test Results"
107+
# echo "Groups Tested: $(jq -r 'map(.Group) | unique | join(", ")' combined.json)"
108+
# echo -e "\n<details>"
109+
# echo -e " <summary>Results</summary>\n"
110+
# echo " | Test-Group | Test | Status |"
111+
# echo " |:----:|:---:|:---:|"
112+
# jq -r '.[] | " | \(.Group) | \(.Test) | \(.Status) |"' combined.json
113+
# echo -e "\n</details>\n"
114+
# if jq -e 'all(.[]; .Status == "PASS")' combined.json > /dev/null; then
115+
# echo "#### Overall Result: PASS ✅"
116+
# else
117+
# echo "#### Overall Result: FAIL ❌"
118+
# fi
119+
# } >> output.txt
120+
# - name: PR-comment
121+
# if: ${{ steps.summary.outputs.summary != 'false' }}
122+
# uses: marocchino/sticky-pull-request-comment@773744901bac0e8cbb5a0dc842800d45e9b2b405 # v2.9.4
123+
# with:
124+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
125+
# number: ${{ github.event.pull_request.number }}
126+
# header: test-runner combined summary
127+
# path: output.txt
128+
# recreate: true
129129
status-check:
130-
needs: [group-diff, pipeline-ci, merge-logs]
130+
needs: [group-diff, pipeline-ci]
131131
runs-on: ubuntu-latest
132132
if: always()
133133
steps:

‎tensorflow/docker-compose.yaml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -94,21 +94,21 @@ services:
9494
command: >
9595
bash -c "python -m jupyter --version"
9696
image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-pip-py${PYTHON_VERSION:-3.11}-itex-${TF_VERSION:-2.15.1}-itex-xpu-jupyter
97-
itex-xpu-dl-essentials:
98-
build:
99-
args:
100-
no_proxy: ''
101-
NO_PROXY: ''
102-
PYTHON_BASE: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-pip-py${PYTHON_VERSION:-3.11}-xpu-dl-essentials
103-
labels:
104-
dependency.idp.pip: false
105-
org.opencontainers.base.name: "intel/python:3.11-full"
106-
org.opencontainers.image.title: "Intel® Extension for TensorFlow XPU Base Image"
107-
org.opencontainers.image.version: ${TF_VER:-2.15.1}-xpu-pip-base
108-
target: itex-xpu-base
109-
command: >
110-
bash -c "source /opt/intel/oneapi/setvars.sh && python -c 'import tensorflow as tf;print(tf.__version__);from tensorflow.python.client import device_lib;print(device_lib.list_local_devices())'"
111-
extends: tf-base
112-
depends_on:
113-
- xpu-dl-essentials
114-
image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-pip-py${PYTHON_VERSION:-3.11}-itex-xpu-dl-essentials
97+
# itex-xpu-dl-essentials:
98+
# build:
99+
# args:
100+
# no_proxy: ''
101+
# NO_PROXY: ''
102+
# PYTHON_BASE: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-pip-py${PYTHON_VERSION:-3.11}-xpu-dl-essentials
103+
# labels:
104+
# dependency.idp.pip: false
105+
# org.opencontainers.base.name: "intel/python:3.11-full"
106+
# org.opencontainers.image.title: "Intel® Extension for TensorFlow XPU Base Image"
107+
# org.opencontainers.image.version: ${TF_VER:-2.15.1}-xpu-pip-base
108+
# target: itex-xpu-base
109+
# command: >
110+
# bash -c "source /opt/intel/oneapi/setvars.sh && python -c 'import tensorflow as tf;print(tf.__version__);from tensorflow.python.client import device_lib;print(device_lib.list_local_devices())'"
111+
# extends: tf-base
112+
# depends_on:
113+
# - xpu-dl-essentials
114+
# image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-pip-py${PYTHON_VERSION:-3.11}-itex-xpu-dl-essentials

‎tensorflow/serving/requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
numpy==2.2.4
22
pillow==11.3.0
3-
requests==2.32.4
3+
requests==2.32.5
44
tensorflow==2.17.0
5-
tensorflow-serving-api==2.19.0
5+
tensorflow-serving-api==2.19.1

0 commit comments

Comments
 (0)