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.

Sign up for GitHub

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

Jump to bottom

Deprecate CentOS 6 and Debian 7 on Wazuh Manager compilation #2164

Merged
merged 18 commits into from
Nov 9, 2023
Merged

Deprecate CentOS 6 and Debian 7 on Wazuh Manager compilation #2164

merged 18 commits into from
Nov 9, 2023

Conversation

jnasselle
Copy link
Member

@jnasselle jnasselle commented Apr 17, 2023 •
edited by ncvicchi
Loading

Related issue
Closes #2154

Description

This PR aims to deprecate CentOS 6 and Debian 7 on Wazuh Manager compilation, while still using them for Wazuh Agent compilation.

Logs example

Tests

  • Build the package in any supported platform
    • Linux
    • Windows
    • macOS
    • Solaris
    • AIX
    • HP-UX
  • Package installation
  • Package upgrade
  • Package downgrade
  • Package remove
  • Package install/remove/install
  • Change added to CHANGELOG.md
  • Tests for Linux RPM
    • Build the package for x86_64
    • Build the package for i386
    • Build the package for armhf
    • Build the package for aarch64
    • %files section is correctly updated if necessary
  • Tests for Linux deb
    • Build the package for x86_64
    • Build the package for i386
    • Build the package for armhf
    • Build the package for aarch64
    • Package install/remove/install
    • Package install/purge/install
    • Check file permissions after installing the package
  • Tests for macOS
    • Test the package from macOS Sierra to Mojave
  • Tests for Solaris
    • Test the package on Solaris 10
    • Test the package on Solaris 11
    • Check file permissions on Solaris 11 template
  • Tests for IBM AIX
    • %files section is correctly updated if necessary
    • Check the changes from IBM AIX 5 to 7

@jnasselle jnasselle self-assigned this Apr 17, 2023
@jnasselle jnasselle linked an issue Apr 17, 2023 that may be closed by this pull request
Debug packages do not contain debug symbols #2161
Closed
5 tasks
@jnasselle jnasselle removed a link to an issue Apr 17, 2023
Debug packages do not contain debug symbols #2161
Closed
5 tasks
@jnasselle jnasselle linked an issue Apr 17, 2023 that may be closed by this pull request
Start using CentOS 7 to build Wazuh manager packages and deprecate older versions #2154
Closed
1 task
@jnasselle jnasselle marked this pull request as ready for review April 18, 2023 19:18
@jnasselle jnasselle force-pushed the 2154-deprecate-centos6-debian7 branch 2 times, most recently from 192a94d to ac8184e Compare June 2, 2023 19:02
DFolchA
DFolchA suggested changes Jun 6, 2023
View reviewed changes
Copy link
Contributor

@DFolchA DFolchA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docker images for agent and manager should be named differently when built by the generate_package scripts.

@jotacarma90
Copy link
Member

Hi @jnasselle

In order to move forward with this PR, I see that Daniel made a request here about differentiating the names of the agent and manager images in the scripts.
Also the branch needs to be updated as it has some conflicts.

Thanks in advance!!!

@jnasselle jnasselle removed their assignment Jul 17, 2023
@jnasselle
Copy link
Member Author

Hi @jotacarma90 ,
As we have discussed, this PR is no longer assigned to me because of @wazuh/qa ownership. Regarding @DFolchA , he also told me that his review was wrong.

@jotacarma90 jotacarma90 force-pushed the 2154-deprecate-centos6-debian7 branch 2 times, most recently from 46c3834 to e067b68 Compare August 8, 2023 11:13
@jotacarma90 jotacarma90 changed the base branch from 4.6.0 to master August 8, 2023 11:13
@jotacarma90 jotacarma90 force-pushed the 2154-deprecate-centos6-debian7 branch 2 times, most recently from 339efda to dca1674 Compare August 9, 2023 13:54
@ncvicchi
Copy link
Member

