Merge "support 'GET /dashboard/v1/projects' REST api in testAPI"

diff --git a/jjb/apex/apex-build.sh b/jjb/apex/apex-build.sh
index ca1821a..f6b2e32 100755 (executable)
--- a/jjb/apex/apex-build.sh
+++ b/jjb/apex/apex-build.sh
@@ -10,41 +10,36 @@ echo
 [[ -d $CACHE_DIRECTORY ]] || mkdir -p $CACHE_DIRECTORY
 # set OPNFV_ARTIFACT_VERSION
 if echo $BUILD_TAG | grep "apex-verify" 1> /dev/null; then
-  if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
-    export OPNFV_ARTIFACT_VERSION=brahmaputra-dev${BUILD_NUMBER}
-    export BUILD_ARGS="-v $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY $BUILD_DIRECTORY"
-  else
-    export OPNFV_ARTIFACT_VERSION=dev${BUILD_NUMBER}
-    export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY"
-  fi
+  export OPNFV_ARTIFACT_VERSION=dev${BUILD_NUMBER}
+  export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY"
 elif [ "$ARTIFACT_VERSION" == "daily" ]; then
-  if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
-    export OPNFV_ARTIFACT_VERSION=brahmaputra-$(date -u +"%Y-%m-%d")
-    export BUILD_ARGS="-v $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY $BUILD_DIRECTORY"
-  else
-    export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d")
-    export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY --iso"
-  fi
+  export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d")
+  export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY --iso"
 else
   export OPNFV_ARTIFACT_VERSION=${ARTIFACT_VERSION}
-  if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
-    export BUILD_ARGS="-v $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY $BUILD_DIRECTORY"
-  else
-    export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY --iso"
-  fi
-fi
-# clean for stable but doesn't matter for master
-if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
-  sudo opnfv-clean
+  export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c $CACHE_DIRECTORY --iso"
 fi
+
 # start the build
 cd $WORKSPACE/ci
 ./build.sh $BUILD_ARGS
 RPM_VERSION=$(grep Version: $BUILD_DIRECTORY/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-')
 # list the contents of BUILD_OUTPUT directory
+echo "Build Directory is ${BUILD_DIRECTORY}"
+echo "Build Directory Contents:"
+echo "-------------------------"
 ls -al $BUILD_DIRECTORY
-# save information regarding artifact into file
-(
+
+# list the contents of CACHE directory
+echo "Cache Directory is ${CACHE_DIRECTORY}"
+echo "Cache Directory Contents:"
+echo "-------------------------"
+ls -al $CACHE_DIRECTORY
+
+if ! echo $BUILD_TAG | grep "apex-verify" 1> /dev/null; then
+  echo "Writing opnfv.properties file"
+  # save information regarding artifact into file
+  (
     echo "OPNFV_ARTIFACT_VERSION=$OPNFV_ARTIFACT_VERSION"
     echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)"
     echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)"
@@ -54,6 +49,7 @@ ls -al $BUILD_DIRECTORY
     echo "OPNFV_RPM_URL=$GS_URL/opnfv-apex-$RPM_VERSION.noarch.rpm"
     echo "OPNFV_RPM_MD5SUM=$(md5sum $BUILD_DIRECTORY/noarch/opnfv-apex-$RPM_VERSION.noarch.rpm | cut -d' ' -f1)"
     echo "OPNFV_BUILD_URL=$BUILD_URL"
-) > $WORKSPACE/opnfv.properties
+  ) > $WORKSPACE/opnfv.properties
+fi
 echo "--------------------------------------------------------"
 echo "Done!"

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 0d34f1a..47ec572 100755 (executable)
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -84,6 +84,17 @@ if [[ "$BUILD_DIRECTORY" == *verify* ]]; then
       fi
     done
 
+    # Make sure jinja2 is installed
+    for python_pkg in jinja2; do
+      if ! python3.4 -c "import $python_pkg"; then
+        echo "$python_pkg package not found for python3.4, attempting to install..."
+        if ! sudo easy_install-3.4 $python_pkg; then
+          echo -e "Failed to install $python_pkg package for python3.4"
+          exit 1
+        fi
+      fi
+    done
+
     if [ -z ${PYTHONPATH:-} ]; then
         export PYTHONPATH=${WORKSPACE}/lib/python
     else

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 7ce9268..76c7574 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -210,7 +210,7 @@
             name: COMPASS_OPENSTACK_VERSION
             choices:
                 - 'liberty'
-                - 'juno'
+                - 'mitaka'
 
 ########################
 # trigger macros

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 626e443..cb5b2e5 100644 (file)
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -240,7 +240,7 @@
             name: COMPASS_OPENSTACK_VERSION
             choices:
                 - 'liberty'
-                - 'juno'
+                - 'mitaka'
         - choice:
             name: COMPASS_OS_VERSION
             choices:

diff --git a/utils/test/result_collection_api/opnfv_testapi/resources/result_handlers.py b/utils/test/result_collection_api/opnfv_testapi/resources/result_handlers.py
index 4955472..473a38d 100644 (file)
--- a/utils/test/result_collection_api/opnfv_testapi/resources/result_handlers.py
+++ b/utils/test/result_collection_api/opnfv_testapi/resources/result_handlers.py
@@ -79,11 +79,11 @@ class ResultsCLHandler(GenericResultHandler):
             @param project: project name
             @type project: L{string}
             @in project: query
-            @required project: True
+            @required project: False
             @param case: case name
             @type case: L{string}
             @in case: query
-            @required case: True
+            @required case: False
             @param version: i.e. Colorado
             @type version: L{string}
             @in version: query

diff --git a/utils/test/result_collection_api/opnfv_testapi/tests/unit/test_result.py b/utils/test/result_collection_api/opnfv_testapi/tests/unit/test_result.py
index fc1e9ba..5a5dd38 100644 (file)
--- a/utils/test/result_collection_api/opnfv_testapi/tests/unit/test_result.py
+++ b/utils/test/result_collection_api/opnfv_testapi/tests/unit/test_result.py
@@ -7,16 +7,15 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 import unittest
-import copy
 
-from test_base import TestBase
+from opnfv_testapi.common.constants import HTTP_OK, HTTP_BAD_REQUEST, \
+    HTTP_NOT_FOUND
 from opnfv_testapi.resources.pod_models import PodCreateRequest
 from opnfv_testapi.resources.project_models import ProjectCreateRequest
-from opnfv_testapi.resources.testcase_models import TestcaseCreateRequest
 from opnfv_testapi.resources.result_models import ResultCreateRequest, \
     TestResult, TestResults
-from opnfv_testapi.common.constants import HTTP_OK, HTTP_BAD_REQUEST, \
-    HTTP_NOT_FOUND
+from opnfv_testapi.resources.testcase_models import TestcaseCreateRequest
+from test_base import TestBase
 
 
 class Details(object):