Skip to content

Commit 3d3f8c2

Browse files
TimotheusBachingerTimotheusBachinger
committed
tests architecture: move tests to system/
Backport of c2187d2 tests architecture: move redfish tests f2194a5 redfish: integration -> system b047bb1 tests architecture: move tests to system/ moves: * integration tests tests/integration -> tests/system/singlesite * composition tests tests/composition -> tests/system/multisite * relay tests tests/relay_integration -> tests/system/relay * plugins tests tests/plugins_integration -> tests/system/plugins * gui tests tests/gui_e2e -> tests/system/gui * mk_oracle tests tests/agent_plugin_integration -> tests/system/mk_oracle * update tests tests/update -> tests/system/update * gui crawl tests tests/gui_crawl -> tests/system/gui_crawl * redfish tests tests/integration_redfish -> tests/system/redfish A plain cherry-pick is not possible: master replaced tests/Makefile with tests/run_tests.sh and bazelified the system test suites, neither of which happened on this branch. The make targets in tests/Makefile are therefore renamed in place, using the same names master gave the run_tests.sh targets, e.g. test-integration -> test-system-singlesite. The Jenkins job renamings match checkmk_ci "Rename tests jobs for 2.5.0, 2.4.0 and 2.3.0". CMK-36565 Change-Id: Ibcb00529ae06997a82f91161c6ae7f40345f3ead
1 parent 6d791d3 commit 3d3f8c2

442 files changed

Lines changed: 619 additions & 599 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AGENTS.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ make -C tests test-format
8585
make -C tests test-mypy
8686