Since this was our very first experience with several different technologies, we missed some modifications that were required both at the wazuh-packages as well as Jenkings pipelines to allow the PR associated with this issue to work.
Particularly there were inconsistencies among the prefix used, which made the tests to failed but we missed to identify it on time.
Being aware of this (PR fixing it) and other minor issues we are re-performing the tests and hopefully finishing it soon.

@jotacarma90 jotacarma90 force-pushed the 2154-deprecate-centos6-debian7 branch from 3bedc65 to a8600d2 Compare August 16, 2023 13:02
@ncvicchi ncvicchi mentioned this pull request Sep 11, 2023
Closed
DFolchA
DFolchA previously approved these changes Sep 27, 2023
View reviewed changes
Copy link
Contributor

@DFolchA DFolchA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jnasselle jnasselle changed the base branch from master to 4.8.0 October 23, 2023 11:57
@jnasselle jnasselle dismissed DFolchA’s stale review October 23, 2023 11:57

The base branch was changed.

@jnasselle
Copy link
Member Author

Update

4.8.0 is not longer the master branch. Re-targeting this PR

@jnasselle jnasselle force-pushed the 2154-deprecate-centos6-debian7 branch from 23e46c8 to 85fcd3a Compare October 24, 2023 01:25
jnasselle and others added 18 commits November 8, 2023 10:25
@jnasselle @jotacarma90
Changes related to manager compilation
8f38320 
- Move rpm/deb folders to support manager compilation on CentOS7/Debian8
@jnasselle @jotacarma90
Fix on generate_x_package.sh scripts
95f1831
@jnasselle @jotacarma90
Add missing package on debian jessie Dockerfile
df70404
@jnasselle @jotacarma90
Changes requested by the team
2cf2b93 
- Align comparision operator con bash scripts
- Replace debian/eol to debian
@jnasselle @jotacarma90
GH Action related changes
39347ab 
- Fix typo
- Align ghaction with new container images and paths
@jnasselle @jotacarma90
Fix GH Actions to build rpm/deb packages
e2cc25b
@jnasselle @jotacarma90
Fix GH Action typo
46cbdad
@jnasselle @jotacarma90
Add GHA condition to container build and push
fe1e74d
@jnasselle @jotacarma90
Minor fixes on GH Actions
82f5277
@ncvicchi @jotacarma90
Separated manager & client docker images names
2b5b0fe
@ncvicchi @jotacarma90
Separated manager & client docker images names
baa5366
@jotacarma90
Adapted workflows to new naming for docker images
f88ac80
@ncvicchi @jotacarma90
Fixed i386 arq
1fabb81
@jnasselle @jotacarma90
Several fixes
03898e1 
- Fix RPM Dockerfile variables and proper selection
- Add download helper on RPM generation
- Fix DEB Dockerfile variables and propper selection
@ncvicchi @jotacarma90
Change to a more coherent name some variables
64d987e
@ncvicchi @jotacarma90
Deprecated centos 6 for manager
c512416
@jnasselle @jotacarma90
Add Python 3.10 support
a498c8a
@jotacarma90
Fix some file format in the end line
37383a2
@vikman90 vikman90 requested a review from rauldpm November 8, 2023 15:13
@jotacarma90 jotacarma90 removed the request for review from rauldpm November 9, 2023 09:08
@vikman90 vikman90 merged commit f195c56 into 4.8.0 Nov 9, 2023
106 checks passed
@vikman90 vikman90 deleted the 2154-deprecate-centos6-debian7 branch November 9, 2023 10:14
@jnasselle jnasselle mentioned this pull request Jan 31, 2024
Closed
@vikman90 vikman90 mentioned this pull request Jun 19, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vikman90 vikman90 vikman90 approved these changes

@DFolchA DFolchA DFolchA left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Start using CentOS 7 to build Wazuh manager packages and deprecate older versions
5 participants
@jnasselle @jotacarma90 @ncvicchi @vikman90 @DFolchA