summaryrefslogtreecommitdiffstats
path: root/jjb/xci
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-09-11 11:39:23 -0600
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-09-11 11:43:09 -0600
commit93a90cd2be0c9ec116537466f94cbe0c38741717 (patch)
tree4273f6332cb3e62dffa4eac296011df24e81a1af /jjb/xci
parent23bd33c54e69205afb5349aee9ee310f2f66ed6c (diff)
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>
Diffstat (limited to 'jjb/xci')
-rw-r--r--jjb/xci/xci-daily-jobs.yml20
-rw-r--r--jjb/xci/xci-verify-jobs.yml21
2 files changed, 33 insertions, 8 deletions
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
@@ -215,6 +215,9 @@
name: XCI_LOOP
default: 'daily'
- string:
+ name: INSTALLER_TYPE
+ default: 'osa'
+ - string:
name: FUNCTEST_SUITE_NAME
default: 'daily'
description: "Daily suite name to run"
@@ -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
@@ -180,6 +180,9 @@
name: ANSIBLE_VERBOSITY
default: '-vvvv'
- string:
+ name: INSTALLER_TYPE
+ default: 'osa'
+ - string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
@@ -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