RANCHER-2751 Enable CI pipeline for release branches in platform-lsp

OHaimanov · OHaimanov · commit bd995aee4845 · 2026-03-03T22:50:22.000+02:00
diff --git a/.github/actions/calculate-version-increment/action.yml b/.github/actions/calculate-version-increment/action.yml
@@ -10,9 +10,9 @@ inputs:
     description: 'Whether changes were detected (true/false)'
     required: true
   version_pattern:
-    description: 'Regex pattern for version matching (default: FOLIO pattern R<iteration>-<year>.<patch>)'
+    description: 'Regex pattern for version matching (default: FOLIO pattern R<iteration>-<year>[-<suffix>].<patch>)'
     required: false
-    default: '^(R[0-9]+-[0-9]+)\.([0-9]+)$'
+    default: '^(R[0-9]+-[0-9]+)(-[a-z0-9-]+)?\.([0-9]+)$'
   increment_type:
     description: 'Type of increment to apply (currently only "patch" is supported)'
     required: false
@@ -32,48 +32,48 @@ outputs:
 runs:
   using: 'composite'
   steps:
-    - name: 'Calculate version increment'
-      id: calculate
-      shell: bash
-      env:
-        CURRENT_VERSION: ${{ inputs.current_version }}
-        CHANGES_DETECTED: ${{ inputs.changes_detected }}
-        VERSION_PATTERN: ${{ inputs.version_pattern }}
-        INCREMENT_TYPE: ${{ inputs.increment_type }}
-      run: |
-        set -euo pipefail
-        IFS=$'\n\t'
+  - name: 'Calculate version increment'
+    id: calculate
+    shell: bash
+    env:
+      CURRENT_VERSION: ${{ inputs.current_version }}
+      CHANGES_DETECTED: ${{ inputs.changes_detected }}
+      VERSION_PATTERN: ${{ inputs.version_pattern }}
+      INCREMENT_TYPE: ${{ inputs.increment_type }}
+    run: |
+      set -euo pipefail
+      IFS=$'\n\t'
 
-        UPDATED=false
-        FAILURE_REASON=''
-        NEW_VERSION="$CURRENT_VERSION"
+      UPDATED=false
+      FAILURE_REASON=''
+      NEW_VERSION="$CURRENT_VERSION"
 
-        if [ "$CHANGES_DETECTED" = 'true' ]; then
-          if [[ "$CURRENT_VERSION" =~ $VERSION_PATTERN ]]; then
-            BASE_VERSION="${BASH_REMATCH[1]}"
-            PATCH_VERSION="${BASH_REMATCH[2]}"
+      if [ "$CHANGES_DETECTED" = 'true' ]; then
+        if [[ "$CURRENT_VERSION" =~ $VERSION_PATTERN ]]; then
+          # Group 1: R1-2025, Group 2: -ci|-csp5|-path|etc (optional), Group 3: patch number
+          BASE_VERSION="${BASH_REMATCH[1]}${BASH_REMATCH[2]}"
+          PATCH_VERSION="${BASH_REMATCH[3]}"
 
-            case "$INCREMENT_TYPE" in
-              patch)
-                NEW_VERSION="${BASE_VERSION}.$((PATCH_VERSION + 1))"
-                UPDATED=true
-                echo "::notice::Calculated new version $NEW_VERSION from previous $CURRENT_VERSION"
-                ;;
-              *)
-                FAILURE_REASON="Unsupported increment type: $INCREMENT_TYPE"
-                echo "::warning::$FAILURE_REASON"
-                ;;
-            esac
-          else
-            FAILURE_REASON="Previous version '$CURRENT_VERSION' does not match expected format 'R<iteration>-<year>.<patch>'"
-            echo "::warning::$FAILURE_REASON (no update applied)"
-            UPDATED=false
-          fi
+          case "$INCREMENT_TYPE" in
+            patch)
+              NEW_VERSION="${BASE_VERSION}.$((PATCH_VERSION + 1))"
+              UPDATED=true
+              echo "::notice::Calculated new version $NEW_VERSION from previous $CURRENT_VERSION"
+              ;;
+            *)
+              FAILURE_REASON="Unsupported increment type: $INCREMENT_TYPE"
+              echo "::warning::$FAILURE_REASON"
+              ;;
+          esac
         else
