From 0bbaed52afe35c97fb43c5fec376b3c03d19adf3 Mon Sep 17 00:00:00 2001 From: Sam Hague Date: Wed, 26 Dec 2018 08:51:07 -0500 Subject: [PATCH] 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 --- jjb/integration/integration-deploy-controller-run-test.sh | 2 +- jjb/integration/integration-templates.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh index 788da938b..1fab79e69 100755 --- 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 5d453e9df..2603c147c 100644 --- 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 -- 2.36.6