merge GIT_BRANCH and GERRIT_BRANCH into BRANCH

[releng.git] / jjb / qtip / qtip-project-jobs.yml

diff --git a/jjb/qtip/qtip-project-jobs.yml b/jjb/qtip/qtip-project-jobs.yml
index 75f7511..00455f8 100644 (file)
--- a/jjb/qtip/qtip-project-jobs.yml
+++ b/jjb/qtip/qtip-project-jobs.yml
@@ -1,38 +1,37 @@
 - project:
-    name: qtip
+    name: qtip-project-jobs
 
-    project: '{name}'
+    project: 'qtip'
 
     jobs:
         - 'qtip-verify-{stream}'
 
-# only master branch is enabled at the moment to keep no of jobs sane
     stream:
         - master:
             branch: '{stream}'
             gs-pathname: ''
-        - brahmaputra:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
+            disabled: false
 
+################################
+## job templates
+#################################
 - job-template:
     name: 'qtip-verify-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -53,6 +52,19 @@
                   - compare-type: ANT
                     pattern: 'docs/**|.gitignore'
 
+    builders:
+        - qtip-unit-tests-and-docs-build
+
+################################
+## job builders
+#################################
+- builder:
+    name: qtip-unit-tests-and-docs-build
     builders:
         - shell: |
-            echo "Nothing to verify!"
+            #!/bin/bash
+            set -o errexit
+            set -o pipefail
+            set -o xtrace
+
+            tox