From: garciaale <agarcia@whitestack.com>
Date: Tue, 1 Dec 2020 15:29:31 +0000 (-0300)
Subject: Forcing the tests repo to use sol006 branch of packages with master client
X-Git-Tag: release-v9.0-start~5
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=82f05de6c5c3abc018bd4a9639bbecf9dc2c2847;hp=d2532d3d6467409905ade3358dde55e2bac36e67;p=osm%2Ftests.git

Forcing the tests repo to use sol006 branch of packages with master client

Change-Id: I8b8ed82abff78f2b78cc604b5233a1a5f65ad983
Signed-off-by: garciaale <agarcia@whitestack.com>
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index aec7c83..7e0bbce 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -25,7 +25,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install git soft
 RUN add-apt-repository -y ppa:rmescandon/yq && apt update && apt install yq -y 
 
 RUN python3 -m pip install haikunator requests robotframework robotframework-seleniumlibrary robotframework-requests robotframework-jsonlibrary \
-        robotframework-sshlibrary charm-tools git+https://osm.etsi.org/gerrit/osm/IM.git git+https://osm.etsi.org/gerrit/osm/osmclient.git@sol006
+        robotframework-sshlibrary charm-tools git+https://osm.etsi.org/gerrit/osm/IM.git git+https://osm.etsi.org/gerrit/osm/osmclient.git
 
 # Preparing working environment
 WORKDIR /robot-systest
diff --git a/robot-systest/run_test.sh b/robot-systest/run_test.sh
index 863cb44..b4803d3 100755
--- a/robot-systest/run_test.sh
+++ b/robot-systest/run_test.sh
@@ -29,7 +29,7 @@ download_packages(){
     echo -e "\nDownloading packages ${PACKAGES}"
     rm -rf ${PACKAGES_FOLDER}
     git clone https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages.git ${PACKAGES_FOLDER} && (cd ${PACKAGES_FOLDER} && \
-        git checkout ${PACKAGES})
+        git checkout sol006)
 }
 
 download_tst010(){