From: Luis Gomez <ecelgp@gmail.com>
Date: Wed, 14 Jul 2021 23:52:04 +0000 (-0700)
Subject: Change opendaylight to karaf distro
X-Git-Tag: pre-potassium~114
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=95fb461b33883108097e6b320ac6df57b59ea20d

Change opendaylight to karaf distro

Change-Id: Ie05485c0545a3eea69d7f4409c5c64014d270d5b
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---

diff --git a/csit/libraries/NexusKeywords.robot b/csit/libraries/NexusKeywords.robot
index e459d91209..a35dfb3587 100644
--- a/csit/libraries/NexusKeywords.robot
+++ b/csit/libraries/NexusKeywords.robot
@@ -41,7 +41,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/opendaylight
+${NEXUS_RELEASES_URL}    ${NEXUS_RELEASE_BASE_URL}/org/opendaylight/integration/karaf
 
 *** Keywords ***
 Initialize_Artifact_Deployment_And_Usage
@@ -279,7 +279,7 @@ Get_ODL_Versions_From_Nexus
     @{elements}=    XML.Get_Elements    ${root}    .//version
     ${versions}=    BuiltIn.Create_List
     FOR    ${element}    IN    @{elements}
-        Collections.Append_To_List    ${versions}    ${element.text}
+        BuiltIn.Run_Keyword_If    'Carbon' not in $element.text    Collections.Append_To_List    ${versions}    ${element.text}
     END
     Collections.Sort_List    ${versions}
     BuiltIn.Log_Many    @{versions}
@@ -307,7 +307,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}/opendaylight-${latest_version}${format}
+    ${url}=    BuiltIn.Set_Variable    ${NEXUS_RELEASES_URL}/${latest_version}/karaf-${latest_version}${format}
     BuiltIn.Log    ${url}
     [Return]    ${url}
 
@@ -342,6 +342,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}/opendaylight-${latest_version}${format}
+    ${url}=    BuiltIn.Set_Variable    ${NEXUS_RELEASES_URL}/${latest_version}/karaf-${latest_version}${format}
     BuiltIn.Log    ${url}
     [Return]    ${url}