diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index c9cd2fb..3160c1f 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -32,7 +32,7 @@ pipelines: fi - parallel: - step: - name: Molecule Test Batch - 1 + name: Molecule Test Batch - aws_common/cw-disabled services: - docker script: @@ -40,7 +40,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 1 - step: - name: Molecule Test Batch - 2 + name: Molecule Test Batch - aws_common/default services: - docker script: @@ -48,7 +48,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 2 - step: - name: Molecule Test Batch - 3 + name: Molecule Test Batch - aws_common/logs-disabled services: - docker script: @@ -56,7 +56,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 3 - step: - name: Molecule Test Batch - 4 + name: Molecule Test Batch - bitbucket_config/default services: - docker script: @@ -64,7 +64,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 4 - step: - name: Molecule Test Batch - 5 + name: Molecule Test Batch - confluence_config/aurora services: - docker script: @@ -72,7 +72,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 5 - step: - name: Molecule Test Batch - 6 + name: Molecule Test Batch - confluence_config/default services: - docker script: @@ -80,7 +80,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 6 - step: - name: Molecule Test Batch - 7 + name: Molecule Test Batch - confluence_config/password_char_escaping services: - docker script: @@ -88,7 +88,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 7 - step: - name: Molecule Test Batch - 8 + name: Molecule Test Batch - confluence_config/system_jdk services: - docker script: @@ -96,7 +96,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 8 - step: - name: Molecule Test Batch - 9 + name: Molecule Test Batch - create_backups/default services: - docker script: @@ -104,7 +104,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 9 - step: - name: Molecule Test Batch - 10 + name: Molecule Test Batch - diy_backup/default services: - docker script: @@ -112,7 +112,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 10 - step: - name: Molecule Test Batch - 11 + name: Molecule Test Batch - jira_config/aurora services: - docker script: @@ -120,7 +120,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 11 - step: - name: Molecule Test Batch - 12 + name: Molecule Test Batch - jira_config/default services: - docker script: @@ -128,7 +128,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 12 - step: - name: Molecule Test Batch - 13 + name: Molecule Test Batch - jira_config/jira_config_props services: - docker script: @@ -136,7 +136,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 13 - step: - name: Molecule Test Batch - 14 + name: Molecule Test Batch - jira_config/password_char_escaping services: - docker script: @@ -144,7 +144,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 14 - step: - name: Molecule Test Batch - 15 + name: Molecule Test Batch - linux_common/default services: - docker script: @@ -152,7 +152,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 15 - step: - name: Molecule Test Batch - 16 + name: Molecule Test Batch - product_common/default services: - docker script: @@ -160,7 +160,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 16 - step: - name: Molecule Test Batch - 17 + name: Molecule Test Batch - product_common/system_jdk services: - docker script: @@ -168,7 +168,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 17 - step: - name: Molecule Test Batch - 18 + name: Molecule Test Batch - product_install/bitbucket_latest services: - docker script: @@ -176,7 +176,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 18 - step: - name: Molecule Test Batch - 19 + name: Molecule Test Batch - product_install/confluence_latest services: - docker script: @@ -184,7 +184,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 19 - step: - name: Molecule Test Batch - 20 + name: Molecule Test Batch - product_install/crowd_latest services: - docker script: @@ -192,7 +192,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 20 - step: - name: Molecule Test Batch - 21 + name: Molecule Test Batch - product_install/default services: - docker script: @@ -200,7 +200,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 21 - step: - name: Molecule Test Batch - 22 + name: Molecule Test Batch - product_install/jira_all services: - docker script: @@ -208,7 +208,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 22 - step: - name: Molecule Test Batch - 23 + name: Molecule Test Batch - product_install/jira_cached_with_downgrade services: - docker script: @@ -216,7 +216,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 23 - step: - name: Molecule Test Batch - 24 + name: Molecule Test Batch - product_install/jira_cached_with_upgrade services: - docker script: @@ -224,7 +224,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 24 - step: - name: Molecule Test Batch - 25 + name: Molecule Test Batch - product_install/jira_software_latest services: - docker script: @@ -232,7 +232,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 25 - step: - name: Molecule Test Batch - 26 + name: Molecule Test Batch - product_install/jira_tarball services: - docker script: @@ -240,7 +240,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 26 - step: - name: Molecule Test Batch - 27 + name: Molecule Test Batch - product_install/jira_version_from_file services: - docker script: @@ -248,7 +248,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 27 - step: - name: Molecule Test Batch - 28 + name: Molecule Test Batch - product_install/jira_version_latest services: - docker script: @@ -256,7 +256,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 28 - step: - name: Molecule Test Batch - 29 + name: Molecule Test Batch - product_install/jira_version_override services: - docker script: @@ -264,7 +264,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 29 - step: - name: Molecule Test Batch - 30 + name: Molecule Test Batch - product_install/servicedesk3 services: - docker script: @@ -272,7 +272,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 30 - step: - name: Molecule Test Batch - 31 + name: Molecule Test Batch - product_install/servicedesk4 services: - docker script: @@ -280,7 +280,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 31 - step: - name: Molecule Test Batch - 32 + name: Molecule Test Batch - product_install/servicedesk_latest services: - docker script: @@ -288,7 +288,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 32 - step: - name: Molecule Test Batch - 33 + name: Molecule Test Batch - product_startup/bitbucket services: - docker script: @@ -296,7 +296,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 33 - step: - name: Molecule Test Batch - 34 + name: Molecule Test Batch - product_startup/default services: - docker script: @@ -304,7 +304,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 34 - step: - name: Molecule Test Batch - 35 + name: Molecule Test Batch - product_startup/synchrony services: - docker script: @@ -312,7 +312,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 35 - step: - name: Molecule Test Batch - 36 + name: Molecule Test Batch - restore_backups/default services: - docker script: @@ -320,7 +320,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 36 - step: - name: Molecule Test Batch - 37 + name: Molecule Test Batch - restore_backups/restore_conf_server services: - docker script: @@ -328,7 +328,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 37 - step: - name: Molecule Test Batch - 38 + name: Molecule Test Batch - restore_backups/restore_jira_clustered services: - docker script: diff --git a/pipeline_generator/pipeline.py b/pipeline_generator/pipeline.py index fd9edbb..15dac2f 100644 --- a/pipeline_generator/pipeline.py +++ b/pipeline_generator/pipeline.py @@ -15,9 +15,9 @@ class Pipeline: print(generated_output) def _build_steps(self): - return [Step(f"Molecule Test Batch - {index}", + return [Step(f"Molecule Test Batch - {scenario_name}", self._build_script_commands(index)) - for index, scenario_rel_path in + for index, (scenario_rel_path, scenario_name) in enumerate(self._find_all_scenarios(), 1)] @staticmethod @@ -29,7 +29,8 @@ class Pipeline: scenario_dirs = [] for root, dirs, files in os.walk(Path(os.path.join(os.path.dirname(__file__), "..", ROLES_DIR))): [scenario_dirs.append(root) for f in files if f.endswith("molecule.yml")] - return scenario_dirs + scenarios = map(lambda d: (d, f"{Path(d).parts[2]}/{Path(d).parts[4]}"), scenario_dirs) + return scenarios @staticmethod def _load_template_as_string():