From 7f51d0163133fc04e30d36bff120a94633680bcd Mon Sep 17 00:00:00 2001
From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Thu, 4 Oct 2018 14:54:40 -0700
Subject: [PATCH] Fix 'block-level' Build Blocker Plugin Property

In the process of taking advantage of 'convert_mapping_to_xml()',
commit:7ebe78979166e36a038a116788c33383878ced20 renamed 'block-level' to
'blocking-level' in the build-blocker property.

Another unrelated commit modified the test to use 'block_level' instead
of 'block-level'.

Change-Id: I2dd642ec4966c4c48e0a35e986a69b3b74803358
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---
 jenkins_jobs/modules/properties.py                | 2 +-
 tests/properties/fixtures/build-blocker-full.xml  | 2 +-
 tests/properties/fixtures/build-blocker-full.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 @@
       <useBuildBlocker>true</useBuildBlocker>
       <blockingJobs>.*-deploy
 ^maintenance.*</blockingJobs>
-      <blockLevel>GLOBAL</blockLevel>
+      <blockLevel>NODE</blockLevel>
       <scanQueueFor>BUILDABLE</scanQueueFor>
     </hudson.plugins.buildblocker.BuildBlockerProperty>
   </properties>
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'