X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-daily-jobs.yml;h=7d95429da99a10b44148dd1bda510dc2407f295b;hb=f7d8f8a8b885b2892c7328b7e9a31842b0e925d8;hp=42079b2f5c7e29283b14d06f07da4bfd26806e49;hpb=fc449f385ce391f4cf0a35c098279e9d962a4320;p=releng.git

diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
index 42079b2f5..7d95429da 100644
--- a/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@ -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'
@@ -208,13 +208,19 @@
         - label:
             name: SLAVE_LABEL
             default: '{slave-label}'
-        - string:
-            name: ANSIBLE_VERBOSITY
-            default: ''
         - string:
             name: XCI_LOOP
             default: 'daily'
-
+        - string:
+            name: INSTALLER_TYPE
+            default: 'osa'
+        - string:
+            name: FUNCTEST_MODE
+            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"
@@ -232,5 +238,16 @@
 - builder:
     name: xci-functest-builder
     builders:
-        - shell:
-            !include-raw: ./xci-functest.sh
+        - shell: |
+            #!/bin/bash
+
+            echo "Hello World!"
+
+# this will be enabled once the xci is prepared
+#- builder:
+#    name: xci-functest-builder
+#    builders:
+#        - shell:
+#            !include-raw:
+#                - ../../utils/fetch_os_creds.sh
+#                - ../functest/functest-alpine.sh