Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 4.10.0 into 4.10.1 #1149

Merged
merged 25 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
283668d
Bumped revision for 4.9.1-rc2
davidcr01 Sep 27, 2024
e77238a
Merge pull request #1128 from wazuh/enhancement/1127-bump-revision
teddytpc1 Sep 27, 2024
bd9fa31
Bump revision to 40913
Enaraque Oct 4, 2024
5ac4641
Merge pull request #1132 from wazuh/enhancement/1875-bump-revision-40913
davidcr01 Oct 4, 2024
c08d95d
Add wazuh-puppet ref input to builder workflow
YisDav Oct 4, 2024
7cac0b3
Merge pull request #1134 from wazuh/enhancement/1133-add-puppet-ref-i…
teddytpc1 Oct 8, 2024
2944556
merge-4.9.1-into-4.10.0
CarlosALgit Oct 10, 2024
b830395
Merge pull request #1137 from wazuh/merge-4.9.1-into-4.10.0
teddytpc1 Oct 10, 2024
1500dc0
Bump revision
YisDav Oct 10, 2024
fadc548
Merge pull request #1139 from wazuh/enhancement/1138-add-support-for-…
c-bordon Oct 10, 2024
d9185f0
Changed GitHub Runner OS version to Ubuntu 22.04
c-bordon Oct 14, 2024
2859932
Changed Puppet download
c-bordon Oct 14, 2024
a841f23
Add s3 URI
vcerenu Oct 15, 2024
e8a1d4b
Modify secret to variable
vcerenu Oct 15, 2024
a598da8
Add changelog
vcerenu Oct 15, 2024
2febbba
Bump revision
vcerenu Oct 15, 2024
5bfa3c6
Merge pull request #1145 from wazuh/enhancement/1144-bump-revision
c-bordon Oct 15, 2024
98f182a
Modify changelog
vcerenu Oct 16, 2024
b758180
Merge pull request #1143 from wazuh/enhancement/1141-add-se-uri
teddytpc1 Oct 16, 2024
8f90055
Updated changelog
c-bordon Oct 17, 2024
8c5e9e7
Merge pull request #1142 from wazuh/bug/79-workflow-python-install-error
c-bordon Oct 17, 2024
96e3271
merge-4.9.1-into-4.10.0
CarlosALgit Oct 17, 2024
3cf8d91
Merge pull request #1148 from wazuh/merge-4.9.1-into-4.10.0
teddytpc1 Oct 17, 2024
a531cab
merge-4.10.0-into-4.10.1
CarlosALgit Oct 17, 2024
6604eea
changed 4.10.0 references to 4.10.1
CarlosALgit Oct 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions .github/workflows/Puppet_module_builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ on:
description: "Checksum ?"
type: boolean
default: false
wazuh_puppet_reference:
description: "wazuh-puppet reference"
type: string
default: "4.10.1"
required: false
id:
description: "ID used to identify the workflow uniquely."
type: string
Expand All @@ -34,6 +39,11 @@ on:
description: "Checksum ?"
type: boolean
default: false
wazuh_puppet_reference:
description: "wazuh-puppet reference"
type: string
default: "4.10.1"
required: false
id:
type: string
required: false
Expand All @@ -47,10 +57,12 @@ env:

jobs:
build_module:
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{ inputs.wazuh_puppet_reference }}

- name: View parameters
run: echo "${{ toJson(inputs) }}"
Expand All @@ -66,16 +78,16 @@ jobs:

- name: Install dependencies
run: |
curl -O https://apt.puppet.com/puppet-tools-release-noble.deb
sudo dpkg -i puppet-tools-release-noble.deb
curl -O https://apt.puppet.com/puppet-tools-release-jammy.deb
sudo dpkg -i puppet-tools-release-jammy.deb
sudo apt-get update
sudo apt-get install pdk
pdk set config user.analytics.disabled false --type boolean --force

- name: Modify name for stage build
if: ${{ inputs.is_stage == false }}
run: |
pip install sde --break-system-packages
pip install sde
PUPPET_MODULE_VERSION="${PUPPET_MODULE_VERSION}-${{ env.COMMIT_SHORT_SHA}}"
sde version $PUPPET_MODULE_VERSION ${{ github.workspace }}/metadata.json
echo "PUPPET_MODULE_VERSION=$PUPPET_MODULE_VERSION" >> "$GITHUB_ENV"
Expand Down Expand Up @@ -117,10 +129,15 @@ jobs:

- name: Upload Puppet module to S3
if: ${{ inputs.upload == true }}
run: aws s3 cp ${{ github.workspace }}/output/${{ env.PUPPET_MODULE_NAME }} s3://${{ secrets.AWS_S3_BUCKET }}/${{ env.S3_PATH }}
run: |
aws s3 cp ${{ github.workspace }}/output/${{ env.PUPPET_MODULE_NAME }} s3://${{ vars.AWS_S3_BUCKET }}/${{ env.S3_PATH }}
s3uri="s3://${{ vars.AWS_S3_BUCKET }}/${{ env.S3_PATH }}/${{ env.PUPPET_MODULE_NAME }}"
echo "S3 URI: ${s3uri}"

- name: Create checksum file and upload
if: ${{ inputs.checksum == true && inputs.upload == true }}
run: |
aws s3 cp ${{ github.workspace }}/output/${{ env.PUPPET_MODULE_NAME }}.sha512 s3://${{ secrets.AWS_S3_BUCKET }}/${{ env.S3_PATH }}
aws s3 cp ${{ github.workspace }}/output/${{ env.PUPPET_MODULE_NAME }}.sha512 s3://${{ vars.AWS_S3_BUCKET }}/${{ env.S3_PATH }}
s3uri="s3://${{ vars.AWS_S3_BUCKET }}/${{ env.S3_PATH }}/${{ env.PUPPET_MODULE_NAME }}.sha512"
echo "S3 sha512 URI: ${s3uri}"

3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ All notable changes to this project will be documented in this file.

### Changed

- Add URI file after upload ([#1143](https://github.com/wazuh/wazuh-puppet/pull/1143)) \- (Puppet Module Builder)
- Modfy Puppet module builder ([#1113](https://github.com/wazuh/wazuh-puppet/pull/1113)) \- (Puppet Module Builder)

### Fixed

- None
- Changed GitHub Runner OS version to Ubuntu 22.04. ([#1142](https://github.com/wazuh/wazuh-puppet/pull/1142))

### Deleted

Expand Down
Loading