xci: Fix XCI_DISTRO vars and remove clean_vm cleanup steps

Change-Id: Ie1d652607f8f56f5e1cf0409dc628b1add615cd9
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>

diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml
index 5f1e134..d7e18ef 100644 (file)
--- a/jjb/xci/xci-daily-jobs.yaml
+++ b/jjb/xci/xci-daily-jobs.yaml
@@ -98,7 +98,7 @@
       - label:
           name: SLAVE_LABEL
           default: '{slave-label}'
-      - label:
+      - string:
           name: XCI_DISTRO
           default: '{distro}'
       - string:
@@ -119,6 +119,9 @@
       - '{auto-trigger-name}'
 
     wrappers:
+      - ssh-agent-wrapper
+      - build-timeout:
+          timeout: 240
       - fix-workspace-permissions
 
     builders:
@@ -132,7 +135,7 @@
               INSTALLER_TYPE=$INSTALLER_TYPE
               XCI_FLAVOR=$XCI_FLAVOR
               CI_LOOP=$CI_LOOP
-              XCI_DISTRO=$DISTRO
+              XCI_DISTRO=$XCI_DISTRO
             same-node: true
             block: true
       - trigger-builds:
@@ -143,7 +146,7 @@
               INSTALLER_TYPE=$INSTALLER_TYPE
               XCI_FLAVOR=$XCI_FLAVOR
               CI_LOOP=$CI_LOOP
-              XCI_DISTRO=$DISTRO
+              XCI_DISTRO=$XCI_DISTRO
               FUNCTEST_MODE=$FUNCTEST_MODE
               FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
             same-node: true
@@ -157,18 +160,6 @@
       # yamllint disable rule:line-length
       # yamllint enable rule:line-length
       - email-jenkins-admins-on-failure
-      - postbuildscript:
-          builders:
-            - role: BOTH
-              build-on:
-                - ABORTED
-                - FAILURE
-                - NOT_BUILT
-                - SUCCESS
-                - UNSTABLE
-              build-steps:
-                - shell: !include-raw: ./xci-cleanup.sh
-          mark-unstable-if-failed: true
 
 - job-template:
     name: 'xci-{phase}-{pod}-{distro}-daily-{stream}'
@@ -194,6 +185,9 @@
       - logrotate-default
 
     wrappers:
+      - ssh-agent-wrapper
+      - build-timeout:
+          timeout: 240
       - fix-workspace-permissions
 
     scm:
@@ -212,7 +206,7 @@
       - string:
           name: XCI_FLAVOR
           default: 'mini'
-      - label:
+      - string:
           name: XCI_DISTRO
           default: 'ubuntu'
       - label: