From d3c90dd77fe46ebbce3bdc04f127b3df95b8c88b Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sun, 24 May 2026 16:55:32 +0300 Subject: [PATCH 1/3] ci/build-yocto: drop invalid git_ref input The commit abd128c41c4f ("Revert "ci: add git_ref input to reusable build workflows"") dropped git_ref input to the build-yocto workflow. Follow that change and drop the invalid input usage from the workflow. Fixes: 8cb4e6b4fe92 ("ci: build-yocto: add github-cache based build skip mechanism") Signed-off-by: Dmitry Baryshkov --- .github/workflows/build-yocto.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-yocto.yml b/.github/workflows/build-yocto.yml index 2120182cc..98ae771f0 100644 --- a/.github/workflows/build-yocto.yml +++ b/.github/workflows/build-yocto.yml @@ -73,7 +73,6 @@ jobs: - uses: actions/checkout@v6 with: persist-credentials: false - ref: ${{ inputs.git_ref }} - name: Download kas lockfile uses: actions/download-artifact@v7 From 834484398c8451c82221afac523301461be3589b Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sun, 24 May 2026 17:19:55 +0300 Subject: [PATCH 2/3] ci/test-distro: use correct input for the name The test-distro workflow doesn't have 'distro' input. Use 'inputs.distro_name' for the job name. Fixes: f5227916e53f ("workflows: refactor test workflow") Signed-off-by: Dmitry Baryshkov --- .github/workflows/test-distro.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-distro.yml b/.github/workflows/test-distro.yml index a487bbce4..2636f5b50 100644 --- a/.github/workflows/test-distro.yml +++ b/.github/workflows/test-distro.yml @@ -43,7 +43,7 @@ on: jobs: prepare-boot-jobs: - name: "Prepare boot jobs for ${{ inputs.distro }}" + name: "Prepare boot jobs for ${{ inputs.distro_name }}" runs-on: ubuntu-latest outputs: jobmatrix: ${{ steps.lava-test-plans.outputs.jobmatrix }} @@ -152,7 +152,7 @@ jobs: echo "boot_result=$BOOT_RESULT" >> "$GITHUB_OUTPUT" prepare-premerge-jobs: - name: "Prepare pre-merge jobs for ${{ inputs.distro }}" + name: "Prepare pre-merge jobs for ${{ inputs.distro_name }}" runs-on: ubuntu-latest needs: boot-job-result # run only if boot jobs are successful From 28f29fb441c6116c72d22e1d40f9c8d29de09a3b Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sun, 24 May 2026 18:49:08 +0300 Subject: [PATCH 3/3] ci/test-pr: ensure the tests are executed from the correct branch Even though the 'Test PR' workflow is being triggered by the workflow runs in the correct branch, the 'Test PR' is still being triggered against the default branch. This was not a problem until the commit 3ac51cf13891 ("ci: switch qcom-distro tests to linux-qcom-next kernel") which created a mismatch between artifacts in the wrynose branch and the expectations of the test worfklows in the master branch. Specify the Git ref to be used to checkout the testing actions and specify it explictly for the 'Test PR' workflows, extracting the info from the GitHub event. Signed-off-by: Dmitry Baryshkov --- .github/workflows/test-distro.yml | 10 ++++++++++ .github/workflows/test-pr.yml | 1 + .github/workflows/test.yml | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/.github/workflows/test-distro.yml b/.github/workflows/test-distro.yml index 2636f5b50..031de0726 100644 --- a/.github/workflows/test-distro.yml +++ b/.github/workflows/test-distro.yml @@ -24,6 +24,10 @@ on: required: false type: string description: "Suffix for the distro name" + git_ref: + required: true + type: string + description: "Ref in the repo which should be used for the tests" lava_test_plans_ref: type: string description: "Ref in lava-test-plans repository: commit, tag or branch" @@ -53,6 +57,8 @@ jobs: - uses: actions/checkout@v6 with: fetch-depth: 0 + persist-credentials: false + ref: ${{ inputs.git_ref }} - name: Run lava-test-plans id: lava-test-plans @@ -167,6 +173,8 @@ jobs: - uses: actions/checkout@v6 with: fetch-depth: 0 + persist-credentials: false + ref: ${{ inputs.git_ref }} - name: Determine device list id: determine-device-list @@ -250,6 +258,8 @@ jobs: - uses: actions/checkout@v6 with: fetch-depth: 0 + persist-credentials: false + ref: ${{ inputs.git_ref }} - name: Generate Summary id: generate-summary diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index ef6d92d43..d07a4b7f1 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -21,6 +21,7 @@ jobs: secrets: inherit with: build_id: ${{ github.event.workflow_run.id }} + git_ref: ${{ github.event.workflow_run.head_sha }} comment-on-pr: name: "Comment on PR" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2f836e4b1..36d751c0d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,6 +6,11 @@ on: build_id: required: true type: string + git_ref: + required: false + default: '' + type: string + description: "Ref in the repo which should be used for the tests" outputs: summary_ids: description: "IDs of the test summary artifact"