Merge "Run unit tests on gerrit events"

[releng.git] / jjb / xci / xci-daily-jobs.yaml

diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml
index 2c692dd..6f1ce39 100644 (file)
--- a/jjb/xci/xci-daily-jobs.yaml
+++ b/jjb/xci/xci-daily-jobs.yaml
@@ -17,57 +17,46 @@
     # -------------------------------
     scenario:
       - 'os-nosdn-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'os-nosdn-nofeature'
           installer-type: 'osa'
           xci-flavor: 'mini'
       - 'os-nosdn-osm-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'os-nosdn-osm'
           installer-type: 'osa'
           xci-flavor: 'mini'
       - 'os-odl-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'os-odl-nofeature'
           installer-type: 'osa'
           xci-flavor: 'mini'
       - 'os-odl-bgpvpn-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'os-odl-bgpvpn'
           installer-type: 'osa'
           xci-flavor: 'mini'
       - 'os-odl-sfc-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'os-odl-sfc'
           installer-type: 'osa'
           xci-flavor: 'mini'
       - 'k8-nosdn-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'k8-nosdn-nofeature'
           installer-type: 'kubespray'
           xci-flavor: 'mini'
       - 'k8-canal-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'k8-canal-nofeature'
           installer-type: 'kubespray'
           xci-flavor: 'mini'
       - 'k8-calico-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'k8-calico-nofeature'
           installer-type: 'kubespray'
           xci-flavor: 'mini'
       - 'k8-contiv-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'k8-contiv-nofeature'
           installer-type: 'kubespray'
           xci-flavor: 'mini'
       - 'k8-flannel-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'k8-flannel-nofeature'
           installer-type: 'kubespray'
           xci-flavor: 'mini'
       - 'k8-nosdn-istio-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'k8-nosdn-istio'
           installer-type: 'kubespray'
           xci-flavor: 'mini'
@@ -133,6 +122,9 @@
           block-level: 'NODE'
       - logrotate-default
 
+    triggers:
+      - timed: '@midnight'
+
     parameters:
       - string:
           name: DEPLOY_SCENARIO
@@ -149,6 +141,9 @@
       - string:
           name: XCI_DISTRO
           default: '{distro}'
+      - string:
+          name: FUNCTEST_VERSION
+          default: 'hunter'
       - string:
           name: FUNCTEST_MODE
           default: 'tier'
@@ -163,9 +158,6 @@
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
           description: 'Git URL to use on this Jenkins Slave'
 
-    triggers:
-      - '{auto-trigger-name}'
-
     wrappers:
       - ssh-agent-wrapper
       - build-timeout:
@@ -184,6 +176,7 @@
               XCI_FLAVOR=$XCI_FLAVOR
               CI_LOOP=$CI_LOOP
               XCI_DISTRO=$XCI_DISTRO
+              FUNCTEST_VERSION=$FUNCTEST_VERSION
               FUNCTEST_MODE=$FUNCTEST_MODE
               FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
             same-node: true
@@ -197,6 +190,7 @@
               XCI_FLAVOR=$XCI_FLAVOR
               CI_LOOP=$CI_LOOP
               XCI_DISTRO=$XCI_DISTRO
+              FUNCTEST_VERSION=$FUNCTEST_VERSION
               FUNCTEST_MODE=$FUNCTEST_MODE
               FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
             same-node: true
@@ -278,6 +272,9 @@
       - label:
           name: SLAVE_LABEL
           default: '{slave-label}'
+      - string:
+          name: FUNCTEST_VERSION
+          default: 'hunter'
       - string:
           name: FUNCTEST_MODE
           default: 'tier'
@@ -340,7 +337,9 @@
               declare -x "\${var}" 2>/dev/null
               echo $var
           done < ${XCI_PATH}/.cache/xci.env && cd ${XCI_PATH}/xci && \
-          ansible-playbook -i playbooks/dynamic_inventory.py playbooks/prepare-tests.yml
+          ansible-playbook -i playbooks/dynamic_inventory.py \
+          -i ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \
+          playbooks/prepare-tests.yml
           ssh root@192.168.122.2 "/root/prepare-tests.sh"
           echo "---------------------------------------------------------------------------------"