Add Eden version selection based on PR target branch

Copilot · europaul · Copilot · commit 4db5542c0cba · 2025-11-13T06:38:13.000Z
- Add pr_base_ref capture in pr-gate.yml
- Create eden-version-map.yml with branch-to-version mapping
- Modify eden-trusted.yml to select Eden version dynamically
- Map LTS branches (13.4-stable, 14.5-stable) to Eden 1.0.9
- Map all other branches to Eden 1.0.13

Co-authored-by: europaul &lt;32612024+europaul@users.noreply.github.com&gt;
diff --git a/.github/eden-version-map.yml b/.github/eden-version-map.yml
@@ -0,0 +1,23 @@
+# Copyright (c) 2025, Zededa, Inc.
+# SPDX-License-Identifier: Apache-2.0
+---
+# Eden version mapping for different EVE branches
+# Maps EVE base branch names to Eden workflow versions
+# Format:
+#   branch-name:
+#     workflow_ref: "lf-edge/eden/.github/workflows/test.yml@<version>"
+#     eden_version: "<version>"
+
+# LTS releases (13.4 and 14.5) use older Eden version
+13.4-stable:
+  workflow_ref: "lf-edge/eden/.github/workflows/test.yml@1.0.9"
+  eden_version: "1.0.9"
+
+14.5-stable:
+  workflow_ref: "lf-edge/eden/.github/workflows/test.yml@1.0.9"
+  eden_version: "1.0.9"
+
+# Default mapping for all other branches (master, development branches, etc.)
+default:
+  workflow_ref: "lf-edge/eden/.github/workflows/test.yml@1.0.13"
+  eden_version: "1.0.13"
diff --git a/.github/workflows/eden-trusted.yml b/.github/workflows/eden-trusted.yml
@@ -28,6 +28,7 @@ jobs:
       pr_id: ${{ steps.extract.outputs.pr_id }}
       original_run_id: ${{ steps.extract.outputs.original_run_id }}
       pr_sha: ${{ steps.extract.outputs.pr_sha }}
+      pr_base_ref: ${{ steps.extract.outputs.pr_base_ref }}
       hv: ${{ steps.extract.outputs.hv }}
       arch: ${{ steps.extract.outputs.arch }}
       platform: ${{ steps.extract.outputs.platform }}
@@ -64,7 +65,7 @@ jobs:
         if: ${{ steps.check_gate.outputs.skip_run == 'false' }}
         env:
           RUN_CONTEXT_FILE: ${{ env.RUN_CONTEXT_FILE }}
-          REQUIRED_FIELDS: pr_id, original_run_id, pr_sha, hv, arch, platform, gate_run_id, gate_status_name
+          REQUIRED_FIELDS: pr_id, original_run_id, pr_sha, pr_base_ref, hv, arch, platform, gate_run_id, gate_status_name
         run: |
           if [[ ! -f "$RUN_CONTEXT_FILE" ]]; then
             echo "$RUN_CONTEXT_FILE file not found"
@@ -95,7 +96,7 @@ jobs:
         if: ${{ steps.check_gate.outputs.skip_run == 'false' }}
         id: extract
         env:
-          FIELDS: pr_id, original_run_id, pr_sha, hv, arch, platform, gate_run_id, gate_status_name
+          FIELDS: pr_id, original_run_id, pr_sha, pr_base_ref, hv, arch, platform, gate_run_id, gate_status_name
         run: |
           # Extract fields from the JSON file
           for field in $(echo "$FIELDS" | tr ',' ' '); do
@@ -175,18 +176,73 @@ jobs:
             }
 
 
