X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdovetail%2Fdovetail-project-jobs.yml;h=1accffcdb824f0506f573653044db94622649837;hb=d63b62357077891d9395d351fd85e97d31ad87fc;hp=826684919afc6c08c548f8b81c188558da07027a;hpb=bd5b2d590ab6c5640a3982efc2fb52b1051e9329;p=releng.git

diff --git a/jjb/dovetail/dovetail-project-jobs.yml b/jjb/dovetail/dovetail-project-jobs.yml
index 826684919..1accffcdb 100644
--- a/jjb/dovetail/dovetail-project-jobs.yml
+++ b/jjb/dovetail/dovetail-project-jobs.yml
@@ -1,3 +1,4 @@
+---
 ###################################################
 # Non-ci jobs for Dovetail project
 # They will only be enabled on request by projects!
@@ -8,13 +9,17 @@
     project: 'dovetail'
 
     jobs:
-        - 'dovetail-verify-{stream}'
-        - 'dovetail-merge-{stream}'
+      - 'dovetail-verify-{stream}'
+      - 'dovetail-merge-{stream}'
 
     stream:
-        - master:
-            branch: '{stream}'
-            disabled: false
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - danube:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
 
 ################################
 # job templates
@@ -26,36 +31,35 @@
     disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - git-scm-gerrit
+      - 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}'
+      - 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:
-        - dovetail-unit-tests
+      - dovetail-unit-tests
 
 - job-template:
     name: 'dovetail-merge-{stream}'
@@ -63,55 +67,50 @@
     disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - git-scm
+      - git-scm
 
     triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remerge'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
 
     builders:
-        - dovetail-unit-tests
+      - dovetail-unit-tests
 
 ################################
-#builders for dovetail project
+# builders for dovetail project
 ###############################
+- builder:
+    name: dovetail-hello-world
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+
+          echo "hello world"
+
+
 - builder:
     name: dovetail-unit-tests
     builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
-            set -o pipefail
-
-            echo "Running unit tests..."
-            cd $WORKSPACE
-            virtualenv $WORKSPACE/dovetail_venv
-            source $WORKSPACE/dovetail_venv/bin/activate
-
-            #packages installation
-            easy_install -U setuptools
-            easy_install -U pip
-            pip install -r unittests/requirements.txt
-            pip install -e .
-
-            #unit tests
-            /bin/bash $WORKSPACE/unittests/unittest.sh
-
-            deactivate
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+          set -o pipefail
+
+          tox