INTTEST-71: Update nexus release url link

post-carbon the release URL changed from /distribution-karaf
to just /karaf. The controller upgrade suite was still pulling
a carbon release to install an "older" ODL because of this.
Since Magnesium CSIT is configured to only use jdk11 and
Carbon will not start with jdk11 the job was broken.

The changes here will also ensure that the suite will find
and use the previous major version as the "old" controller
install.

Change-Id: I1312fdb95a5969fc86fd1c20afd90e637bbc6043
Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>

diff --git a/csit/libraries/NexusKeywords.robot b/csit/libraries/NexusKeywords.robot
index 690e80d5c870da4d2e870522b891a93a2a918eb5..a42bb098afa2dcaf39c60152e42a480345059f25 100644 (file)
--- a/csit/libraries/NexusKeywords.robot
+++ b/csit/libraries/NexusKeywords.robot
@@ -21,6 +21,7 @@ Library           String
 Library           XML
 Library           Collections
 Library           RequestsLibrary
+Resource          ${CURDIR}/CompareStream.robot
 Resource          ${CURDIR}/SSHKeywords.robot
 Resource          ${CURDIR}/Utils.robot
 
@@ -42,7 +43,7 @@ ${MAVEN_SETTINGS_URL}    https://raw.githubusercontent.com/opendaylight/odlparen
 ${MAVEN_VERSION}    3.3.9
 ${NEXUS_FALLBACK_URL}    ${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot
 ${NEXUS_RELEASE_BASE_URL}    https://nexus.opendaylight.org/content/repositories/opendaylight.release
-${NEXUS_RELEASES_URL}    ${NEXUS_RELEASE_BASE_URL}/org/opendaylight/integration/distribution-karaf
+${NEXUS_RELEASES_URL}    ${NEXUS_RELEASE_BASE_URL}/org/opendaylight/integration/opendaylight
 
 *** Keywords ***
 Initialize_Artifact_Deployment_And_Usage
@@ -309,7 +310,7 @@ Get_Latest_ODL_Stream_Release_URL
     [Arguments]    ${stream}=latest    ${format}=.zip
     [Documentation]    Returns URL for last release for specified stream. Default format is .zip.
     ${latest_version}=    Get_Latest_ODL_Stream_Release    ${stream}
-    ${url}=    BuiltIn.Set_Variable    ${NEXUS_RELEASES_URL}/${latest_version}/distribution-karaf-${latest_version}${format}
+    ${url}=    BuiltIn.Set_Variable    ${NEXUS_RELEASES_URL}/${latest_version}/opendaylight-${latest_version}${format}
     BuiltIn.Log    ${url}
     [Return]    ${url}
 
@@ -318,13 +319,25 @@ Get_Latest_ODL_Previous_Stream_Release
     [Documentation]    Returns name for last release for previous stream of specified stream.
     ...    Note: If specified stream is not found on nexus, then it is taken as new one (not released yet).
     ...    So in this case, latest release version is return.
+    ...
+    ...    NOTE: the below logic is stripping the initial 0. values from the 0.x.x version string that is
+    ...    the current (and future) version numbering scheme. There is always a leading 0. to the version
+    ...    strings and stripping it makes is easier to do int comparison to find the largest version in the
+    ...    list. Comparing as strings does not work. There are some python libs like distutils.version
+    ...    or packaging that can do a better job comparing versions, but since ODL version numbering is simple
+    ...    at this point, this convention will suffice. The leading 0. will be added back after the the latest
+    ...    version is found from the list. The CompareStream.robot library keeps a mapping of major version
+    ...    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
-    ${latest_version}=    BuiltIn.Set_Variable    xxx
+    ${current_version}=    BuiltIn.Set_Variable    &{Stream_dict}[${ODL_STREAM}].0
+    ${latest_version}=    BuiltIn.Set_Variable    0.0
     FOR    ${version}    IN    @{versions}
-        BuiltIn.Exit_For_Loop_If    '${stream}'.title() in '${version}'
-        ${latest_version}=    BuiltIn.Set_Variable    ${version}
+        ${version} =    String.Replace String Using Regexp    ${version}    ^0\.    ${EMPTY}
+        ${latest_version}=    Set Variable If    ${version} > ${latest_version} and ${version} < ${current_version}    ${version}    ${latest_version}
     END
-    BuiltIn.Run_Keyword_If    '${latest_version}'=='xxx'    BuiltIn.Fail    Could not find latest previous release for stream ${stream}
+    ${latest_version}=    Set Variable    0.${latest_version}
+    BuiltIn.Run_Keyword_If    '${latest_version}'=='0.0.0'    BuiltIn.Fail    Could not find latest previous release for stream ${stream}
     BuiltIn.Log    ${latest_version}
     [Return]    ${latest_version}
 
@@ -332,6 +345,6 @@ Get_Latest_ODL_Previous_Stream_Release_URL
     [Arguments]    ${stream}=${ODL_STREAM}    ${format}=.zip
     [Documentation]    Returns URL for last release for previous stream of specified stream. Default format is .zip.
     ${latest_version}=    Get_Latest_ODL_Previous_Stream_Release    ${stream}
-    ${url}=    BuiltIn.Set_Variable    ${NEXUS_RELEASES_URL}/${latest_version}/distribution-karaf-${latest_version}${format}
+    ${url}=    BuiltIn.Set_Variable    ${NEXUS_RELEASES_URL}/${latest_version}/opendaylight-${latest_version}${format}
     BuiltIn.Log    ${url}
     [Return]    ${url}