-          echo '::notice::No component/application changes detected; version unchanged'
+          FAILURE_REASON="Previous version '$CURRENT_VERSION' does not match expected format 'R<iteration>-<year>[-<suffix>].<patch>'"
+          echo "::warning::$FAILURE_REASON (no update applied)"
+          UPDATED=false
         fi
+      else
+        echo '::notice::No component/application changes detected; version unchanged'
+      fi
 
-        echo "updated=$UPDATED" >> "$GITHUB_OUTPUT"
-        echo "new_version=$NEW_VERSION" >> "$GITHUB_OUTPUT"
-        echo "failure_reason=$FAILURE_REASON" >> "$GITHUB_OUTPUT"
-
+      echo "updated=$UPDATED" >> "$GITHUB_OUTPUT"
+      echo "new_version=$NEW_VERSION" >> "$GITHUB_OUTPUT"
+      echo "failure_reason=$FAILURE_REASON" >> "$GITHUB_OUTPUT"
diff --git a/.github/actions/check-branch-and-pr-status/action.yml b/.github/actions/check-branch-and-pr-status/action.yml
@@ -1,21 +1,29 @@
 name: 'Check Branch and PR Status'
-description: 'Determines source branch and checks for existing pull request'
+description: 'Determines source branch, update branch, and checks for existing pull request'
 author: 'FOLIO DevOps'
 
+branding:
+  icon: 'git-branch'
+  color: 'blue'
+
 inputs:
   repo:
-    description: 'Repository in org/repo format'
+    description: 'Repository in org/repo format (e.g., folio-org/platform-lsp)'
     required: true
   release_branch:
-    description: 'Base release branch name'
+    description: 'Base release branch name (e.g., R1-2025)'
     required: true
   update_branch:
-    description: 'Update branch name to check'
+    description: 'Update branch name to check (e.g., R1-2025-update)'
     required: true
   github_token:
-    description: 'GitHub token for API access'
+    description: 'GitHub token for API access with repo scope'
     required: false
     default: ${{ github.token }}
+  fail_on_orphan_branch:
+    description: 'Fail if update branch exists without an associated PR (default: true)'
+    required: false
+    default: 'true'
 
 outputs:
   source_branch:
@@ -37,53 +45,73 @@ outputs:
 runs:
   using: 'composite'
   steps:
-    - name: 'Check branch and PR status'
-      id: check
-      shell: bash
-      env:
-        GH_TOKEN: ${{ inputs.github_token }}
-        REPO: ${{ inputs.repo }}
-        RELEASE_BRANCH: ${{ inputs.release_branch }}
-        UPDATE_BRANCH: ${{ inputs.update_branch }}
-      run: |
-        set -euo pipefail
-        IFS=$'\n\t'
+  - name: 'Check branch and PR status'
+    id: check
+    shell: bash
+    env:
+      GH_TOKEN: ${{ inputs.github_token }}
+      REPO: ${{ inputs.repo }}
+      RELEASE_BRANCH: ${{ inputs.release_branch }}
+      UPDATE_BRANCH: ${{ inputs.update_branch }}
+      FAIL_ON_ORPHAN: ${{ inputs.fail_on_orphan_branch }}
+    run: |
+      set -euo pipefail
+      IFS=$'\n\t'
 
-        # Check if update branch exists
-        echo "::notice::Checking if update branch exists: $UPDATE_BRANCH"
-        if gh api "repos/$REPO/branches/$UPDATE_BRANCH" >/dev/null 2>&1; then
-          echo "::notice::Update branch exists, will scan: $UPDATE_BRANCH"
-          echo "source_branch=$UPDATE_BRANCH" >> "$GITHUB_OUTPUT"
-          echo "update_branch_exists=true" >> "$GITHUB_OUTPUT"
+      # Validate inputs
+      if [[ ! "$REPO" =~ ^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$ ]]; then
+        echo "::error::Invalid repo format: '$REPO'. Expected format: org/repo"
+        exit 1
+      fi
 
