Resolve changelog conflicts

wazuh · Oct 9, 2024 · e2f3938 · e2f3938
2 parents ef980f5 + af78494
commit e2f3938
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 1 deletion.
diff --git a/.github/workflows/Test_installation_assistant.yml b/.github/workflows/Test_installation_assistant.yml
@@ -20,6 +20,10 @@ on:
         options:
           - staging
           - pre-release
+      WAZUH_INSTALLATION_ASSISTANT_REFERENCE:
+        description: 'Branch or tag of the wazuh-installation-assistant repository'
+        required: true
+        default: '4.10.0'
       AUTOMATION_REFERENCE:
         description: 'Branch or tag of the wazuh-automation repository'
         required: true
@@ -71,6 +75,8 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
+      with:
+        ref: ${{ inputs.WAZUH_INSTALLATION_ASSISTANT_REFERENCE }}
 
     - name: View parameters
       run: echo "${{ toJson(inputs) }}"

diff --git a/.github/workflows/Test_installation_assistant_distributed.yml b/.github/workflows/Test_installation_assistant_distributed.yml
@@ -20,6 +20,10 @@ on:
         options:
           - staging
           - pre-release
+      WAZUH_INSTALLATION_ASSISTANT_REFERENCE:
+        description: 'Branch or tag of the wazuh-installation-assistant repository'
+        required: true
+        default: '4.10.0'
       AUTOMATION_REFERENCE:
         description: 'Branch or tag of the wazuh-automation repository'
         required: true
@@ -73,6 +77,8 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
+      with:
+        ref: ${{ inputs.WAZUH_INSTALLATION_ASSISTANT_REFERENCE }}
 
     - name: View parameters
       run: echo "${{ toJson(inputs) }}"

diff --git a/.github/workflows/builder_installation_assistant.yml b/.github/workflows/builder_installation_assistant.yml
@@ -4,6 +4,10 @@ name: Build Installation Assistant
 on:
   workflow_dispatch:
     inputs:
+      WAZUH_INSTALLATION_ASSISTANT_REFERENCE:
+        description: "Branch or tag of the wazuh-installation-assistant repository."
+        required: true
+        default: 4.10.0
       is_stage:
         description: "Is stage?"
         type: boolean
@@ -43,7 +47,9 @@ jobs:
         run: echo "${{ toJson(inputs) }}"
 
       - name: Checkout wazuh-installation-assistant repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.WAZUH_INSTALLATION_ASSISTANT_REFERENCE }}
 
       - name: Configure aws credentials
         uses: aws-actions/configure-aws-credentials@v3

diff --git a/.github/workflows/offline-installation.yml b/.github/workflows/offline-installation.yml
@@ -5,6 +5,11 @@ on:
       - 'install_functions/wazuh-offline-download.sh'
       - 'install_functions/wazuh-offline-installation.sh'
   workflow_dispatch:
+    inputs:
+      WAZUH_INSTALLATION_ASSISTANT_REFERENCE:
+        description: "Branch or tag of the wazuh-installation-assistant repository."
+        required: true
+        default: 4.10.0
 
 jobs:
   Build-wazuh-install-script:
@@ -18,6 +23,8 @@ jobs:
           skip_after_successful_duplicate: 'false'
 
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.WAZUH_INSTALLATION_ASSISTANT_REFERENCE }}
 
       - name: Build wazuh-install script and use staging packages
         run: bash builder.sh -i
@@ -33,6 +40,8 @@ jobs:
     needs: Build-wazuh-install-script
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.WAZUH_INSTALLATION_ASSISTANT_REFERENCE }}
 
       - uses: actions/download-artifact@v3
         with:
@@ -49,6 +58,8 @@ jobs:
     needs: Build-wazuh-install-script
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.WAZUH_INSTALLATION_ASSISTANT_REFERENCE }}
 
       - uses: actions/download-artifact@v3
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 - Deleted the offline_checkDependencies function and unified logic in offline_checkPrerequisites function. ([#99](https://github.com/wazuh/wazuh-installation-assistant/pull/99))
+- Add input for wazuh installation assistant reference in workflows. ([#98](https://github.com/wazuh/wazuh-installation-assistant/pull/98))
 - Create GHA workflow to build Wazuh Installation Assistant files. ([#77](https://github.com/wazuh/wazuh-installation-assistant/pull/77))
 - Installation assistant distributed test rework and migration. ([#60](https://github.com/wazuh/wazuh-installation-assistant/pull/60))
 - Installation assistant test and tier workflow migration ([#46](https://github.com/wazuh/wazuh-installation-assistant/pull/46/))