From 720399137357dc4eb2b1379e842c4e85c37f07a8 Mon Sep 17 00:00:00 2001
From: Morgan Richomme <morgan.richomme@orange.com>
Date: Mon, 28 Aug 2017 15:58:48 +0200
Subject: run Functest daily in xci
Functest daily is based on the functest alpine dockers:
- healthcheck
- smoke
- features
- vnf
Change-Id: I922f3a5946e8bc06229fb03a959abd2bfead132b
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
---
jjb/xci/xci-daily-jobs.yml | 9 +++++++--
jjb/xci/xci-functest.sh | 3 ---
2 files changed, 7 insertions(+), 5 deletions(-)
delete mode 100755 jjb/xci/xci-functest.sh
(limited to 'jjb')
diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
index 42079b2f5..c7d59d5bb 100644
--- a/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@ -214,7 +214,10 @@
- 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"
@@ -233,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
diff --git a/jjb/xci/xci-functest.sh b/jjb/xci/xci-functest.sh
deleted file mode 100755
index 0f58dfefc..000000000
--- a/jjb/xci/xci-functest.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-echo "Functional testing with functest"
--
cgit