Merge "Leverage on pbr (Python Build Reasonableness)"

diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 32cfcfa..938fdf9 100644 (file)
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -25,7 +25,7 @@
         branch: 'stable/{stream}'
         dovetail-branch: master
         gs-pathname: '/{stream}'
-        docker-tag: 'cvp.0.5.0'
+        docker-tag: 'cvp.0.6.0'
 
 #-----------------------------------
 # POD, PLATFORM, AND BRANCH MAPPING

diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
index c39d07e..441acf5 100644 (file)
--- 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 (executable)
index 0f58dfe..0000000
--- a/jjb/xci/xci-functest.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-echo "Functional testing with functest"

diff --git a/utils/test/testapi/tools/watchdog/docker_watch.sh b/utils/test/testapi/tools/watchdog/docker_watch.sh
index 786fc10..f1d8946 100644 (file)
--- a/utils/test/testapi/tools/watchdog/docker_watch.sh
+++ b/utils/test/testapi/tools/watchdog/docker_watch.sh
@@ -22,7 +22,7 @@ declare -A ports=( ["testapi"]="8082" ["reporting"]="8084")
 
 ## Urls to check if the modules are deployed or not ?
 declare -A urls=( ["testapi"]="http://testresults.opnfv.org/test/" \
-    ["reporting"]="http://testresults.opnfv.org/reporting2/reporting/index.html")
+    ["reporting"]="http://testresults.opnfv.org/reporting/index.html")
 
 ### Functions related to checking.
 
@@ -31,9 +31,9 @@ function is_deploying() {
     building=$(grep -oPm1 "(?<=<building>)[^<]+" <<< "$xml")
     if [[ $building == "false" ]]
     then
-        return 0
+        false
     else
-        return 1
+        true
     fi
 }
 
@@ -42,9 +42,9 @@ function get_docker_status() {
     echo -e "Docker status: $status"
     if [ $status = "active" ]
     then
-        return 1
+        true
     else
-        return 0
+        false
     fi
 }
 
@@ -53,9 +53,9 @@ function check_connectivity() {
     cmd=`curl --head -m10 --request GET ${2} | grep '200 OK' > /dev/null`
     rc=$?
     if [[ $rc == 0 ]]; then
-        return 0
+        true
     else
-        return 1
+        false
     fi
 }
 
@@ -74,7 +74,7 @@ function check_modules() {
     done
     if [ ! -z "$failed_modules" ]; then
         echo -e "Failed Modules: $failed_modules"
-        return 1
+        false
     else
         echo -e "All modules working good"
         exit 0
@@ -135,7 +135,7 @@ echo -e
 
 ## If the problem is related to docker daemon
 
-if get_docker_status; then
+if ! get_docker_status; then
     restart_docker_fix
     if ! check_modules; then
         echo -e "Watchdog failed while restart_docker_fix"
@@ -162,4 +162,4 @@ if ! check_modules; then
 fi
 
 sudo docker ps
-sudo docker images
+sudo docker images
\ No newline at end of file