merge GIT_BRANCH and GERRIT_BRANCH into BRANCH

[releng.git] / jjb / moon / moon.yml

diff --git a/jjb/moon/moon.yml b/jjb/moon/moon.yml
index 0044eb9..a318bc5 100644 (file)
--- a/jjb/moon/moon.yml
+++ b/jjb/moon/moon.yml
@@ -17,18 +17,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'
@@ -51,4 +48,6 @@
 
     builders:
         - shell:
-            !include-raw: ./moon-verify.sh
+            #!/bin/bash
+            echo "launch Moon unit tests"
+            nosetest $WORKSPACE/keystone-moon/keystone/tests/moon/unit