jjb: xci: Use centos-minimal instead of centos7 element

[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 b9798c7..97804c6 100644 (file)
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -12,24 +12,24 @@
     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'
+            project-repo: 'https://gerrit.opnfv.org/gerrit/releng-xci'
+            clone-location: '$WORKSPACE/releng-xci'
 #--------------------------------
 # distros
 #--------------------------------
     distro:
-        - 'trusty':
+        - 'xenial':
             disabled: false
-            dib-os-release: 'trusty'
+            dib-os-release: 'xenial'
             dib-os-element: 'ubuntu-minimal'
             dib-os-packages: 'vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
             extra-dib-elements: 'openssh-server'
         - 'centos7':
             disabled: false
             dib-os-release: '7'
-            dib-os-element: 'centos7'
+            dib-os-element: 'centos-minimal'
             dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
             extra-dib-elements: 'openssh-server'
         - 'suse':
@@ -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'
@@ -137,6 +137,12 @@
         - 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'
+        - string:
+            name: XCI_LOOP
+            default: 'verify'
 
     scm:
         - git:
@@ -158,11 +164,12 @@
         - bifrost-build
 
     wrappers:
-        - bifrost-fix-perms-workspace
+        - fix-workspace-permissions
 
     publishers:
         - email:
             recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com julienjut@gmail.com
+        - email-jenkins-admins-on-failure
 #--------------------------------
 # trigger macros
 #--------------------------------
@@ -213,26 +220,15 @@
             custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: 'releng'
+                project-pattern: 'releng-xci'
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: ANT
-                    pattern: 'prototypes/bifrost/**'
+                    pattern: '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
 #---------------------------