Skip to content

Commit f52232e

Browse files
author
Ruomeng Hao
authored
Merge pull request #35 from ruomengh/ci
Update CI process
2 parents f4535c0 + 428ba97 commit f52232e

File tree

2 files changed

+17
-37
lines changed

2 files changed

+17
-37
lines changed

.github/workflows/e2e-test-k8s.yaml

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,29 @@ name: Run CCNP E2E test
22
on:
33
schedule:
44
- cron: '0 7 * * *'
5-
push:
6-
branches:
7-
- main
8-
paths:
9-
- '.github/workflows/e2e-test-k8s.yaml'
10-
- 'deployment/**'
11-
- 'container/**'
12-
- 'sdk/**'
135
pull_request:
146
paths:
157
- '.github/workflows/e2e-test-k8s.yaml'
168
- 'deployment/**'
179
- 'container/**'
1810
- 'sdk/**'
1911
workflow_dispatch:
20-
inputs:
21-
image_registey:
22-
type: string
23-
default: gar-registry.caas.intel.com/cpio
24-
required: true
25-
tag:
26-
type: string
27-
default: 0.3
28-
required: true
12+
2913
jobs:
3014
E2E_test:
3115
runs-on: tdvm-ut
3216
steps:
3317
- name: Checkout code
3418
uses: actions/[email protected]
19+
- name: Build and push CCNP images
20+
run: |
21+
sudo ./container/build.sh -r gar-registry.caas.intel.com/cpio -g latest -c ccnp-server ccnp-example ccnp-device-plugin
3522
- name: Deploy CCNP server
3623
run: |
37-
sudo ./deployment/kubernetes/script/deploy-ccnp.sh -r ${{ inputs.image_registey }} -g ${{ inputs.tag }} -d
24+
sudo ./deployment/kubernetes/script/deploy-ccnp.sh -r gar-registry.caas.intel.com/cpio -g latest -d
3825
- name: Deploy CCNP test pod
3926
run: |
40-
sudo ./deployment/kubernetes/script/deploy-ccnp-example.sh -r ${{ inputs.image_registey }} -g ${{ inputs.tag }} -d
27+
sudo ./deployment/kubernetes/script/deploy-ccnp-example.sh -r gar-registry.caas.intel.com/cpio -g latest -d
4128
- name: Run Test
4229
run: |
43-
sudo ./test/e2e-test/ci-e2e-test.sh
30+
sudo ./test/ci-test/ci-e2e-test.sh

test/ci-test/ci-e2e-test.sh

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
set -o errexit
77

8-
PY_WORK_DIR='test/py-test'
9-
GO_WORK_DIR='test/go-test/test-cases'
8+
PY_WORK_DIR='test/ci-test/py-test'
109

1110
for i in {1..3}
1211
do
@@ -26,20 +25,14 @@ if [ -z "$POD_NAME" ]; then
2625
fi
2726

2827

29-
# Run python test cases
30-
if $PY_FLAG
31-
then
32-
kubectl exec -it "$POD_NAME" -- pytest -v ${PY_WORK_DIR}
33-
fi
28+
# Run python tests
29+
echo "--------> Run python test........."
30+
kubectl exec -it "$POD_NAME" -- pytest -v ${PY_WORK_DIR}
3431

35-
# Run golang test cases
36-
if $GO_FLAG
37-
then
38-
kubectl exec -it "$POD_NAME" -- bash -c "pushd ${GO_WORK_DIR};go test -v;popd "
39-
fi
32+
# Run go tests
33+
echo "--------> Run go test........."
34+
kubectl exec -it "$POD_NAME" -- ./go-sdk-example
4035

41-
# Run rust test cases
42-
if $GO_FLAG
43-
then
44-
kubectl exec -it "$POD_NAME" -- bash -c "pushd ${GO_WORK_DIR};go test -v;popd "
45-
fi
36+
# Run rust tests
37+
echo "--------> Run rust test........."
38+
kubectl exec -it "$POD_NAME" -- ./rust-sdk-example

0 commit comments

Comments
 (0)