Remove neon version of netconf testplans

[integration/test.git] / csit / libraries / NexusKeywords.robot

diff --git a/csit/libraries/NexusKeywords.robot b/csit/libraries/NexusKeywords.robot
index b686f41fe20fe9bc42e7cf8968d3a7bd0ee2cba9..929a91264ccfd8dfa7b9b3060bd971aa6184634c 100644 (file)
--- a/csit/libraries/NexusKeywords.robot
+++ b/csit/libraries/NexusKeywords.robot
@@ -27,6 +27,7 @@ Resource          ${CURDIR}/Utils.robot
 
 *** Variables ***
 &{COMPONENT_MAPPING}    netconf=netconf-impl    bgpcep=pcep-impl    carpeople=clustering-it-model    yangtools=yang-data-impl    bindingv1=mdsal-binding-generator-impl
+@{RELEASE_INTEGRATED_COMPONENTS}    mdsal    odlparent    yangtools
 ${JDKVERSION}     None
 ${JAVA_8_HOME_CENTOS}    /usr/lib/jvm/java-1.8.0
 ${JAVA_8_HOME_UBUNTU}    /usr/lib/jvm/java-8-openjdk-amd64
@@ -111,7 +112,10 @@ Deploy_Artifact
     ${urlbase} =    String.Fetch_From_Left    ${BUNDLE_URL}    /org/opendaylight
     # If the BUNDLE_URL points somewhere else (perhaps *patch-test* job in Jenkins),
     # ${urlbase} is the whole ${BUNDLE_URL}, in which case we use the ${fallback_url}
+    # If we are working with a "release integrated" project, we always will want to look for
+    # a released version, not in the snapshots
     ${urlbase} =    BuiltIn.Set_Variable_If    '${urlbase}' != '${BUNDLE_URL}'    ${urlbase}    ${fallback_url}
+    ${urlbase} =    BuiltIn.Set_Variable_If    '${component}' in @{RELEASE_INTEGRATED_COMPONENTS}    ${NEXUS_RELEASE_BASE_URL}    ${urlbase}
     ${version}    ${location} =    NexusKeywords__Detect_Version_To_Pull    ${component}
     # TODO: Use RequestsLibrary and String instead of curl and bash utilities?
     ${url} =    BuiltIn.Set_Variable    ${urlbase}/${location}/${artifact}/${version}
@@ -233,8 +237,7 @@ Install_Maven_Bare
     SSHKeywords.Execute_Command_At_Cwd_Should_Pass    wget -N '${maven_download_url}'    stderr_must_be_empty=False
     SSHKeywords.Execute_Command_At_Cwd_Should_Pass    tar xvf '${maven_archive_filename}'
     ${java_home} =    NexusKeywords.Compose_Java_Home    openjdk=${openjdk}
-    ${java_actual_options} =    Default_Java_Options    ${openjdk}
-    BuiltIn.Set_Global_Variable    \${maven_bash_command}    export JAVA_HOME='${java_home}' && export MAVEN_OPTS='${java_actual_options}' && ./${maven_directory}/bin/mvn
+    BuiltIn.Set_Global_Variable    \${maven_bash_command}    export JAVA_HOME='${java_home}' && export MAVEN_OPTS='${JAVA_OPTIONS}' && ./${maven_directory}/bin/mvn
     # TODO: Get settings files from Jenkins settings provider, somehow.
     SSHKeywords.Execute_Command_At_Cwd_Should_Pass    wget '${MAVEN_SETTINGS_URL}' -O settings.xml    stderr_must_be_empty=False
 
@@ -319,7 +322,7 @@ Get_Latest_ODL_Previous_Stream_Release
     ...    numbers to the global variable ${ODL_STREAM} so that is used to ensure we get a major version that is
     ...    older than the current running major version.
     ${latest}    @{versions}=    Get_ODL_Versions_From_Nexus
-    ${current_version}=    BuiltIn.Set_Variable    &{Stream_dict}[${ODL_STREAM}].0
+    ${current_version}=    BuiltIn.Set_Variable    ${Stream_dict}[${ODL_STREAM}].0
     ${latest_version}=    BuiltIn.Set_Variable    0.0
     FOR    ${version}    IN    @{versions}
         ${version} =    String.Replace String Using Regexp    ${version}    ^0\.    ${EMPTY}