From 9be454630e9e8e27a805b0b0086888eda4f4bb0c Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Mon, 12 Dec 2016 19:03:07 +0100
Subject: 3rd party ci: Override GIT_BASE to use ODL Gerrit for 3rd party ci
 jobs

Change-Id: Ia105d32133c5b2df3bea363ff8cb94b2984fb172
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
---
 jjb/3rd_party_ci/functest-netvirt.sh    |  1 +
 jjb/3rd_party_ci/odl-netvirt.yml        | 21 ++++++++++++++-------
 jjb/3rd_party_ci/postprocess-netvirt.sh |  1 +
 jjb/global/slave-params.yml             |  4 ++++
 4 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'jjb')

diff --git a/jjb/3rd_party_ci/functest-netvirt.sh b/jjb/3rd_party_ci/functest-netvirt.sh
index 23bf47c06..abc7975ce 100755
--- a/jjb/3rd_party_ci/functest-netvirt.sh
+++ b/jjb/3rd_party_ci/functest-netvirt.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
 echo "Hello World"
+ls -al $WORKSPACE
diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml
index 3fd007764..d44fc36f4 100644
--- a/jjb/3rd_party_ci/odl-netvirt.yml
+++ b/jjb/3rd_party_ci/odl-netvirt.yml
@@ -55,15 +55,19 @@
         - 'odl-netvirt-virtual-defaults'
 
     scm:
-        - git:
-            url: 'https://git.opendaylight.org/gerrit/p/$PROJECT.git'
+        #- git:
+        #    url: 'https://git.opendaylight.org/gerrit/p/$PROJECT.git'
+        #    refspec: '$GERRIT_REFSPEC'
+        #    branches:
+        #        - 'origin/$GERRIT_BRANCH'
+        #    skip-tag: true
+        #    choosing-strategy: 'gerrit'
+        #    timeout: 10
+        #    wipe-workspace: true
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
             refspec: '$GERRIT_REFSPEC'
-            branches:
-                - 'origin/$GERRIT_BRANCH'
-            skip-tag: true
             choosing-strategy: 'gerrit'
-            timeout: 10
-            wipe-workspace: true
 
     triggers:
         - gerrit:
@@ -84,6 +88,9 @@
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
+        - shell: |
+            #!/bin/bash
+            ls -al $WORKSPACE
         - multijob:
             name: install
             condition: SUCCESSFUL
diff --git a/jjb/3rd_party_ci/postprocess-netvirt.sh b/jjb/3rd_party_ci/postprocess-netvirt.sh
index 23bf47c06..abc7975ce 100755
--- a/jjb/3rd_party_ci/postprocess-netvirt.sh
+++ b/jjb/3rd_party_ci/postprocess-netvirt.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
 echo "Hello World"
+ls -al $WORKSPACE
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 8661b9517..d1b4b8f5f 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -676,6 +676,10 @@
         - label:
             name: SLAVE_LABEL
             default: 'odl-netvirt-virtual'
+        - string:
+            name: GIT_BASE
+            default: https://git.opendaylight.org/gerrit/p/$PROJECT.git
+            description: 'Git URL to use on this Jenkins Slave'
 #####################################################
 # These slaves are just dummy slaves for sandbox jobs
 #####################################################
-- 
cgit 1.2.3-korg