+  select_eden_version:
+    name: Select Eden Version
+    runs-on: ubuntu-latest
+    needs: context
+    if: needs.context.outputs.skip_run == 'false'
+    outputs:
+      workflow_ref: ${{ steps.select.outputs.workflow_ref }}
+      eden_version: ${{ steps.select.outputs.eden_version }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
+
+      - name: Select Eden version based on target branch
+        id: select
+        env:
+          BASE_REF: ${{ needs.context.outputs.pr_base_ref }}
+        run: |
+          MAPPING_FILE=".github/eden-version-map.yml"
+
+          if [[ ! -f "$MAPPING_FILE" ]]; then
+            echo "::error::Eden version mapping file not found: $MAPPING_FILE"
+            exit 1
+          fi
+
+          echo "PR target branch: $BASE_REF"
+
+          # Try to get the mapping for the specific branch
+          workflow_ref=$(yq eval ".\"$BASE_REF\".workflow_ref" "$MAPPING_FILE")
+          eden_version=$(yq eval ".\"$BASE_REF\".eden_version" "$MAPPING_FILE")
+
+          # If no specific mapping exists, use the default
+          if [[ "$workflow_ref" == "null" || -z "$workflow_ref" ]]; then
+            echo "No specific mapping found for branch '$BASE_REF', using default"
+            workflow_ref=$(yq eval '.default.workflow_ref' "$MAPPING_FILE")
+            eden_version=$(yq eval '.default.eden_version' "$MAPPING_FILE")
+          fi
+
+          # Verify that we have valid values
+          if [[ "$workflow_ref" == "null" || -z "$workflow_ref" ]]; then
+            echo "::error::Failed to determine workflow_ref for branch '$BASE_REF'"
+            exit 1
+          fi
+
+          if [[ "$eden_version" == "null" || -z "$eden_version" ]]; then
+            echo "::error::Failed to determine eden_version for branch '$BASE_REF'"
+            exit 1
+          fi
+
+          echo "Selected Eden workflow: $workflow_ref"
+          echo "Selected Eden version: $eden_version"
+
+          echo "workflow_ref=$workflow_ref" >> "$GITHUB_OUTPUT"
+          echo "eden_version=$eden_version" >> "$GITHUB_OUTPUT"
+
+
   tests:
     name: ${{ needs.context.outputs.eden_parent_job_title }}
-    needs: context
+    needs: [context, select_eden_version]
     if: needs.context.outputs.skip_run == 'false'
-    uses: lf-edge/eden/.github/workflows/test.yml@1.0.13
+    uses: ${{ needs.select_eden_version.outputs.workflow_ref }}
     secrets: inherit
     with:
       eve_image: "evebuild/pr:${{ needs.context.outputs.pr_id }}"
       eve_log_level: "debug"
       eve_artifact_name: "eve-${{ needs.context.outputs.hv }}-${{ needs.context.outputs.arch }}-${{ needs.context.outputs.platform }}"
       artifact_run_id: ${{ needs.context.outputs.original_run_id }}
-      eden_version: "1.0.13"
+      eden_version: ${{ needs.select_eden_version.outputs.eden_version }}
 
   finalize:
     name: Finalize Eden Runner status
diff --git a/.github/workflows/pr-gate.yml b/.github/workflows/pr-gate.yml
@@ -45,9 +45,11 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           pr_id=$(gh api /search/issues -X GET -f q="type:pr is:open repo:${GH_REPO} sha:${{ github.event.workflow_run.head_sha }}" -q '.items[0].number')
+          pr_base_ref=$(gh pr view "$pr_id" --json baseRefName -q '.baseRefName')
           echo "pr_id=$pr_id" >> "$GITHUB_OUTPUT"
           echo "pr_sha=${{ github.event.workflow_run.head_sha }}" >> "$GITHUB_OUTPUT"
           echo "original_run_id=${{ github.event.workflow_run.id }}" >> "$GITHUB_OUTPUT"
+          echo "pr_base_ref=$pr_base_ref" >> "$GITHUB_OUTPUT"
 
       - name: Gather Context (pull_request_review)
         id: from_review
@@ -60,13 +62,15 @@ jobs:
           echo "pr_id=${{ github.event.pull_request.number }}" >> "$GITHUB_OUTPUT"
           echo "pr_sha=$pr_sha" >> "$GITHUB_OUTPUT"
           echo "original_run_id=$original_run_id" >> "$GITHUB_OUTPUT"
+          echo "pr_base_ref=${{ github.event.pull_request.base.ref }}" >> "$GITHUB_OUTPUT"
 
       - name: Promote Context for Local Use
         id: meta
         run: |
           echo "pr_id=${{ steps.from_run.outputs.pr_id   || steps.from_review.outputs.pr_id }}" >> "$GITHUB_OUTPUT"
           echo "pr_sha=${{ steps.from_run.outputs.pr_sha  || steps.from_review.outputs.pr_sha }}" >> "$GITHUB_OUTPUT"
           echo "original_run_id=${{ steps.from_run.outputs.original_run_id || steps.from_review.outputs.original_run_id }}" >> "$GITHUB_OUTPUT"
+          echo "pr_base_ref=${{ steps.from_run.outputs.pr_base_ref || steps.from_review.outputs.pr_base_ref }}" >> "$GITHUB_OUTPUT"
 
       - name: Check Review Decision
         id: reviews
@@ -123,6 +127,7 @@ jobs:
           echo '{ "pr_id":  "${{ steps.meta.outputs.pr_id }}",
                   "original_run_id": "${{ steps.meta.outputs.original_run_id }}",
                   "pr_sha": "${{ steps.meta.outputs.pr_sha }}",
+                  "pr_base_ref": "${{ steps.meta.outputs.pr_base_ref }}",
                   "hv": "${{ matrix.hv }}",
                   "arch": "${{ matrix.arch }}",
                   "platform": "${{ matrix.platform }}",
