From 93a90cd2be0c9ec116537466f94cbe0c38741717 Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Mon, 11 Sep 2017 11:39:23 -0600
Subject: Disable functest for xci until xci is ready

The external network, docker installation and other parts need
to be fixed in OPNFV host before functest can be enabled.

Change-Id: I42a3adf2e36f91e6425d49e2578003b52ca4f101
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---
 jjb/xci/xci-daily-jobs.yml  | 20 ++++++++++++++++----
 jjb/xci/xci-verify-jobs.yml | 21 +++++++++++++++++----
 2 files changed, 33 insertions(+), 8 deletions(-)

(limited to 'jjb/xci')

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
-- 
cgit 1.2.3-korg