From b3489ed68c598ff100fb5af0541d96960fe86e26 Mon Sep 17 00:00:00 2001 From: Nagendra T P Date: Tue, 27 Aug 2024 20:43:59 +0530 Subject: [PATCH] ci: ovs package without devel terminology Remove devel from package name and change version to only release versions. Signed-off-by: Nagendra T P Change-Id: I459ab766a33f113f79c7aaac6081ec6abad534c0 Reviewed-on: https://sj1git1.cavium.com/c/IP/SW/dataplane/dpu-offload/+/134319 Tested-by: sa_ip-toolkits-Jenkins Reviewed-by: Harman Kalra Reviewed-by: Pavan Nikhilesh Bhagavatula --- .github/workflows/build-ovs.yml | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-ovs.yml b/.github/workflows/build-ovs.yml index 02b7559..7f3ce68 100644 --- a/.github/workflows/build-ovs.yml +++ b/.github/workflows/build-ovs.yml @@ -44,12 +44,9 @@ jobs: id: version run: | mkdir -p "${PWD}/artifacts" - git tag --points-at HEAD > /tmp/tags - [ -s /tmp/tags ] && PKG_POSTFIX= || PKG_POSTFIX=-devel echo "PKG_VERSION_NAME=`cat VERSION`" >> "${PWD}/artifacts/env" echo "DPDK_PKG_VERSION=`cat DPDK_VERSION | grep RELEASE_VERSION | awk -F'=' '{print $2}'`" >> "${PWD}/artifacts/env" echo "DPDK_BASE_PKG_VERSION=`cat DPDK_VERSION | grep BASE_VERSION | awk -F'=' '{print $2}' | awk -F'.' '{print $1"."$2}'`" >> "${PWD}/artifacts/env" - echo "PKG_POSTFIX=${PKG_POSTFIX}" >> "${PWD}/artifacts/env" source "${PWD}/artifacts/env" - uses: uraimo/run-on-arch-action@v2.7.2 name: Build OVS and generate package @@ -107,8 +104,8 @@ jobs: mkdir -p "${PWD}/install/DEBIAN" cd "${PWD}/install" echo 'Source: Open vSwitch' > debian/control - echo 'Package: ovs-'$OVS_VERSION'-cn10k'$PKG_POSTFIX >> DEBIAN/control - echo 'Version: '$PKG_VERSION_NAME >> DEBIAN/control + echo 'Package: ovs-'$OVS_VERSION'-cn10k' >> DEBIAN/control + echo 'Version: '$DPDK_PKG_VERSION >> DEBIAN/control 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 echo "Maintainer: Jerin Jacob (jerinj@marvell.com)" >> DEBIAN/control echo "Architecture: arm64" >> DEBIAN/control @@ -116,23 +113,19 @@ jobs: echo "Description: Open vSwitch (OVS) for Marvell Octeon 10" >> DEBIAN/control rm -rf debian cd - - mv "${PWD}/install" "${PWD}/ovs-${OVS_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" - dpkg --build "${PWD}/ovs-${OVS_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64" - cp "${PWD}/ovs-${OVS_VERSION}-cn10k${PKG_POSTFIX}_${PKG_VERSION_NAME}_arm64.deb" /artifacts/. + mv "${PWD}/install" "${PWD}/ovs-${OVS_VERSION}-cn10k_${DPDK_PKG_VERSION}_arm64" + dpkg --build "${PWD}/ovs-${OVS_VERSION}-cn10k_${DPDK_PKG_VERSION}_arm64" + cp "${PWD}/ovs-${OVS_VERSION}-cn10k_${DPDK_PKG_VERSION}_arm64.deb" /artifacts/. - name: Export version name id: artifacts run: | source "${PWD}/artifacts/env" echo $PKG_VERSION_NAME echo "PKG_VERSION_NAME=${PKG_VERSION_NAME}" >> "$GITHUB_OUTPUT" - echo $PKG_POSTFIX - echo "PKG_POSTFIX=${PKG_POSTFIX}" >> "$GITHUB_OUTPUT" echo $OVS_VERSION echo "OVS_VERSION=${OVS_VERSION}" >> "$GITHUB_OUTPUT" echo $DISTRO echo "DISTRO=${DISTRO}" >> "$GITHUB_OUTPUT" - [[ "$PKG_POSTFIX" == "-devel" ]] && TAG=devel || TAG=${PKG_VERSION_NAME} - echo "TAG=${TAG}" >> "$GITHUB_OUTPUT" echo "DPDK_PKG_VERSION=${DPDK_PKG_VERSION}" >> $GITHUB_OUTPUT echo "DPDK_BASE_PKG_VERSION=${DPDK_BASE_PKG_VERSION}" >> $GITHUB_OUTPUT - name: Delete existing release @@ -140,15 +133,15 @@ jobs: env: GH_TOKEN: ${{ github.token }} run: | - gh release delete ovs-${{ steps.artifacts.outputs.OVS_VERSION }}-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.TAG }} --cleanup-tag -y + gh release delete ovs-${{ steps.artifacts.outputs.OVS_VERSION }}-${{ steps.artifacts.outputs.DPDK_PKG_VERSION }}-${{ steps.artifacts.outputs.DISTRO }} --cleanup-tag -y continue-on-error: true - name: Release OVS cn10k package uses: softprops/action-gh-release@v2.0.4 if: ${{ github.event_name == 'push' }} with: - tag_name: ovs-${{ steps.artifacts.outputs.OVS_VERSION }}-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.TAG }} + tag_name: ovs-${{ steps.artifacts.outputs.OVS_VERSION }}-${{ steps.artifacts.outputs.DPDK_PKG_VERSION }}-${{ steps.artifacts.outputs.DISTRO }} files: | - ${{ github.workspace }}/artifacts/ovs-${{ steps.artifacts.outputs.OVS_VERSION }}-cn10k${{ steps.artifacts.outputs.PKG_POSTFIX }}_${{ steps.artifacts.outputs.PKG_VERSION_NAME }}_arm64.deb + ${{ github.workspace }}/artifacts/ovs-${{ steps.artifacts.outputs.OVS_VERSION }}-cn10k_${{ steps.artifacts.outputs.DPDK_PKG_VERSION }}_arm64.deb - name: Dispatch package update event if: ${{ github.event_name == 'push' }} run: | @@ -159,6 +152,6 @@ jobs: -H "X-GitHub-Api-Version: 2022-11-28" \ https://api.github.com/repos/marvellembeddedprocessors/packages/dispatches \ -d '{"event_type":"dispatch-event", "client_payload": {"package" : "ovs", - "tag": "ovs-${{ steps.artifacts.outputs.OVS_VERSION }}-${{ steps.artifacts.outputs.PKG_VERSION_NAME }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.artifacts.outputs.TAG }}", + "tag": "ovs-${{ steps.artifacts.outputs.OVS_VERSION }}-${{ steps.artifacts.outputs.DPDK_PKG_VERSION }}-${{ steps.artifacts.outputs.DISTRO }}", "dpdk_tag" : "dpdk-${{ steps.version.outputs.DPDK_BASE_PKG_VERSION }}_${{ steps.version.outputs.DPDK_PKG_VERSION }}-${{ steps.artifacts.outputs.DISTRO }}-${{ steps.version.outputs.DPDK_PKG_VERSION }}", "has_dpdk" : "true", "distro" : "${{ steps.artifacts.outputs.DISTRO }}"}}' \ No newline at end of file