X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yml;h=9c1dedc035a7af798040bc47ecac1e20081d4a15;hb=b2bc05dad00f551cdcaa10c4f3864adc67639dbf;hp=b3de969f8711bc73b62cbfd6d16313479e797b8e;hpb=0cd71faff9baccc6448d8b4019ec8a5f8d8382df;p=releng.git

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index b3de969f8..9c1dedc03 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -60,10 +60,7 @@
             description: "Used for overriding the GIT URL coming from parameters macro."
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
@@ -117,10 +114,7 @@
             description: "Used for overriding the GIT URL coming from parameters macro."
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
@@ -223,10 +217,7 @@
             description: "Used for overriding the GIT URL coming from parameters macro."
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm
 
     properties:
         - build-blocker:
@@ -283,10 +274,7 @@
             description: "Used for overriding the GIT URL coming from parameters macro."
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm
 
     properties:
         - build-blocker:
@@ -341,10 +329,7 @@
             description: "Used for overriding the GIT URL coming from parameters macro."
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     properties:
         - build-blocker:
@@ -362,7 +347,7 @@
         - trigger-builds:
           - project: 'apex-deploy-virtual-os-nosdn-nofeature-noha-{stream}'
             predefined-parameters: |
-              BUILD_DIRECTORY=apex-build-{stream}/build
+              BUILD_DIRECTORY=apex-build-{stream}/.build
               OPNFV_CLEAN=yes
             git-revision: false
             same-node: true
@@ -384,10 +369,7 @@
     disabled: false
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     parameters:
         - project-parameter:
@@ -431,10 +413,7 @@
     disabled: false
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     parameters:
         - project-parameter:
@@ -474,10 +453,7 @@
     disabled: false
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     parameters:
         - project-parameter: