Merge 4.5 into master #2191

rauldpm · 2023-04-28T18:33:32Z

Related issue
Closes #2186

Description

This PR merges the latest changes in 4.5 into the master branch

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

… in_progress Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Add Darwin 22 SCA files to specs

Add Archives repository to Debian Stretch tests

Merge branch 4.4 into 4.5

…rge-4.3-4.4

Fix the generation of ARM64/ARM32/PPC64LE deb packages

Merge changes in branch 4.3 into 4.4

…rge-4.4-4.5

Fix 4.3.11 changelog date

Fix 4.3.11 changelog date 4.4

Merge 4.4 into 4.5

Fix Solaris 10 pkg info - 4.5

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

verdx · 2023-05-03T14:50:42Z

debs/SPECS/wazuh-manager/debian/rules

@@ -166,11 +169,14 @@ override_dh_install:
 	cp etc/templates/config/darwin/18/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/19
 	cp etc/templates/config/darwin/20/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/20
 	cp etc/templates/config/darwin/21/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/21
+	cp etc/templates/config/darwin/22/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/22


File etc/templates/config/darwin/22/sca.files does not exist in the branch master of repository wazuh/wazuh yet

Yes, the wazuh/wazuh pull request is blocked until this pull request is merged

verdx · 2023-05-03T14:51:09Z

debs/SPECS/wazuh-manager/debian/rules

@@ -128,9 +128,12 @@ override_dh_install:
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/19
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/20
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/21
+	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/22


File etc/templates/config/darwin/22/sca.files does not exist in the branch master of repository wazuh/wazuh yet

verdx · 2023-05-03T14:51:26Z

macos/package_files/build.sh

