From: Markos Chandras <mchandras@suse.de>
Date: Mon, 11 Sep 2017 17:51:50 +0000 (+0000)
Subject: Merge "Disable functest for xci until xci is ready"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a8e3451b433586b477fbe2eb939848bf97a430f4;hp=10cb2762a27db3dfedac88525328bc74c5bae8a3;p=releng.git

Merge "Disable functest for xci until xci is ready"
---

diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
index 441acf5f0..0835e6709 100644
--- a/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@ -214,6 +214,9 @@
         - string:
             name: XCI_LOOP
             default: 'daily'
+        - string:
+            name: INSTALLER_TYPE
+            default: 'osa'
         - string:
             name: FUNCTEST_SUITE_NAME
             default: 'daily'
@@ -235,7 +238,16 @@
 - builder:
     name: xci-functest-builder
     builders:
-        - shell:
-            !include-raw:
-                - ../../utils/fetch_os_creds.sh
-                - ../functest/functest-alpine.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
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 5fca9bdbb..2cdecb208 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -179,6 +179,9 @@
         - string:
             name: ANSIBLE_VERBOSITY
             default: '-vvvv'
+        - string:
+            name: INSTALLER_TYPE
+            default: 'osa'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -214,10 +217,20 @@
             cd $WORKSPACE/xci
             ./xci-deploy.sh
 
+
 - builder:
     name: 'xci-verify-healthcheck-macro'
     builders:
-        - shell:
-            !include-raw: ../../utils/fetch_os_creds.sh
-        - shell:
-            !include-raw: ../functest/functest-alpine.sh
+        - shell: |
+            #!/bin/bash
+
+            echo "Hello World!"
+
+# this will be enabled once the xci is prepared
+#- builder:
+#    name: 'xci-verify-healthcheck-macro'
+#    builders:
+#        - shell:
+#            !include-raw: ../../utils/fetch_os_creds.sh
+#        - shell:
+#            !include-raw: ../functest/functest-alpine.sh