-          # Check for existing PR
-          echo "::notice::Checking for existing PR from $UPDATE_BRANCH to $RELEASE_BRANCH"
-          pr_json=$(gh pr list \
-            --repo "$REPO" \
-            --base "$RELEASE_BRANCH" \
-            --head "$UPDATE_BRANCH" \
-            --json number,url \
-            --jq '.[0]' || echo '{}')
+      if [ -z "$RELEASE_BRANCH" ] || [ -z "$UPDATE_BRANCH" ]; then
+        echo "::error::Branch names cannot be empty"
+        exit 1
+      fi
 
-          if [ "$pr_json" != "{}" ] && [ -n "$pr_json" ] && [ "$(echo "$pr_json" | jq -r '.url // ""')" != "" ]; then
-            pr_number=$(echo "$pr_json" | jq -r '.number // ""')
-            pr_url=$(echo "$pr_json" | jq -r '.url // ""')
-            echo "::notice::Found existing PR #$pr_number: $pr_url"
-            echo "pr_exists=true" >> "$GITHUB_OUTPUT"
-            echo "pr_number=$pr_number" >> "$GITHUB_OUTPUT"
-            echo "pr_url=$pr_url" >> "$GITHUB_OUTPUT"
-          else
-            echo "::notice::No existing PR found"
-            echo "pr_exists=false" >> "$GITHUB_OUTPUT"
-            echo "pr_number=" >> "$GITHUB_OUTPUT"
-            echo "pr_url=" >> "$GITHUB_OUTPUT"
-          fi
+      # Check if update branch exists
+      echo "::notice::Checking if update branch exists: $UPDATE_BRANCH"
+      if gh api "repos/$REPO/branches/$UPDATE_BRANCH" >/dev/null 2>&1; then
+        echo "::notice::Update branch exists, will scan: $UPDATE_BRANCH"
+        echo "source_branch=$UPDATE_BRANCH" >> "$GITHUB_OUTPUT"
+        echo "update_branch_exists=true" >> "$GITHUB_OUTPUT"
+
+        # Check for existing PR
+        echo "::notice::Checking for existing PR from $UPDATE_BRANCH to $RELEASE_BRANCH"
+        pr_json=$(gh pr list \
+          --repo "$REPO" \
+          --base "$RELEASE_BRANCH" \
+          --head "$UPDATE_BRANCH" \
+          --json number,url,state \
+          --jq '.[0]' || echo '{}')
+
+        pr_number=$(echo "$pr_json" | jq -r '.number // empty')
+        
+        if [ -n "$pr_number" ]; then
+          pr_url=$(echo "$pr_json" | jq -r '.url')
+          pr_state=$(echo "$pr_json" | jq -r '.state')
+          echo "::notice::Found existing PR #$pr_number ($pr_state): $pr_url"
+          echo "pr_exists=true" >> "$GITHUB_OUTPUT"
+          echo "pr_number=$pr_number" >> "$GITHUB_OUTPUT"
+          echo "pr_url=$pr_url" >> "$GITHUB_OUTPUT"
         else
-          echo "::notice::Update branch does not exist, will scan: $RELEASE_BRANCH"
-          echo "source_branch=$RELEASE_BRANCH" >> "$GITHUB_OUTPUT"
-          echo "update_branch_exists=false" >> "$GITHUB_OUTPUT"
+          echo "::notice::No existing PR found"
           echo "pr_exists=false" >> "$GITHUB_OUTPUT"
           echo "pr_number=" >> "$GITHUB_OUTPUT"
           echo "pr_url=" >> "$GITHUB_OUTPUT"
+          
+          # Check for orphan branch if validation is enabled
+          if [[ "${FAIL_ON_ORPHAN,,}" == "true" ]]; then
+            echo "::error::Orphan branch detected: '$UPDATE_BRANCH' exists but no associated PR found"
+            echo "::error::Please either create a PR or delete the orphan branch: $UPDATE_BRANCH"
+            exit 1
+          fi
         fi
-
+      else
+        echo "::notice::Update branch does not exist, will scan: $RELEASE_BRANCH"
+        echo "source_branch=$RELEASE_BRANCH" >> "$GITHUB_OUTPUT"
+        echo "update_branch_exists=false" >> "$GITHUB_OUTPUT"
+        echo "pr_exists=false" >> "$GITHUB_OUTPUT"
+        echo "pr_number=" >> "$GITHUB_OUTPUT"
+        echo "pr_url=" >> "$GITHUB_OUTPUT"
+      fi
diff --git a/.github/update-config.yml b/.github/update-config.yml
@@ -9,13 +9,13 @@ update_config:
 branches:
   - snapshot:
       enabled: false
