Update to global-jjb v0.20.0
Update to jenkins-job-builder v2.0.5

Change-Id: I51eade46ebdf9d5cd18918941d1adda64638c2b7
diff --git a/Makefile b/Makefile
index 74377f4..c096b44 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 .PHONY: test clean
 
 VENV_DIR      ?= venv-jjb
-JJB_VERSION   ?= 2.0.3
+JJB_VERSION   ?= 2.0.5
 JOBCONFIG_DIR ?= job-configs
 
 $(VENV_DIR):
@@ -20,7 +20,7 @@
 test: $(VENV_DIR) $(JOBCONFIG_DIR)
 	source $(VENV_DIR)/bin/activate ; \
 	pipdeptree ; \
-	jenkins-jobs -l DEBUG test --recursive -o $(JOBCONFIG_DIR) jjb/ ;
+	jenkins-jobs -l DEBUG test --recursive --config-xml -o $(JOBCONFIG_DIR) jjb/ ;
 
 clean:
 	rm -rf $(VENV_DIR) $(JOBCONFIG_DIR)