From 5da6535505f510533fddd483dc3dff89fbfaab45 Mon Sep 17 00:00:00 2001
From: Lusheng Ji <lji@research.att.com>
Date: Mon, 2 Apr 2018 20:45:48 -0400
Subject: Fix docker image tagging

Avoid double appending module ID to docker image tag.
Specifying pip and tox versions when do tox testiing.
(newest pip version 10.0.0b2 does not have pip.req)

Issue-ID: DCAEGEN2-206
Change-Id: Id2d714a3e62ffcbb2c2ed9ccb831dd60c7a29de7
Signed-off-by: Lusheng Ji <lji@research.att.com>
---
 scripts/mvn-phase-lib.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/mvn-phase-lib.sh b/scripts/mvn-phase-lib.sh
index 1f914b6..4a181f3 100644
--- a/scripts/mvn-phase-lib.sh
+++ b/scripts/mvn-phase-lib.sh
@@ -233,8 +233,9 @@ run_tox_test()
     rm -rf ./venv-tox ./.tox
     virtualenv ./venv-tox
     source ./venv-tox/bin/activate
-    pip install --upgrade pip
-    pip install --upgrade tox argparse
+    pip install pip==9.0.3
+    pip install --upgrade argparse
+    pip install tox==2.9.1
     pip freeze
     tox
     deactivate
@@ -432,7 +433,7 @@ upload_files_of_extension_recursively()
 {
   FILES=$(find . -name "*.$1")
   for F in $FILES ; do
-    upload_raw_file "$F"
+    upload_raw_file "$F" "$2"
   done
 }
 
@@ -473,7 +474,7 @@ build_and_push_docker()
   # Old tagging 
   #IMAGENAME="onap/${FQDN}.${MVN_PROJECT_MODULEID}"
   # new tagging
-  ENDIND=$(echo $abc | rev | cut -f1 -d '.' |rev)
+  ENDID=$(echo $FQDN | rev | cut -f1 -d '.' |rev)
   if [ "$ENDID" == "${MVN_PROJECT_MODULEID}" ]; then
     #IMAGENAME="onap/${FQDN/org.onap./}"
     IMAGENAME="onap/${FQDN}"
-- 
cgit 1.2.3-korg