-      name: "FOLIO Sunflower Version"
+      name: "FOLIO Snapshot Version"
       description: "FOLIO Snapshot LSP (Library Services Platform) is a set of microservices and applications that provide a complete library management system."
       need_pr: false
       pre_release: "only"
-  - R1-1994:
+  - R1-2025-ci:
       enabled: true
-      name: "FOLIO R1-1994 Version"
-      description: "FOLIO R1-1994 is a major release that includes significant updates and new features for the FOLIO platform."
+      name: "FOLIO R1-2025 (Sunflower) Version"
+      description: "FOLIO R1-2025 (Sunflower) is a major release that includes significant updates and new features for the FOLIO platform."
       need_pr: true
       pre_release: "false"
diff --git a/.github/workflows/release-pr-check.yml b/.github/workflows/release-pr-check.yml
@@ -1,7 +1,7 @@
 name: Release PR Check
 
 run-name: >-
-  Release platform check • PR #${{ inputs.pr_number || github.event.pull_request.number }} • ${{ inputs.repo_name || github.event.repository.name }}
+  ${{ inputs.pr_number != '' && format('PR check #{0} - {1}', inputs.pr_number, inputs.repo_name) || format('PR check - {0}', inputs.repo_name) }}
 
 on:
   # TODO: Re-enable pull_request trigger when ready
diff --git a/.github/workflows/release-scan.yml b/.github/workflows/release-scan.yml
@@ -1,4 +1,4 @@
-name: Platform scan for release scheduler
+name: Release Update Scheduler
 
 run-name: Release update scheduler ${{ github.event_name == 'workflow_dispatch' && '[manual]' || '' }}
 
@@ -33,41 +33,29 @@ jobs:
     name: Get Configuration
     runs-on: ubuntu-latest
     outputs:
-      branches: ${{ steps.get-config.outputs.release_branches }}
+      branches: ${{ steps.get-config.outputs.branches }}
       branch_count: ${{ steps.get-config.outputs.branch_count }}
       pr_reviewers: ${{ steps.get-config.outputs.pr_reviewers }}
       pr_labels: ${{ steps.get-config.outputs.pr_labels }}
-      matrix_includes: ${{ steps.build-matrix.outputs.includes }}
+      branch_config: ${{ steps.get-config.outputs.branch_config }}
     steps:
       - name: Ensure gh CLI # TODO: Remove before merging if using a self-hosted runner with gh pre-installed
         run: sudo apt-get update && sudo apt-get install -y gh
 
-      - name: Get Release Configuration
+      - name: Get Update Configuration
         id: get-config
         uses: folio-org/kitfox-github/.github/actions/get-update-config@master
         with:
           repo: ${{ github.repository }}
-          branch: ${{ github.ref_name }}
           github_token: ${{ github.token }}
 
-      - name: Build Matrix Includes
-        id: build-matrix
-        env:
-          UPDATE_MAP: ${{ steps.get-config.outputs.update_branches_map }}
-        run: |
-          INCLUDES=$(echo "$UPDATE_MAP" | jq -c '[to_entries[] | {branch: .key, update_branch: .value}]')
-
-          echo "includes=$INCLUDES" >> "$GITHUB_OUTPUT"
-          echo "::notice::Matrix includes: $INCLUDES"
-
   update-branches:
     name: Update ${{ matrix.branch }}
     needs: get-config
     if: needs.get-config.outputs.branch_count > 0
     strategy:
       matrix:
-        branch: ${{ fromJson(needs.get-config.outputs.branches) }}
-        include: ${{ fromJson(needs.get-config.outputs.matrix_includes) }}
+        include: ${{ fromJson(needs.get-config.outputs.branch_config) }}
       fail-fast: false
       max-parallel: 3
     uses: ./.github/workflows/release-update.yml
diff --git a/.github/workflows/release-update-flow.yml b/.github/workflows/release-update-flow.yml
diff --git a/.github/workflows/release-update.yml b/.github/workflows/release-update.yml
