Merge "Modify tempest.conf to enable Tempest failed test cases to pass on Compass"

diff --git a/jjb/calipso/calipso.yml b/jjb/calipso/calipso.yml
new file mode 100644 (file)
index 0000000..b8d10eb
--- /dev/null
+++ b/jjb/calipso/calipso.yml
@@ -0,0 +1,59 @@
+- project:
+    name: calipso
+
+    project: '{name}'
+
+    jobs:
+        - 'calipso-verify-{stream}'
+
+    stream:
+        - master:
+            branch: '{stream}'
+            disabled: false
+
+- job-template:
+    name: 'calipso-verify-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: '{branch}'
+
+    scm:
+        - git-scm-gerrit
+
+    triggers:
+        - gerrit:
+            server-name: 'gerrit.opnfv.org'
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'false'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'false'
+                - draft-published-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+
+    builders:
+        - verify-unit-tests
+
+- builder:
+    name: verify-unit-tests
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -o errexit
+            set -o nounset
+            set -o pipefail
+            cd $WORKSPACE
+            PYTHONPATH=$PWD/app python3 -m unittest discover -s app/test/fetch

diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 6bc0642..8d1ee55 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -109,6 +109,10 @@
         - label:
             name: SLAVE_LABEL
             default: 'xci-virtual-{distro}'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 
     builders:
         - description-setter:
@@ -130,7 +134,7 @@
             condition: SUCCESSFUL
             projects:
                 - name: 'xci-verify-healthcheck-{type}-{stream}'
-                  current-parameters: false
+                  current-parameters: true
                   predefined-parameters: |
                     DISTRO={distro}
                     DEPLOY_SCENARIO=os-nosdn-nofeature-noha
@@ -162,7 +166,7 @@
     parameters:
         - string:
             name: DISTRO
-            default: '{distro}'
+            default: 'xenial'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-noha'
@@ -173,11 +177,15 @@
             name: XCI_FLAVOR
             default: 'mini'
         - string:
-            name: XCI_DEVEL_ROOT
-            default: $WORKSPACE
+            name: OPNFV_RELENG_DEV_PATH
+            default: $WORKSPACE/
         - string:
             name: ANSIBLE_VERBOSITY
             default: '-vvvv'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
 
     wrappers:
         - ssh-agent-wrapper
@@ -202,7 +210,11 @@
         - shell: |
             #!/bin/bash
 
-            cd $WORKSPACE
+            # for some reason, the PATH is not set correctly
+            # setting PATH for ansible stuff
+            export PATH=/home/jenkins/.local/bin:$PATH
+
+            cd $WORKSPACE/xci
             ./xci-deploy.sh
 
 - builder: