Apex: fixes scenario name for netvirt+vpp

[releng.git] / jjb / xci / bifrost-verify-jobs.yml

diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index 2fa99b2..c6da9f4 100644 (file)
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -12,10 +12,10 @@
     project:
         - 'openstack':
             project-repo: 'https://git.openstack.org/openstack/bifrost'
-            clone-location: '/opt/bifrost'
+            clone-location: '$WORKSPACE/bifrost'
         - 'opnfv':
             project-repo: 'https://gerrit.opnfv.org/gerrit/releng'
-            clone-location: '/opt/releng'
+            clone-location: '$WORKSPACE/releng'
 #--------------------------------
 # distros
 #--------------------------------
@@ -55,7 +55,7 @@
 - defaults:
     name: verify_vm_defaults
     test-vm-num-nodes: '3'
-    test-vm-node-names: 'xcimaster controller00 compute00'
+    test-vm-node-names: 'opnfv controller00 compute00'
     vm-domain-type: 'kvm'
     vm-cpu: '2'
     vm-disk: '30'
@@ -140,6 +140,9 @@
         - string:
             name: ANSIBLE_VERBOSITY
             default: '-vvvv'
+        - string:
+            name: XCI_LOOP
+            default: 'verify'
 
     scm:
         - git:
@@ -161,7 +164,7 @@
         - bifrost-build
 
     wrappers:
-        - bifrost-fix-perms-workspace
+        - fix-workspace-permissions
 
     publishers:
         - email:
@@ -225,17 +228,6 @@
                     pattern: 'prototypes/bifrost/**'
             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
 #---------------------------