xci: Always clone releng-xci into WORKSPACE for merge jobs

The cloning of the correct version of the repo which the scenario
resides in will be handled by get-opnfv-scenario-requirements.yml
for all the scenarios.

The change proposed for merge jobs will be reflected to verify jobs
as well once it is verified with this.

Change-Id: Icaa99a8b9e981c839969ce556e5af6a9ef6d9da8
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>

diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index df03a04..f4d039b 100644 (file)
--- a/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@ -74,7 +74,12 @@
       - fix-workspace-permissions
 
     scm:
-      - git-scm
+      - git:
+          credentials-id: '$SSH_CREDENTIAL_ID'
+          url: 'https://gerrit.opnfv.org/gerrit/releng-xci'
+          branches:
+            - 'origin/master'
+          timeout: 15
 
     triggers:
       - gerrit: