X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-daily-jobs.yml;h=441acf5f0cbdcd06f1a764b4cb36622092a31256;hb=9e686dafc73f390c13ca05bbeea7f7729aa57f38;hp=f9fbc1de8866133f7eb7321aba0c3b23cd23ab86;hpb=908d962bedf027631bc0209c4d2c06830d6c8659;p=releng.git

diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
index f9fbc1de8..441acf5f0 100644
--- a/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@ -6,7 +6,7 @@
 # are checked out based on what is configured.
 #--------------------------------
 - project:
-    project: 'releng'
+    project: 'releng-xci'
 
     name: 'xci-daily'
 #--------------------------------
@@ -16,10 +16,6 @@
         stream: master
         opnfv-releng-version: master
         gs-pathname: ''
-    ocata: &ocata
-        stream: ocata
-        opnfv-releng-version: master
-        gs-pathname: '/{stream}'
 #--------------------------------
 # Scenarios
 #--------------------------------
@@ -30,14 +26,18 @@
         - 'os-nosdn-nofeature-noha':
             auto-trigger-name: 'daily-trigger-disabled'
             xci-flavor: 'noha'
+        - 'os-odl-sfc-ha':
+            auto-trigger-name: 'daily-trigger-disabled'
+            xci-flavor: 'ha'
+        - 'os-odl-sfc-noha':
+            auto-trigger-name: 'daily-trigger-disabled'
+            xci-flavor: 'noha'
 #--------------------------------
 # XCI PODs
 #--------------------------------
     pod:
         - virtual:
             <<: *master
-        - virtual:
-            <<: *ocata
 #--------------------------------
 # Supported Distros
 #--------------------------------
@@ -59,7 +59,7 @@
         - 'suse':
             disabled: true
             slave-label: xci-suse-virtual
-            dib-os-release: '42.2'
+            dib-os-release: '42.3'
             dib-os-element: 'opensuse-minimal'
             dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
             extra-dib-elements: 'openssh-server'
@@ -94,8 +94,8 @@
                 - '^xci-os.*'
                 - '^xci-deploy.*'
                 - '^xci-functest.*'
-                - '^bifrost-periodic-.*'
-                - '^osa-periodic-.*'
+                - '^bifrost-.*periodic.*'
+                - '^osa-.*periodic.*'
             block-level: 'NODE'
         - logrotate-default
 
@@ -109,6 +109,9 @@
         - label:
             name: SLAVE_LABEL
             default: '{slave-label}'
+        - string:
+            name: XCI_LOOP
+            default: 'daily'
 
     triggers:
         - '{auto-trigger-name}'
@@ -125,6 +128,7 @@
               predefined-parameters: |
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 XCI_FLAVOR=$XCI_FLAVOR
+                XCI_LOOP=$XCI_LOOP
               same-node: true
               block: true
         - trigger-builds:
@@ -133,6 +137,7 @@
               predefined-parameters: |
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 XCI_FLAVOR=$XCI_FLAVOR
+                XCI_LOOP=$XCI_LOOP
               same-node: true
               block: true
               block-thresholds:
@@ -143,6 +148,7 @@
     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
 
 - job-template:
     name: 'xci-{phase}-{pod}-{distro}-daily-{stream}'
@@ -157,8 +163,8 @@
             blocking-jobs:
                 - '^xci-deploy.*'
                 - '^xci-functest.*'
-                - '^bifrost-periodic-.*'
-                - '^osa-periodic-.*'
+                - '^bifrost-.*periodic.*'
+                - '^osa-.*periodic.*'
             block-level: 'NODE'
         - logrotate-default
 
@@ -172,6 +178,9 @@
         - project-parameter:
             project: '{project}'
             branch: '{opnfv-releng-version}'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-ha'
@@ -202,7 +211,13 @@
         - string:
             name: ANSIBLE_VERBOSITY
             default: ''
-
+        - string:
+            name: XCI_LOOP
+            default: 'daily'
+        - string:
+            name: FUNCTEST_SUITE_NAME
+            default: 'daily'
+            description: "Daily suite name to run"
     builders:
         - description-setter:
             description: "Built on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
@@ -221,4 +236,6 @@
     name: xci-functest-builder
     builders:
         - shell:
-            !include-raw: ./xci-functest.sh
+            !include-raw:
+                - ../../utils/fetch_os_creds.sh
+                - ../functest/functest-alpine.sh