Skip to content

Commit

Permalink
kube-ovn-dpdk building need its dpdk base img (#3371)
Browse files Browse the repository at this point in the history
Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
  • Loading branch information
bobz965 authored and zhangbingbing2 committed Nov 6, 2023
1 parent b0efd5a commit a9cbe02
Showing 1 changed file with 18 additions and 4 deletions.
22 changes: 18 additions & 4 deletions .github/workflows/build-x86-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- uses: docker/setup-buildx-action@v2
if: steps.check.outputs.buildx == 1

- name: Build
- name: Build kube-ovn-base image
id: build
if: steps.check.outputs.buildx == 1
run: |
Expand All @@ -58,9 +58,6 @@ jobs:
make base-tar-amd64
echo build-base=1 >> "$GITHUB_OUTPUT"
fi
if git diff --name-only HEAD^ HEAD | grep -q ^dist/images/Dockerfile.base-dpdk$; then
make base-amd64-dpdk
fi
- name: Upload base images to artifact
if: steps.build.outputs.build-base == 1
Expand All @@ -69,6 +66,23 @@ jobs:
name: kube-ovn-base
path: image-amd64.tar

- name: Build kube-ovn-base-dpdk image
id: build
if: steps.check.outputs.buildx == 1
run: |
if git diff --name-only HEAD^ HEAD | grep -q ^dist/images/Dockerfile.base-dpdk$; then
make base-amd64-dpdk
echo build-base-dpdk=1 >> "$GITHUB_OUTPUT"
fi
- name: Upload base-dpdk images to artifact
if: steps.build.outputs.build-base-dpdk == 1
uses: actions/upload-artifact@v3
with:
name: kube-ovn-base-dpdk
path: image-amd64-dpdk.tar


build-kube-ovn:
name: Build kube-ovn
runs-on: ubuntu-22.04
Expand Down

0 comments on commit a9cbe02

Please sign in to comment.