Skip to content

Commit f1145a8

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 * plugins tests tests/plugins_integration -> tests/system/plugins * gui tests tests/gui_e2e -> tests/system/gui * update tests tests/update -> tests/system/update * gui crawl tests tests/gui_crawl -> tests/system/gui_crawl There are no relay, mk_oracle or redfish tests on this branch. 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 pytest "-T TYPE" labels are unrelated to the directory names and stay as they are. This branch still uses the cre/cee/cme/cce/cse edition suffixes, so the Jenkins job scheme is translated mechanically, e.g. test-integration-cee -> test-system-singlesite-cee. Matches checkmk_ci "Rename tests jobs for 2.5.0, 2.4.0 and 2.3.0". CMK-36565 Change-Id: I26f7266ba30233f1b29c536f062a75477e6564a2
1 parent 0d082bb commit f1145a8

218 files changed

Lines changed: 187 additions & 175 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.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def main() {
6767
|===================================================
6868
""".stripMargin());
6969

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

7272
/// avoid failures due to leftover artifacts from prior runs
7373
sh("rm -rf ${checkout_dir}/test-results");

buildscripts/scripts/test-gui-crawl-node.groovy renamed to buildscripts/scripts/test-system-gui-crawl-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-crawl-node.groovy
3+
/// file: test-system-gui-crawl-node.groovy
44

55
def main() {
66
check_job_parameters([
@@ -29,7 +29,7 @@ def main() {
2929
def edition = params.EDITION;
3030
def fake_artifacts = params.FAKE_ARTIFACTS;
3131

32-
def make_target = "test-gui-crawl-docker";
32+
def make_target = "test-system-gui-crawl-docker";
3333
def download_dir = "package_download";
3434
def setup_values = single_tests.common_prepare(version: "daily", make_target: make_target, docker_tag: params.CIPARAM_OVERRIDE_DOCKER_TAG_BUILD);
3535

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
def main() {
66
check_job_parameters([
@@ -29,7 +29,7 @@ def main() {
2929
def edition = params.EDITION;
3030
def fake_artifacts = params.FAKE_ARTIFACTS;
3131

32-
def make_target = "test-xss-crawl-docker";
32+
def make_target = "test-system-gui-crawl-xss-docker";
3333
def download_dir = "package_download";
3434

3535
def setup_values = single_tests.common_prepare(version: "daily", make_target: make_target, docker_tag: params.CIPARAM_OVERRIDE_DOCKER_TAG_BUILD);

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
def main() {
66
check_job_parameters([
@@ -34,7 +34,7 @@ def main() {
3434
'managed': 'cme',
3535
];
3636

37-
def make_target = "test-gui-e2e-${short_editions[edition]}-docker";
37+
def make_target = "test-system-gui-${short_editions[edition]}-docker";
3838
def download_dir = "package_download";
3939

4040
def setup_values = single_tests.common_prepare(version: "daily", make_target: make_target, docker_tag: params.CIPARAM_OVERRIDE_DOCKER_TAG_BUILD);

buildscripts/scripts/test-composition-single-node.groovy renamed to buildscripts/scripts/test-system-multisite-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-composition-single-node.groovy
3+
/// file: test-system-multisite-single-node.groovy
44

55
def main() {
66
check_job_parameters([
@@ -36,7 +36,7 @@ def main() {
3636
// Use the directory also used by tests/testlib/containers.py to have it find
3737
// the downloaded package.
3838
def download_dir = "package_download";
39-
def make_target = "test-composition-docker";
39+
def make_target = "test-system-multisite-docker";
4040

4141
def setup_values = single_tests.common_prepare(version: "daily", make_target: make_target, docker_tag: params.CIPARAM_OVERRIDE_DOCKER_TAG_BUILD);
4242

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
/// Run composition tests
66

@@ -66,7 +66,7 @@ def main() {
6666
|===================================================
6767
""".stripMargin());
6868

69-
def relative_job_name = "${branch_base_folder}/builders/test-composition-single-node";
69+
def relative_job_name = "${branch_base_folder}/builders/test-system-multisite-single-node";
7070

7171
/// avoid failures due to leftover artifacts from prior runs
7272
sh("rm -rf ${checkout_dir}/test-results");

buildscripts/scripts/test-plugins.groovy renamed to buildscripts/scripts/test-system-plugins.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-plugins.groovy
3+
/// file: test-system-plugins.groovy
44

55
def main() {
66
check_job_parameters([
@@ -29,7 +29,7 @@ def main() {
2929
def edition = params.EDITION;
3030
def fake_artifacts = params.FAKE_ARTIFACTS;
3131

32-
def make_target = "test-plugins-docker";
32+
def make_target = "test-system-plugins-docker";
3333
def download_dir = "package_download";
3434

3535
def setup_values = single_tests.common_prepare(version: "daily", make_target: make_target, docker_tag: params.CIPARAM_OVERRIDE_DOCKER_TAG_BUILD);

buildscripts/scripts/test-integration-single.groovy renamed to buildscripts/scripts/test-system-singlesite-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-integration-single.groovy
3+
/// file: test-system-singlesite-single.groovy
44

55
def main() {
66
check_job_parameters([
@@ -21,7 +21,7 @@ def main() {
2121
def edition = params.EDITION;
2222
def fake_artifacts = params.FAKE_ARTIFACTS;
2323

24-
def make_target = "test-integration-docker";
24+
def make_target = "test-system-singlesite-docker";
2525
def download_dir = "package_download";
2626

2727
def setup_values = single_tests.common_prepare(version: "daily", make_target: make_target, docker_tag: params.CIPARAM_OVERRIDE_DOCKER_TAG_BUILD);

buildscripts/scripts/test-update-single.groovy renamed to buildscripts/scripts/test-system-update-single.groovy

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

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

55
def build_make_target(edition) {
6-
def prefix = "test-update-";
6+
def prefix = "test-system-update-";
77
def suffix = "-docker";
88
switch(edition) {
99
case 'enterprise':

buildscripts/scripts/test-update.groovy renamed to buildscripts/scripts/test-system-update.groovy

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

3-
/// file: test-update.groovy
3+
/// file: test-system-update.groovy
44

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

77
def build_make_target(edition) {
8-
def prefix = "test-update-";
8+
def prefix = "test-system-update-";
99
def suffix = "-docker";
1010
switch(edition) {
1111
case 'enterprise':
@@ -72,7 +72,7 @@ def main() {
7272
""".stripMargin());
7373

7474
def build_for_parallel = [:];
75-
def relative_job_name = "${branch_base_folder}/builders/test-update-single-node";
75+
def relative_job_name = "${branch_base_folder}/builders/test-system-update-single-node";
7676

7777
def test_stages = all_distros.collectEntries { distro -> [
7878
("Test ${distro}") : {

0 commit comments

Comments
 (0)