From 074ea7b3af4338eb0aedd901deb9479a94b443b4 Mon Sep 17 00:00:00 2001 From: Antonio Date: Wed, 21 Aug 2024 11:06:03 +0200 Subject: [PATCH 1/4] enhancement(#wz23748): Adding Ubuntu 24.04 into DTT --- .../templates/agent/Test-agents-complete.yaml | 2 ++ .../central_components/Test-CC-complete.yaml | 2 ++ .../manager/Test-manager-complete.yaml | 19 +++++++++++-------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/deployability/modules/jobflow/templates/agent/Test-agents-complete.yaml b/deployability/modules/jobflow/templates/agent/Test-agents-complete.yaml index 9cc63c812c..e1409fb909 100755 --- a/deployability/modules/jobflow/templates/agent/Test-agents-complete.yaml +++ b/deployability/modules/jobflow/templates/agent/Test-agents-complete.yaml @@ -18,6 +18,8 @@ variables: - linux-debian-11-arm64 - linux-debian-12-amd64 - linux-debian-12-arm64 + - linux-ubuntu-24.04-amd64 + - linux-ubuntu-24.04-arm64 - linux-ubuntu-22.04-amd64 - linux-ubuntu-22.04-arm64 - linux-ubuntu-18.04-amd64 diff --git a/deployability/modules/jobflow/templates/central_components/Test-CC-complete.yaml b/deployability/modules/jobflow/templates/central_components/Test-CC-complete.yaml index 3962df7996..ec4e8a1972 100644 --- a/deployability/modules/jobflow/templates/central_components/Test-CC-complete.yaml +++ b/deployability/modules/jobflow/templates/central_components/Test-CC-complete.yaml @@ -4,6 +4,7 @@ variables: central_components-os: - linux-ubuntu-20.04-amd64 - linux-ubuntu-22.04-amd64 + - linux-ubuntu-24.04-amd64 - linux-amazon-2-amd64 - linux-redhat-7-amd64 - linux-redhat-8-amd64 @@ -71,6 +72,7 @@ tasks: depends-on: - "allocate-central_components-linux-ubuntu-20.04-amd64" - "allocate-central_components-linux-ubuntu-22.04-amd64" + - "allocate-central_components-linux-ubuntu-24.04-amd64" - "allocate-central_components-linux-amazon-2-amd64" - "allocate-central_components-linux-redhat-7-amd64" - "allocate-central_components-linux-redhat-8-amd64" diff --git a/deployability/modules/jobflow/templates/manager/Test-manager-complete.yaml b/deployability/modules/jobflow/templates/manager/Test-manager-complete.yaml index 5e70c9de65..f0b6031650 100644 --- a/deployability/modules/jobflow/templates/manager/Test-manager-complete.yaml +++ b/deployability/modules/jobflow/templates/manager/Test-manager-complete.yaml @@ -4,6 +4,7 @@ variables: manager-os: - linux-ubuntu-20.04-amd64 - linux-ubuntu-22.04-amd64 + - linux-ubuntu-24.04-amd64 - linux-amazon-2-amd64 - linux-redhat-7-amd64 - linux-redhat-8-amd64 @@ -62,14 +63,15 @@ tasks: - wazuh-1: "{working-dir}/manager-linux-centos-7-amd64/inventory.yaml" - wazuh-2: "{working-dir}/manager-linux-ubuntu-20.04-amd64/inventory.yaml" - wazuh-3: "{working-dir}/manager-linux-ubuntu-22.04-amd64/inventory.yaml" - - wazuh-4: "{working-dir}/manager-linux-redhat-7-amd64/inventory.yaml" - - wazuh-5: "{working-dir}/manager-linux-redhat-8-amd64/inventory.yaml" - - wazuh-6: "{working-dir}/manager-linux-redhat-9-amd64/inventory.yaml" - - wazuh-7: "{working-dir}/manager-linux-centos-8-amd64/inventory.yaml" - - wazuh-8: "{working-dir}/manager-linux-debian-10-amd64/inventory.yaml" - - wazuh-9: "{working-dir}/manager-linux-debian-11-amd64/inventory.yaml" - - wazuh-10: "{working-dir}/manager-linux-debian-12-amd64/inventory.yaml" - - wazuh-11: "{working-dir}/manager-linux-amazon-2-amd64/inventory.yaml" + - wazuh-4: "{working-dir}/manager-linux-ubuntu-24.04-amd64/inventory.yaml" + - wazuh-5: "{working-dir}/manager-linux-redhat-7-amd64/inventory.yaml" + - wazuh-6: "{working-dir}/manager-linux-redhat-8-amd64/inventory.yaml" + - wazuh-7: "{working-dir}/manager-linux-redhat-9-amd64/inventory.yaml" + - wazuh-8: "{working-dir}/manager-linux-centos-8-amd64/inventory.yaml" + - wazuh-9: "{working-dir}/manager-linux-debian-10-amd64/inventory.yaml" + - wazuh-10: "{working-dir}/manager-linux-debian-11-amd64/inventory.yaml" + - wazuh-11: "{working-dir}/manager-linux-debian-12-amd64/inventory.yaml" + - wazuh-12: "{working-dir}/manager-linux-amazon-2-amd64/inventory.yaml" - tests: "install,restart,stop,uninstall" - component: "manager" - wazuh-version: "" @@ -77,6 +79,7 @@ tasks: - live: False depends-on: - "allocate-manager-linux-ubuntu-20.04-amd64" + - "allocate-manager-linux-ubuntu-24.04-amd64" - "allocate-manager-linux-ubuntu-22.04-amd64" - "allocate-manager-linux-amazon-2-amd64" - "allocate-manager-linux-redhat-7-amd64" From ba37199e6cf76451a11a5d95217c3a6658169992 Mon Sep 17 00:00:00 2001 From: Antonio Date: Wed, 18 Sep 2024 11:25:00 +0200 Subject: [PATCH 2/4] fix(#wz23748): Adding CHANGELOG information --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dee1982c88..dda9e3484f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog All notable changes to this project will be documented in this file. +## [4.9.1] - TBD + +### Added +- Add Ubuntu 24.04 support to Deployability testing tier 1 ([#5689])(https://github.com/wazuh/wazuh-qa/pull/5689) \- (Tests) ## [4.9.0] - TBD From 12c459ae99e8d04f303ddf1d76ea98cef412ada4 Mon Sep 17 00:00:00 2001 From: Antonio Date: Wed, 18 Sep 2024 12:05:17 +0200 Subject: [PATCH 3/4] Merge 4.9.1 --- CHANGELOG.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea38e0fa63..331a45be58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,12 @@ # Changelog All notable changes to this project will be documented in this file. -## [4.9.1] - TBD - -### Added -- Add Ubuntu 24.04 support to Deployability testing tier 1 ([#5689])(https://github.com/wazuh/wazuh-qa/pull/5689) \- (Tests) ## [4.9.1] - TBD ### Added +- Add Ubuntu 24.04 support to Deployability testing tier 1 ([#5689])(https://github.com/wazuh/wazuh-qa/pull/5689) \- (Tests) - Added support for macOS 14.6 to the Allocation module (Vagrant) ([#5671](https://github.com/wazuh/wazuh-qa/pull/5671)) \- (Framework) ### Changed From 5e5bdede094d4392fc281db97b38cf5579607131 Mon Sep 17 00:00:00 2001 From: Antonio Date: Wed, 18 Sep 2024 12:06:59 +0200 Subject: [PATCH 4/4] fix(#wz23748): Fixing depends on order --- .../jobflow/templates/manager/Test-manager-complete.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployability/modules/jobflow/templates/manager/Test-manager-complete.yaml b/deployability/modules/jobflow/templates/manager/Test-manager-complete.yaml index f0b6031650..cbc49c9d96 100644 --- a/deployability/modules/jobflow/templates/manager/Test-manager-complete.yaml +++ b/deployability/modules/jobflow/templates/manager/Test-manager-complete.yaml @@ -79,8 +79,8 @@ tasks: - live: False depends-on: - "allocate-manager-linux-ubuntu-20.04-amd64" - - "allocate-manager-linux-ubuntu-24.04-amd64" - "allocate-manager-linux-ubuntu-22.04-amd64" + - "allocate-manager-linux-ubuntu-24.04-amd64" - "allocate-manager-linux-amazon-2-amd64" - "allocate-manager-linux-redhat-7-amd64" - "allocate-manager-linux-redhat-8-amd64"