diff --git a/jenkins_jobs/modules/properties.py b/jenkins_jobs/modules/properties.py index 2d6d4683b..61ada1afd 100644 --- a/jenkins_jobs/modules/properties.py +++ b/jenkins_jobs/modules/properties.py @@ -613,7 +613,7 @@ def build_blocker(registry, xml_parent, data): mapping = [ ('use-build-blocker', 'useBuildBlocker', True), ('', 'blockingJobs', jobs), - ('blocking-level', 'blockLevel', 'GLOBAL', block_level_types), + ('block-level', 'blockLevel', 'GLOBAL', block_level_types), ('queue-scanning', 'scanQueueFor', 'DISABLED', queue_scan_types), ] helpers.convert_mapping_to_xml(blocker, data, mapping, fail_required=True) diff --git a/tests/properties/fixtures/build-blocker-full.xml b/tests/properties/fixtures/build-blocker-full.xml index 7ae82b713..af3a80bc4 100644 --- a/tests/properties/fixtures/build-blocker-full.xml +++ b/tests/properties/fixtures/build-blocker-full.xml @@ -5,7 +5,7 @@ true .*-deploy ^maintenance.* - GLOBAL + NODE BUILDABLE diff --git a/tests/properties/fixtures/build-blocker-full.yaml b/tests/properties/fixtures/build-blocker-full.yaml index b80d833df..fbe49244c 100644 --- a/tests/properties/fixtures/build-blocker-full.yaml +++ b/tests/properties/fixtures/build-blocker-full.yaml @@ -4,5 +4,5 @@ properties: blocking-jobs: - ".*-deploy" - "^maintenance.*" - block_level: 'GLOBAL' + block-level: 'NODE' queue-scanning: 'BUILDABLE'