From: Fatih Degirmenci <fdegir@gmail.com>
Date: Thu, 6 Sep 2018 21:03:39 +0000 (+0000)
Subject: Merge "Move global-jjb parameter from releng to global"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=02b2a1bca2b0febdf843750c8a76dc203ae604aa;hp=8b5d0def0389d07a8e1da32077a5fe1d194f0e39;p=releng.git

Merge "Move global-jjb parameter from releng to global"
---

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 744a7de4e..5002eb515 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -61,15 +61,15 @@ run_test() {
     case ${test_name} in
         connection_check|tenantnetwork1|tenantnetwork2|vmready1|vmready2|singlevm1|singlevm2|vping_ssh|vping_userdata|cinder_test|odl|api_check|snaps_health_check)
             FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} ;;
-        tempest_smoke|rally_sanity|refstack_defcore|patrole|snaps_smoke|neutron_trunk|barbican)
+        tempest_smoke|neutron-tempest-plugin-api|rally_sanity|refstack_defcore|patrole|snaps_smoke|neutron_trunk|networking-bgpvpn|networking-sfc|barbican)
             FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;;
         shaker|vmtp)
             FUNCTEST_IMAGE=${REPO}/functest-benchmarking:${DOCKER_TAG} ;;
-        tempest_full|rally_full)
+        tempest_full|tempest_scenario|rally_full)
             FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;;
-        cloudify_ims|vyos_vrouter|juju_epc)
+        cloudify|cloudify_ims|heat_ims|vyos_vrouter|juju_epc)
             FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;;
-        doctor-notification|bgpvpn|functest-odl-sfc|barometercollectd|fds)
+        doctor-notification|bgpvpn|functest-odl-sfc|barometercollectd|fds|vgpu|stor4nfv_os)
             FUNCTEST_IMAGE=${REPO}/functest-features:${DOCKER_TAG} ;;
         *)
             echo "Unkown test case $test_name"
@@ -168,18 +168,24 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then
     tiers=(${FUNCTEST_TIER})
     run_tiers ${tiers}
 else
+    tests=(tempest_full tempest_scenario)
     if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then
         if [[ ${BRANCH} == "stable/fraser" ]]; then
             tiers=(healthcheck smoke features vnf parser)
+            tests=(tempest_full)
         else
             tiers=(healthcheck smoke benchmarking features vnf)
         fi
     else
         if [[ ${BRANCH} == "stable/fraser" ]]; then
             tiers=(healthcheck smoke features parser)
+            tests=(tempest_full)
         else
             tiers=(healthcheck smoke benchmarking features)
         fi
     fi
     run_tiers ${tiers}
+    for test in "${tests[@]}"; do
+        run_test "$test"
+    done
 fi
diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml
index 1d50eb44e..71013f4ff 100644
--- a/jjb/releng/opnfv-utils.yaml
+++ b/jjb/releng/opnfv-utils.yaml
@@ -130,6 +130,7 @@
           default-slaves:
             - lf-build1
             - lf-build2
+            - ericsson-build3
             - ericsson-build4
           allowed-multiselect: true
           ignore-offline-nodes: true
@@ -144,6 +145,8 @@
       - timed: '@midnight'
 
     builders:
+      - description-setter:
+          description: '$NODE_NAME'
       - install-ansible
       - run-ansible-build-server-playbook
 
diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml
index 5f75b0e28..2c692dd45 100644
--- a/jjb/xci/xci-daily-jobs.yaml
+++ b/jjb/xci/xci-daily-jobs.yaml
@@ -324,6 +324,8 @@
               echo "Removing $vm"
               sudo virsh destroy $vm > /dev/null 2>&1 || true
               sudo virsh undefine $vm > /dev/null 2>&1 || true
+              sudo killall -r vbmc > /dev/null 2>&1 || true
+              sudo rm -rf /root/.vbmc > /dev/null 2>&1 || true
           done
           echo "---------------------------------------------------------------------------------"