@@ -60,7 +60,7 @@ function build() {
    find ${SOURCES_PATH}/src/init/ -name *.sh -type f -exec install -m 0640 {} ${INSTALLATION_SCRIPTS_DIR}/src/init \;

    mkdir -p ${INSTALLATION_SCRIPTS_DIR}/sca/generic
-    mkdir -p ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/{15,16,17,18,20,21}
+    mkdir -p ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/{15,16,17,18,20,21,22}


Same with the Darwin sca file

verdx · 2023-05-03T14:51:34Z

macos/package_files/build.sh

@@ -72,6 +72,7 @@ function build() {
    cp ${SOURCES_PATH}/etc/templates/config/darwin/19/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/19/
    cp ${SOURCES_PATH}/etc/templates/config/darwin/20/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/20/
    cp ${SOURCES_PATH}/etc/templates/config/darwin/21/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/21/
+    cp ${SOURCES_PATH}/etc/templates/config/darwin/22/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/22/


verdx · 2023-05-03T14:51:47Z

rpms/SPECS/wazuh-manager.spec

@@ -108,8 +116,8 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/packages_files/manager_installation_
 mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/{applications,generic}
 mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/amzn/{1,2}
 mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/centos/{8,7,6,5}
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/{15,16,17,18,19,20,21}
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/debian/{7,8,9}
+mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/{15,16,17,18,19,20,21,22}


verdx · 2023-05-03T14:51:54Z

rpms/SPECS/wazuh-manager.spec

@@ -757,6 +762,8 @@ rm -fr %{buildroot}
 %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/20/*
 %dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/21
 %attr(640, root, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/21/*
+%dir %attr(750, wazuh, wazuh) %config(missingok) %{_localstatedir}/tmp/sca-%{version}-%{release}-tmp/darwin/22


verdx · 2023-05-03T15:43:36Z

The tests are failing because the SCA files for Debian 11 and Darwin 22 have been introduced in the Debian SPECS but have not yet been added to branch master in the sources: https://github.com/wazuh/wazuh/tree/master/etc/templates/config/debian

Error in test Build Wazuh Packages - DEB

cp etc/templates/config/debian/11/sca.files /build_wazuh/agent/wazuh-agent-4.6.0/debian/wazuh-agent"/var/ossec/packages_files/agent_installation_scripts"/sca/debian/11
cp: cannot stat `etc/templates/config/debian/11/sca.files': No such file or directory
make[1]: *** [override_dh_install] Error 1
make[1]: Leaving directory `/build_wazuh/agent/wazuh-agent-4.6.0'
make: *** [binary] Error 2
dpkg-buildpackage: error: sudo debian/rules binary gave error exit status 2
debuild: fatal error at line 1357:
dpkg-buildpackage -rsudo -d -us -uc -ai386 -b failed
Error: Process completed with exit code 1.

verdx

The errors in the tests and the previous review are expected because of the order in which the different repositories are being merged.

verdx added 30 commits January 31, 2023 09:51

Change package revision name and add step to retry artifact uri

d35caa5

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Remove unnecessary input:

642237f

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Remove hyphen for revision in rpm and debug

18b4671

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Change the workflow conclusion neccessary to download the artifact to…

051171d

… in_progress Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Change way to retry down,load of artifact

0a42059

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Increase timeout to download artifact

f70e559

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Search for artifact with commit sha instead of workflow name

9eb370b

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Search for artifacts with branch instead of commit

58f5b3f

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Check artifact with workflow name

03c9f25

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Remove space in Clean runs workflow

e711c1b

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Call to clean workflow runs

55978fa

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Remove pull_requests call to Clean runs workflow

a59e828

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Check if artifact is available in the building package workflow

5773cfb

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Change action to download artifact

6deda0c

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Go back to previous artifact download action

02ca409

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Test downloading artifact from the building package workflow

c713ab2

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Debug

be6c7e4

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Add waiting time after uploading artifact

c19d381

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Fix error

f64deed

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Debugging

0cac89f

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Yaml syntax fixes

c30f7f8

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Wait for the artifact to be uploaded if download fails

d03c3b5

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Add continue_on_error to the install and enable test

07a3aed

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Add continue-on-error to download of artifact

4abcd8b

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Remove unnecessary always()

b9538f1

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Change day cleaning of workflow runs is done

7b1c9b6

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Syntax fixes for the ghcr pushing and pulling scripts

791cd81

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Add 4.5 to branches for which to create docker images on push

dbc7197

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Fix cron attribute for Cleaning worfklow runs

36ffb4d

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

Fix schedule cron for Clean runs

5045a01

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

jnasselle and others added 21 commits April 26, 2023 15:35

Fix generation of ARM64/ARM32/PPC64LE deb packages

f79bd76

Add archives repository to Debian Stretch

316cf0c

Add archives repository to Debian Stretch

96c4043

Merge pull request #2148 from wazuh/2137-macos-ventura-sca

99adcc5

Add Darwin 22 SCA files to specs

Merge pull request #2178 from wazuh/2177-deb-stretch-test-error

8f41d4b

Add Archives repository to Debian Stretch tests

Merge pull request #2160 from wazuh/merge-4.4-4.5

39cb9cb

Merge branch 4.4 into 4.5

Merge branch '4.3' of https://github.com/wazuh/wazuh-packages into me…

b1b4745

…rge-4.3-4.4

Merge pull request #2176 from wazuh/2175-fix-debian-stretch-containers

d83fcd4

Fix the generation of ARM64/ARM32/PPC64LE deb packages

Merge pull request #2181 from wazuh/merge-4.3-4.4

30de429

Merge changes in branch 4.3 into 4.4

Merge branch '4.4' of https://github.com/wazuh/wazuh-packages into me…

cee0743

…rge-4.4-4.5

Fix 4.3.11 changelog date

bdb17c7

Merge pull request #2188 from wazuh/fix-changelog-4.3

5de8c47

Fix 4.3.11 changelog date

Fixed changelog dates

bbe0ac2

Merge pull request #2189 from wazuh/fix-changelog-4.4

5875671

Fix 4.3.11 changelog date 4.4

Merge remote-tracking branch 'origin/4.4' into merge-4.4-4.5

a509b38

Removed white-space

ba90ffb

Merge pull request #2187 from wazuh/merge-4.4-4.5

2b12001

Merge 4.4 into 4.5

Update pkginfo to 4.5.0

caf5125

Merge pull request #2190 from wazuh/fix-sol10-info-4.5

412295c

Fix Solaris 10 pkg info - 4.5

Merge remote-tracking branch 'origin/4.5' into merge-4.5-master

37a7bf5

Merge remote-tracking branch 'origin/4.5' into merge-4.5-master

75df14e

rauldpm self-assigned this Apr 28, 2023

Removed duplicated if statement

c9a3391

teddytpc1 approved these changes Apr 28, 2023

View reviewed changes

Remove unnecessary $ in the GitHub Actions tests

7a6564a

Signed-off-by: Miguel Verdaguer Velázquez <verdx@riseup.net>

verdx reviewed May 3, 2023

View reviewed changes

verdx approved these changes May 4, 2023

View reviewed changes

davidjiglesias merged commit 6085928 into master May 9, 2023

davidjiglesias deleted the merge-4.5-master branch May 9, 2023 08:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 4.5 into master #2191

Merge 4.5 into master #2191

rauldpm commented Apr 28, 2023 •

edited

Loading

verdx May 3, 2023

rauldpm May 4, 2023

verdx May 3, 2023

verdx May 3, 2023

verdx May 3, 2023

verdx May 3, 2023

verdx May 3, 2023

verdx commented May 3, 2023

verdx left a comment

Merge 4.5 into master #2191

Merge 4.5 into master #2191

Conversation

rauldpm commented Apr 28, 2023 • edited Loading

Description

verdx May 3, 2023

Choose a reason for hiding this comment

rauldpm May 4, 2023

Choose a reason for hiding this comment

verdx May 3, 2023

Choose a reason for hiding this comment

verdx May 3, 2023

Choose a reason for hiding this comment

verdx May 3, 2023

Choose a reason for hiding this comment

verdx May 3, 2023

Choose a reason for hiding this comment

verdx May 3, 2023

Choose a reason for hiding this comment

verdx commented May 3, 2023

verdx left a comment

Choose a reason for hiding this comment

rauldpm commented Apr 28, 2023 •

edited

Loading