Merge pull request #2505 from wazuh/change/2460-add-bump-issue-link-support-for-revert-stage-bump-in-wazuh-docker

Added bump-issue-link support for Revert Stage Bump

.github/workflows/5_bumper_repository.yml

@@ -37,6 +37,11 @@ on:
         default: false
         required: false
         type: boolean
+      bump-issue-link:
+          description: 'Issue link used in the original bump (required for revert if different from issue-link)'
+          required: false
+          type: string
+
 jobs:
   bump:
     name: Repository bumper 5.x
@@ -146,9 +151,18 @@ jobs:
         id: revert_step
         if: inputs.revert == true
         run: |
+          # 1. Get the current issue number (for the new revert branch/PR)
           ISSUE_NUMBER=$(echo "${{ inputs.issue-link }}" | awk -F'/' '{print $NF}')
 
-          BUMP_BRANCH="enhancement/wqa${ISSUE_NUMBER}-bump-${{ github.ref_name }}"
+          # 2. Get the issue number from the original bump (if provided; otherwise, defaults to the current one)
+          if [ -n "${{ inputs.bump-issue-link }}" ]; then
+            BUMP_ISSUE_NUMBER=$(echo "${{ inputs.bump-issue-link }}" | awk -F'/' '{print $NF}')
+          else
+            BUMP_ISSUE_NUMBER=$ISSUE_NUMBER
+          fi
+
+          # 3. Search for the original bump branch using the obtained BUMP ISSUE number
+          BUMP_BRANCH="enhancement/wqa${BUMP_ISSUE_NUMBER}-bump-${{ github.ref_name }}"
 
           PR_NUMBER=$(gh pr list --head "$BUMP_BRANCH" --base "${{ github.ref_name }}" --state merged --json number --jq '.[0].number')
 
@@ -167,7 +181,7 @@ jobs:
           # Remove the files to prevent them from being included in the revert commit
           git checkout HEAD -- VERSION.json 2>/dev/null || true
           git checkout HEAD -- CHANGELOG.md 2>/dev/null || true
-          # Add any other repository-specific version files here
+          # [!] ADD ANY OTHER REPOSITORY-SPECIFIC VERSION FILES HERE [!]
 
           if git diff --staged --quiet; then
             echo "No references to revert. Skipping commit."

CHANGELOG.md

@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
+- Added bump-issue-link support for Revert Stage Bump. ([#2505](https://github.com/wazuh/wazuh-docker/pull/2505))
 - Add integration test module docs ([#2491](https://github.com/wazuh/wazuh-docker/pull/2491))
 - Implement the wazuh-docker integration testing module ([#2188](https://github.com/wazuh/wazuh-docker/issues/2188))
 - Support Revert bump functionality in wazuh-docker ([#2320](https://github.com/wazuh/wazuh-docker/issues/2320))