1 files changed, 26 insertions, 22 deletions

diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index 6aea1c4aa..b93456ee2 100644
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -53,11 +53,14 @@
 # VM defaults
 #--------------------------------
 - defaults:
-    name: vm_defaults
+    name: verify_vm_defaults
+    test-vm-num-nodes: '3'
+    test-vm-node-names: 'xcimaster controller00 compute00'
+    vm-domain-type: 'kvm'
+    vm-cpu: '2'
     vm-disk: '30'
+    vm-memory-size: '4096'
     vm-disk-cache: 'unsafe'
-    vm-memory: '4096'
-    vm-cpu: '2'
 
 #--------------------------------
 # job templates
@@ -67,7 +70,7 @@
 
     disabled: '{obj:disabled}'
 
-    defaults: vm_defaults
+    defaults: verify_vm_defaults
 
     concurrent: false
 
@@ -105,18 +108,27 @@
             name: DIB_OS_PACKAGES
             default: '{dib-os-packages}'
         - string:
-            name: VM_DISK
-            default: '{vm-disk}'
+            name: TEST_VM_NUM_NODES
+            default: '{test-vm-num-nodes}'
         - string:
-            name: VM_DISK_CACHE
-            default: '{vm-disk-cache}'
+            name: TEST_VM_NODE_NAMES
+            default: '{test-vm-node-names}'
         - string:
-            name: VM_MEMORY
-            default: '{vm-memory}'
+            name: VM_DOMAIN_TYPE
+            default: '{vm-domain-type}'
         - string:
             name: VM_CPU
             default: '{vm-cpu}'
         - string:
+            name: VM_DISK
+            default: '{vm-disk}'
+        - string:
+            name: VM_MEMORY_SIZE
+            default: '{vm-memory-size}'
+        - string:
+            name: VM_DISK_CACHE
+            default: '{vm-disk-cache}'
+        - string:
             name: CLEAN_DIB_IMAGES
             default: 'true'
         - label:
@@ -125,6 +137,9 @@
         - string:
             name: BIFROST_LOG_URL
             default: 'http://artifacts.opnfv.org/cross-community-ci/openstack/bifrost/$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER/$JOB_NAME'
+        - string:
+            name: ANSIBLE_VERBOSITY
+            default: '-vvvv'
 
     scm:
         - git:
@@ -146,7 +161,7 @@
         - bifrost-build
 
     wrappers:
-        - bifrost-fix-perms-workspace
+        - fix-workspace-permissions
 
     publishers:
         - email:
@@ -211,17 +226,6 @@
             readable-message: true
 
 #---------------------------
-# wrapper macros
-#---------------------------
-- wrapper:
-    name: bifrost-fix-perms-workspace
-    wrappers:
-        - pre-scm-buildstep:
-          - shell: |
-                #!/bin/bash
-                sudo chown -R $USER $WORKSPACE || exit 1
-
-#---------------------------
 # builder macros
 #---------------------------
 - builder: