Skip to content

Commit fe1dd0e

Browse files
PavanNikhileshharman-kalra
authored andcommitted
ci: use DAO version for OVS
Use DAO version for OVS instead of DPDK version. Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com> Change-Id: I18a3c09e505e68c340ed338268538cb27de081ee Reviewed-on: https://sj1git1.cavium.com/c/IP/SW/dataplane/dpu-offload/+/136688 Tested-by: Harman Kalra <hkalra@marvell.com> Reviewed-by: Harman Kalra <hkalra@marvell.com> Reviewed-on: https://sj1git1.cavium.com/c/IP/SW/dataplane/dpu-offload/+/136693 Tested-by: sa_ip-toolkits-Jenkins <sa_ip-toolkits-jenkins@marvell.com>
1 parent 70e88d9 commit fe1dd0e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.github/workflows/build-cn10k-ovs.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,17 +110,17 @@ jobs:
110110
cd "${PWD}/install"
111111
echo 'Source: Open vSwitch' > debian/control
112112
echo 'Package: ovs-'$OVS_VERSION'-cn10k'$PKG_POSTFIX >> DEBIAN/control
113-
echo 'Version: '$DPDK_PKG_VERSION >> DEBIAN/control
113+
echo 'Version: '$PKG_VERSION_NAME >> DEBIAN/control
114114
echo "Depends: `dpkg-shlibdeps -O usr/local/sbin/ovs-vswitchd | awk -F'Depends=' '{print $2}'`, dpdk-"$DPDK_BASE_PKG_VERSION"-cn10k (= "$DPDK_PKG_VERSION")" >> DEBIAN/control
115115
echo "Maintainer: Jerin Jacob (jerinj@marvell.com)" >> DEBIAN/control
116116
echo "Architecture: arm64" >> DEBIAN/control
117117
echo "Homepage: https://www.openvswitch.org/" >> DEBIAN/control
118118
echo "Description: Open vSwitch (OVS) for Marvell Octeon 10" >> DEBIAN/control
119119
rm -rf debian
120120
cd -
121-
mv "${PWD}/install" "${PWD}/ovs-${OVS_VERSION}-cn10k${PKG_POSTFIX}_${DPDK_PKG_VERSION}_arm64"
122-
dpkg --build "${PWD}/ovs-${OVS_VERSION}-cn10k${PKG_POSTFIX}_${DPDK_PKG_VERSION}_arm64"
123-
cp "${PWD}/ovs-${OVS_VERSION}-cn10k${PKG_POSTFIX}_${DPDK_PKG_VERSION}_arm64.deb" /artifacts/.
121+
mv "${PWD}/install" "${PWD}/ovs-${OVS_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64"
122+
dpkg --build "${PWD}/ovs-${OVS_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64"
123+
cp "${PWD}/ovs-${OVS_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" /artifacts/.
124124
- name: Export version name
125125
id: artifacts
126126
run: |
@@ -146,16 +146,16 @@ jobs:
146146
env:
147147
GH_TOKEN: ${{ github.token }}
148148
run: |
149-
gh release delete ovs-${{ steps.artifacts.outputs.OVS_VERSION }}-cn10k-${{ steps.artifacts.outputs.DPDK_PKG_VERSION }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.TAG }} --cleanup-tag -y
149+
gh release delete ovs-${{ steps.artifacts.outputs.OVS_VERSION }}-cn10k-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.TAG }} --cleanup-tag -y
150150
continue-on-error: true
151151
- name: Release OVS cn10k package
152152
uses: softprops/action-gh-release@v2.0.4
153153
if: ${{ github.event_name == 'push' }}
154154
with:
155155
draft: false
156-
tag_name: ovs-${{ steps.artifacts.outputs.OVS_VERSION }}-cn10k-${{ steps.artifacts.outputs.DPDK_PKG_VERSION }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.TAG }}
156+
tag_name: ovs-${{ steps.artifacts.outputs.OVS_VERSION }}-cn10k-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.TAG }}
157157
files: |
158-
${{ github.workspace }}/artifacts/ovs-${{ steps.artifacts.outputs.OVS_VERSION }}-cn10k${{ steps.artifacts.outputs.PKG_POSTFIX }}_${{ steps.artifacts.outputs.DPDK_PKG_VERSION }}_arm64.deb
158+
${{ github.workspace }}/artifacts/ovs-${{ steps.artifacts.outputs.OVS_VERSION }}-cn10k${{ steps.artifacts.outputs.PKG_POSTFIX }}_${{ steps.artifacts.outputs.PKG_VERSION_NAME }}_arm64.deb
159159
- name: Dispatch package update event
160160
if: ${{ github.event_name == 'push' }}
161161
run: |
@@ -166,7 +166,7 @@ jobs:
166166
-H "X-GitHub-Api-Version: 2022-11-28" \
167167
https://api.github.com/repos/marvellembeddedprocessors/packages/dispatches \
168168
-d '{"event_type":"dispatch-event", "client_payload": {"package" : "ovs",
169-
"tag": "ovs-${{ steps.artifacts.outputs.OVS_VERSION }}-cn10k-${{ steps.artifacts.outputs.DPDK_PKG_VERSION }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.TAG }}",
169+
"tag": "ovs-${{ steps.artifacts.outputs.OVS_VERSION }}-cn10k-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.TAG }}",
170170
"dpdk_tag" : "dpdk-cn10k-${{ steps.artifacts.outputs.DPDK_BASE_PKG_VERSION }}_${{ steps.artifacts.outputs.DPDK_PKG_VERSION }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.DPDK_PKG_VERSION }}",
171171
"has_dpdk" : "true", "distro" : "${{ steps.artifacts.outputs.DISTRO }}",
172172
"platform" : "cn10k", "devel": "${{ steps.artifacts.outputs.IS_DEVEL }}"}}'

0 commit comments

Comments
 (0)