8787
# Integration and system tests
88-
make -C tests test-integration
89-
make -C tests test-composition
90-
make -C tests test-gui-e2e
91-
make -C tests test-plugins
88+
make -C tests test-system-singlesite
89+
make -C tests test-system-multisite
90+
make -C tests test-system-gui
91+
make -C tests test-system-plugins
9292
```
9393

9494
### Package-Specific Development
@@ -109,9 +109,9 @@ Each package in `packages/` has its own `run` script with standardized options:
109109
### Test Categories
110110

111111
1. **Unit tests**: Fast, isolated component testing (`tests/unit/`)
112-
2. **Integration tests**: Component interaction testing (`tests/integration/`)
113-
3. **Composition tests**: Multi-service integration (`tests/composition/`)
114-
4. **GUI E2E tests**: End-to-end web interface testing (`tests/gui_e2e/`)
112+
2. **Integration tests**: Component interaction testing (`tests/system/singlesite/`)
113+
3. **Composition tests**: Multi-service integration (`tests/system/multisite/`)
114+
4. **GUI E2E tests**: End-to-end web interface testing (`tests/system/gui/`)
115115
5. **Plugin tests**: Monitoring plugin validation (`tests/plugins_*/`)
116116
6. **Agent plugin tests**: Cross-platform agent functionality (`tests/agent-plugin-unit/`)
117117

‎buildscripts/scripts/test-integration-packages.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void main() {
7878
|===================================================
7979
""".stripMargin());
8080

81-
def relative_job_name = "${branch_base_folder}/builders/test-integration-single";
81+
def relative_job_name = "${branch_base_folder}/builders/test-system-singlesite-single";
8282

8383
/// avoid failures due to leftover artifacts from prior runs
8484
/// and create folder before entering containers to not delete the folder after leaving the container

buildscripts/scripts/test-xss-crawl.groovy renamed to buildscripts/scripts/test-system-gui-crawl-xss.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!groovy
22

3-
/// file: test-xss-crawl.groovy
3+
/// file: test-system-gui-crawl-xss.groovy
44

55
void main() {
66
check_job_parameters([
@@ -30,7 +30,7 @@ void main() {
3030
def use_case = (params.USE_CASE == "fips") ? params.USE_CASE : "daily_tests";
3131

3232
def download_dir = "package_download";
33-
def make_target = "test-xss-crawl";
33+
def make_target = "test-system-gui-crawl-xss";
3434
def test_results_dir = "test-results";
3535

3636
helper.assert_fips_testing(use_case, NODE_LABELS);

buildscripts/scripts/test-gui-crawl.groovy renamed to buildscripts/scripts/test-system-gui-crawl.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!groovy
22

3-
/// file: test-gui-crawl.groovy
3+
/// file: test-system-gui-crawl.groovy
44

55
void main() {
66
check_job_parameters([
@@ -32,7 +32,7 @@ void main() {
3232
helper.assert_fips_testing(use_case, NODE_LABELS);
3333

3434
def download_dir = "package_download";
35-
def make_target = "test-gui-crawl";
35+
def make_target = "test-system-gui-crawl";
3636
def test_results_dir = "test-results";
3737

3838
def setup_values = single_tests.common_prepare(

buildscripts/scripts/test-gui-e2e-single-node.groovy renamed to buildscripts/scripts/test-system-gui-single-node.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!groovy
22

3-
/// file: test-gui-e2e-single-node.groovy
3+
/// file: test-system-gui-single-node.groovy
44

55
void main() {
66
check_job_parameters([
@@ -31,7 +31,7 @@ void main() {
3131
test_jenkins_helper.assert_fips_testing(use_case, NODE_LABELS);
3232

3333
def download_dir = "package_download";
34-
def make_target = "test-gui-e2e-${edition}-docker";
34+
def make_target = "test-system-gui-${edition}-docker";
3535
def result_dir = "test-results";
3636

3737
def setup_values = single_tests.common_prepare(

buildscripts/scripts/test-gui-e2e-single.groovy renamed to buildscripts/scripts/test-system-gui-single.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!groovy
22

3-
/// file: test-gui-e2e-single.groovy
3+
/// file: test-system-gui-single.groovy
44

55
void main() {
66
check_job_parameters([
@@ -28,7 +28,7 @@ void main() {
2828
helper.assert_fips_testing(use_case, NODE_LABELS);
2929

3030
def download_dir = "package_download";
31-
def make_target = "test-gui-e2e-${edition}";
31+
def make_target = "test-system-gui-${edition}";
3232
def test_results_dir = "test-results";
3333

3434
def setup_values = single_tests.common_prepare(

buildscripts/scripts/test-gui-e2e.groovy renamed to buildscripts/scripts/test-system-gui.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!groovy
22

3-
/// file: test-gui-e2e.groovy
3+
/// file: test-system-gui.groovy
44

55
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
66

buildscripts/scripts/test-integration-agent-plugin.groovy renamed to buildscripts/scripts/test-system-mk-oracle.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!groovy
22

3-
/// file: test-integration-agent-plugin.groovy
3+
/// file: test-system-mk-oracle.groovy
44

55
void main() {
66
check_job_parameters([
@@ -33,7 +33,7 @@ void main() {
3333
def force_build = params.DISABLE_JENKINS_CACHE == true;
3434
def version = params.VERSION;
3535

36-
def make_target = "test-integration-agent-plugin";
36+
def make_target = "test-system-mk-oracle";
3737
def result_dir = "test-results";
3838
def mk_oracle_binary_path = "${checkout_dir}/omd/packages/mk-oracle/mk-oracle.rhel8"
3939

buildscripts/scripts/test-composition-single.groovy renamed to buildscripts/scripts/test-system-multisite-single.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!groovy
22

3-
/// file: test-composition-single.groovy
3+
/// file: test-system-multisite-single.groovy
44

55
void main() {
66
check_job_parameters([
@@ -33,7 +33,7 @@ void main() {
3333
helper.assert_fips_testing(use_case, NODE_LABELS);
3434

3535
def download_dir = "package_download";
36-
def make_target = "test-composition";
36+
def make_target = "test-system-multisite";
3737
def test_results_dir = "test-results";
3838

3939
def setup_values = single_tests.common_prepare(

buildscripts/scripts/test-composition.groovy renamed to buildscripts/scripts/test-system-multisite.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!groovy
22

3-
/// file: test-composition.groovy
3+
/// file: test-system-multisite.groovy
44

55
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
66

@@ -40,7 +40,7 @@ void main() {
4040

4141
def all_distros = [];
4242
def deliverables_dir = "${checkout_dir}/test-results";
43-
def relative_job_name = "${branch_base_folder}/builders/test-composition-single";
43+
def relative_job_name = "${branch_base_folder}/builders/test-system-multisite-single";
4444
def selected_distros = [];
4545

4646
inside_container_minimal(safe_branch_name: safe_branch_name) {

0 commit comments

Comments
 (0)