From 51ebc03d21effeb5f31e6d5420b40dccf275ceb3 Mon Sep 17 00:00:00 2001 From: Andrii Klymenko Date: Thu, 20 Nov 2025 16:35:14 +0200 Subject: [PATCH 1/4] T7935: Rewrite accel-ppp-ng build to exclude whole build VPP and include VPP required dependencies Modify the workflow to trigger the build and wait for workflow to finish. --- .../trigger-and-wait-rebuild-repo-package.yml | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/trigger-and-wait-rebuild-repo-package.yml diff --git a/.github/workflows/trigger-and-wait-rebuild-repo-package.yml b/.github/workflows/trigger-and-wait-rebuild-repo-package.yml new file mode 100644 index 0000000..093b917 --- /dev/null +++ b/.github/workflows/trigger-and-wait-rebuild-repo-package.yml @@ -0,0 +1,58 @@ +name: Trigger a package build and wait for workflow to finish + +on: + workflow_call: + inputs: + branch: + description: 'PR target branch' + required: true + type: string + default: current + package_name: + description: 'PR package name' + required: true + type: string + REF: + required: false + type: string + default: main + secrets: + REMOTE_OWNER: + description: 'Remote repo owner' + required: true + REMOTE_REUSE_REPO: + description: 'Remote reusable repo name' + required: true + GPG_KEY_ID: + description: 'DEB repo GPG key ID' + required: true + PAT: + description: 'Personal Access Token' + required: true + +jobs: + trigger_package_build: + if: github.event.pull_request.merged == true + runs-on: ubuntu-latest + + steps: + - name: Bullfrog Secure Runner + continue-on-error: true + uses: bullfrogsec/bullfrog@v0.8.4 + with: + egress-policy: audit + + - name: Trigger rebuild for ${{ inputs.package_name }} and wait for workflow to finish + uses: convictional/trigger-workflow-and-wait@v1.6.1 + with: + owner: ${{ secrets.REMOTE_OWNER }} + repo: ${{ secrets.REMOTE_REUSE_REPO }} + github_token: ${{ secrets.PAT }} + github_user: vyosbot + workflow_file_name: build-package.yml + ref: main + wait_interval: 60 + client_payload: '{"ref": "${{ inputs.REF }}", "inputs":{"package_name":"${{ inputs.package_name }}", "gpg_key_id": "${{ secrets.GPG_KEY_ID }}", "package_branch": "${{ inputs.branch }}", "pat": "${{ secrets.PAT }}"}}' + propagate_failure: true + trigger_workflow: true + wait_workflow: true From c151670d477087884648cd0c37cdcaa11d4ca815 Mon Sep 17 00:00:00 2001 From: Andrii Klymenko Date: Mon, 24 Nov 2025 13:30:34 +0200 Subject: [PATCH 2/4] T7935: Rewrite accel-ppp-ng build to exclude whole build VPP and include VPP required dependencies Change the client payload string to exclude extra parameters. --- .github/workflows/trigger-and-wait-rebuild-repo-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger-and-wait-rebuild-repo-package.yml b/.github/workflows/trigger-and-wait-rebuild-repo-package.yml index 093b917..50fe991 100644 --- a/.github/workflows/trigger-and-wait-rebuild-repo-package.yml +++ b/.github/workflows/trigger-and-wait-rebuild-repo-package.yml @@ -52,7 +52,7 @@ jobs: workflow_file_name: build-package.yml ref: main wait_interval: 60 - client_payload: '{"ref": "${{ inputs.REF }}", "inputs":{"package_name":"${{ inputs.package_name }}", "gpg_key_id": "${{ secrets.GPG_KEY_ID }}", "package_branch": "${{ inputs.branch }}", "pat": "${{ secrets.PAT }}"}}' + client_payload: '{"package_name":"${{ inputs.package_name }}", "gpg_key_id": "${{ secrets.GPG_KEY_ID }}", "package_branch": "${{ inputs.branch }}", "pat": "${{ secrets.PAT }}"}' propagate_failure: true trigger_workflow: true wait_workflow: true From 2722f9f146fc95e268586efdaa54ce0a82050f4c Mon Sep 17 00:00:00 2001 From: Andrii Klymenko Date: Mon, 24 Nov 2025 13:44:49 +0200 Subject: [PATCH 3/4] T7935: Rewrite accel-ppp-ng build to exclude whole build VPP and include VPP required dependencies Use the inputs.REF value to pass to the remote workflow. --- .github/workflows/trigger-and-wait-rebuild-repo-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger-and-wait-rebuild-repo-package.yml b/.github/workflows/trigger-and-wait-rebuild-repo-package.yml index 50fe991..3c54657 100644 --- a/.github/workflows/trigger-and-wait-rebuild-repo-package.yml +++ b/.github/workflows/trigger-and-wait-rebuild-repo-package.yml @@ -50,7 +50,7 @@ jobs: github_token: ${{ secrets.PAT }} github_user: vyosbot workflow_file_name: build-package.yml - ref: main + ref: ${{ inputs.REF }} wait_interval: 60 client_payload: '{"package_name":"${{ inputs.package_name }}", "gpg_key_id": "${{ secrets.GPG_KEY_ID }}", "package_branch": "${{ inputs.branch }}", "pat": "${{ secrets.PAT }}"}' propagate_failure: true From 220b5155c071cfdc9a0bfbbd807b8252a0f0a275 Mon Sep 17 00:00:00 2001 From: Andrii Klymenko Date: Mon, 24 Nov 2025 18:08:34 +0200 Subject: [PATCH 4/4] T7935: Rewrite accel-ppp-ng build to exclude whole build VPP and include VPP required dependencies Update the action version to 1.6.5. --- .github/workflows/trigger-and-wait-rebuild-repo-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger-and-wait-rebuild-repo-package.yml b/.github/workflows/trigger-and-wait-rebuild-repo-package.yml index 3c54657..721e56b 100644 --- a/.github/workflows/trigger-and-wait-rebuild-repo-package.yml +++ b/.github/workflows/trigger-and-wait-rebuild-repo-package.yml @@ -43,7 +43,7 @@ jobs: egress-policy: audit - name: Trigger rebuild for ${{ inputs.package_name }} and wait for workflow to finish - uses: convictional/trigger-workflow-and-wait@v1.6.1 + uses: convictional/trigger-workflow-and-wait@v1.6.5 with: owner: ${{ secrets.REMOTE_OWNER }} repo: ${{ secrets.REMOTE_REUSE_REPO }}