Fix wrong GERRIT_PROJECT

GERRIT_PROJECT is used in the csit job to clone
the integration/test project so it can not be
overwritten with the root tst-patch job.

Change-Id: I426b516d2b81f1f2a758552f3e97c16f08e46127
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh
index 788da938b0c3a20b7220d502fc7bd62c57ce1d28..1fab79e69a0e92e5f5c6cb6ef23414dec58aeb13 100755 (executable)
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -55,7 +55,7 @@ robot -N ${TESTPLAN} \
       -v CONTROLLER:${ODL_SYSTEM_IP} \
       -v CONTROLLER_USER:${USER} \
       -v GERRIT_BRANCH:${GERRIT_BRANCH} \
-      -v GERRIT_PROJECT:${GERRIT_PROJECT} \
+      -v GERRIT_PROJECT_ROOT:${GERRIT_PROJECT_ROOT} \
       -v GERRIT_REFSPEC:${GERRIT_REFSPEC} \
       -v JAVA_HOME:${JAVA_HOME} \
       -v JDKVERSION:${JDKVERSION} \

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 5d453e9df91db80c3a3fd22692d21ff20ff5402d..2603c147cc6eb93f3299e95d912d8297faacfd5f 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1796,7 +1796,7 @@
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
               GERRIT_BRANCH=$GERRIT_BRANCH
-              GERRIT_PROJECT=GERRIT_PROJECT
+              GERRIT_PROJECT_ROOT=$GERRIT_PROJECT
               GERRIT_REFSPEC=$GERRIT_REFSPEC
               KARAF_VERSION=$KARAF_VERSION