From: Aric Gardner <agardner@linuxfoundation.org>
Date: Tue, 20 Nov 2018 13:47:10 +0000 (+0000)
Subject: Merge "Remove '|' from ovn4nfv plugin unit test builder"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8107281b885175c8379acb7ed2d80302acfd7810;hp=2c68eb2007b6d515c261c28bbae77ddef2866fc4;p=releng.git

Merge "Remove '|' from ovn4nfv plugin unit test builder"
---

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 0e247df6c..09d6ca630 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -13,7 +13,7 @@ echo "Starting the Apex deployment."
 echo "--------------------------------------------------------"
 echo
 
-if [ -z "$DEPLOY_SCENARIO" ]; then
+if [ -z ${DEPLOY_SCENARIO+x} ]; then
   echo "Deploy scenario not set!"
   exit 1
 else
@@ -151,7 +151,7 @@ if [[ "$JOB_NAME" =~ "virtual" ]]; then
     else
       ENV_TYPE="functest"
     fi
-    if [ -z "$OS_VERSION" ]; then
+    if [ -z ${OS_VERSION+x} ]; then
       echo "INFO: OS_VERSION not passed to deploy, detecting based on branch and scenario"
       case $BRANCH in
         master)
diff --git a/jjb/releng/testresults-verify.yaml b/jjb/releng/testresults-verify.yaml
index 958833c0f..c4f4c0f0b 100644
--- a/jjb/releng/testresults-verify.yaml
+++ b/jjb/releng/testresults-verify.yaml
@@ -12,6 +12,7 @@
     jobs:
       - '{module}-verify-{stream}'
       - '{module}-client-verify-{stream}'
+      - '{module}-ui-verify-{stream}'
 
     project: 'releng-testresults'
 
@@ -30,7 +31,7 @@
     triggers:
       - gerrit-trigger-patchset-created:
           server: 'gerrit.opnfv.org'
-          project: '**'
+          project: '{project}'
           branch: '{branch}'
           files: '{module}/**'
 
@@ -61,7 +62,7 @@
     triggers:
       - gerrit-trigger-patchset-created:
           server: 'gerrit.opnfv.org'
-          project: '**'
+          project: '{project}'
           branch: '{branch}'
           files: '{module}/{module}-client/**'
 
@@ -76,3 +77,61 @@
     publishers:
       - publish-coverage
       - email-jenkins-admins-on-failure
+
+- job-template:
+    name: '{module}-ui-verify-{stream}'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
+
+    scm:
+      - git-scm-gerrit
+
+    wrappers:
+      - nodejs-installator:
+          name: "testapi node"
+
+    triggers:
+      - gerrit-trigger-patchset-created:
+          server: 'gerrit.opnfv.org'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{module}/opnfv_testapi/ui/**'
+
+    builders:
+      - shell: |
+          set -e
+
+          if ! which google-chrome > /dev/null; then
+              #Install Google Chrome
+              wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+              echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | sudo tee \
+                  /etc/apt/sources.list.d/google-chrome.list
+              sudo apt-get update
+              sudo apt-get install -y google-chrome-stable
+          fi
+
+          npm -v
+          node -v
+          cd ./{module}/opnfv_testapi/ui/
+          npm install -g grunt-cli
+          npm install
+          grunt e2e
+          mv ../tests/UI/coverage/cobertura-coverage.xml ../../../coverage.xml # Moving coverage \
+             # xml to workspace as required by publish-coverage publisher.
+
+    publishers:
+      - text-finder-failures
+      - publish-coverage
+      - email-jenkins-admins-on-failure
+
+- publisher:
+    name: 'text-finder-failures'
+    publishers:
+      - text-finder:
+          regexp: " 0 failures"
+          also-check-console-output: true
+          succeed-if-found: true