merge GIT_BRANCH and GERRIT_BRANCH into BRANCH

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

diff --git a/jjb/dovetail/dovetail-project-jobs.yml b/jjb/dovetail/dovetail-project-jobs.yml
index 41fd8cd..9dc4808 100644 (file)
--- a/jjb/dovetail/dovetail-project-jobs.yml
+++ b/jjb/dovetail/dovetail-project-jobs.yml
@@ -28,18 +28,15 @@
     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'
@@ -67,18 +64,15 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -97,25 +91,21 @@
 #builders for dovetail project
 ###############################
 - builder:
-    name: dovetail-unit-tests
+    name: dovetail-hello-world
     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
+            echo "hello world"
 
-            #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
+- builder:
+    name: dovetail-unit-tests
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -o errexit
+            set -o pipefail
 
-            deactivate
+            tox