From: Sam Hague Date: Wed, 26 Dec 2018 14:47:10 +0000 (-0500) Subject: Fix wrong GERRIT_PROJECT X-Git-Tag: pre-potassium~422 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=5856b0886f8024dd1b6cabdddfd1a68d73a42bd7;p=integration%2Ftest.git 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. Depends-on: I426b516d2b81f1f2a758552f3e97c16f08e46127 Change-Id: I7d6d5e3d3ffe76807692a7b9bdd52fbca8377fe5 Signed-off-by: Sam Hague --- diff --git a/csit/libraries/Coe.robot b/csit/libraries/Coe.robot index a807177593..ac812ae1c5 100644 --- a/csit/libraries/Coe.robot +++ b/csit/libraries/Coe.robot @@ -74,7 +74,7 @@ Configuration Playbook SSHKeywords.Copy_File_To_Remote_System ${K8s_MASTER_IP} ${WATCHER_COE} ${USER_HOME} OperatingSystem.Copy File ${PLAYBOOK_FILE} ${USER_HOME} ${branch_ref_spec} = BuiltIn.Catenate SEPARATOR= refs/heads/ ${GERRIT_BRANCH} - ${gerrit_ref_spec} = BuiltIn.Set Variable If '${GERRIT_PROJECT}' != 'coe' ${branch_ref_spec} ${GERRIT_REFSPEC} + ${gerrit_ref_spec} = BuiltIn.Set Variable If '${GERRIT_PROJECT_ROOT}' != 'coe' ${branch_ref_spec} ${GERRIT_REFSPEC} Run Coe Playbook ${gerrit_ref_spec} Run Coe Playbook