From 42e6264fd7fbb0e1089f961d367933e5a181051e Mon Sep 17 00:00:00 2001
From: Morgan Richomme <morgan.richomme@orange.com>
Date: Fri, 1 Jul 2016 10:02:09 +0200
Subject: Add weekly loop in Functest CI

Change-Id: I2d1dfc4c9c09199d2ced56ce47f3376eb8ea8f81
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
---
 jjb/functest/functest-ci-jobs.yml | 45 ++++++++++++++++++++++++++++++---------
 jjb/functest/functest-daily.sh    | 12 -----------
 jjb/functest/functest-loop.sh     | 12 +++++++++++
 3 files changed, 47 insertions(+), 22 deletions(-)
 delete mode 100755 jjb/functest/functest-daily.sh
 create mode 100755 jjb/functest/functest-loop.sh

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 3a07d6549..f9cf01162 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -134,6 +134,7 @@
 
     testsuite:
         - 'daily'
+        - 'weekly'
         - 'suite'
 
     jobs:
@@ -196,7 +197,14 @@
         - string:
             name: FUNCTEST_SUITE_NAME
             default: 'daily'
-            description: "Suite name to run"
+            description: "Daily suite name to run"
+- parameter:
+    name: functest-weekly-parameter
+    parameters:
+        - string:
+            name: FUNCTEST_SUITE_NAME
+            default: 'weekly'
+            description: "Weekly suite name to run"
 - parameter:
     name: functest-suite-parameter
     parameters:
@@ -204,16 +212,19 @@
             name: FUNCTEST_SUITE_NAME
             choices:
                 - 'healthcheck'
-                - 'tempest'
-                - 'rally'
+                - 'vping_userdata'
+                - 'vping_ssh'
+                - 'tempest_smoke_serial'
+                - 'rally_sanity'
                 - 'odl'
                 - 'onos'
-                - 'ovno'
                 - 'promise'
                 - 'doctor'
+                - 'bgpvpn'
+                - 'security_scan'
+                - 'tempest_full_parallel'
+                - 'rally_full'
                 - 'vims'
-                - 'vping_userdata'
-                - 'vping_ssh'
 - parameter:
     name: functest-parameter
     parameters:
@@ -252,6 +263,14 @@
         - 'functest-daily'
         - 'functest-store-results'
 
+- builder:
+    name: functest-weekly-builder
+    builders:
+        - 'functest-cleanup'
+        - 'set-functest-env'
+        - 'functest-weekly'
+        - 'functest-store-results'
+
 - builder:
     name: functest-suite-builder
     builders:
@@ -260,16 +279,22 @@
         - 'functest-suite'
 
 - builder:
-    name: functest-suite
+    name: functest-daily
     builders:
         - shell:
-            !include-raw: ./functest-suite.sh
+            !include-raw: ./functest-loop.sh
 
 - builder:
-    name: functest-daily
+    name: functest-weekly
     builders:
         - shell:
-            !include-raw: ./functest-daily.sh
+            !include-raw: ./functest-loop.sh
+
+- builder:
+    name: functest-suite
+    builders:
+        - shell:
+            !include-raw: ./functest-suite.sh
 
 - builder:
     name: set-functest-env
diff --git a/jjb/functest/functest-daily.sh b/jjb/functest/functest-daily.sh
deleted file mode 100755
index 5abddfd84..000000000
--- a/jjb/functest/functest-daily.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set +e
-
-branch=${GIT_BRANCH##*/}
-[[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r"
-if [[ ${branch} == *"brahmaputra"* ]]; then
-    cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh -s ${flags}"
-else
-    cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t all ${flags}"
-fi
-container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
-docker exec $container_id $cmd
diff --git a/jjb/functest/functest-loop.sh b/jjb/functest/functest-loop.sh
new file mode 100755
index 000000000..5abddfd84
--- /dev/null
+++ b/jjb/functest/functest-loop.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set +e
+
+branch=${GIT_BRANCH##*/}
+[[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r"
+if [[ ${branch} == *"brahmaputra"* ]]; then
+    cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh -s ${flags}"
+else
+    cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t all ${flags}"
+fi
+container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
+docker exec $container_id $cmd
-- 
cgit 1.2.3-korg