fix for pom and script

Change-Id: I02791a53457721a7ab0fe70b8b903f62cce96eb0
Issue-ID: SDC-2028
Signed-off-by: ilanap <ilanap@amdocs.com>

diff --git a/cucumber-js-test-apis-ci/docker_run.sh b/cucumber-js-test-apis-ci/docker_run.sh
index dc39627..e202c9a 100644 (file)
--- a/cucumber-js-test-apis-ci/docker_run.sh
+++ b/cucumber-js-test-apis-ci/docker_run.sh
@@ -1 +1,108 @@
-docker run --volume /data/environments:/var/lib/tests/environments --volume /data/logs/cucumber:/var/lib/tests/report nfv/cucumber-sdc-api-tests:latest
+#!/bin/bash
+
+
+TESTDIR=`pwd`
+TESTDIR=$TESTDIR/target/ciTest
+
+# checking some stuff for local run
+if [ -z "$BUILD_NUMBER" ]
+then
+    if [ -z "$WORKSPACE" ]
+    then
+        currentDir=`pwd`
+        cd ../
+        WORKSPACE=`pwd`
+        cd $currentDir
+    fi
+    if [ -z "$IMAGES_TAG" ]
+    then
+        IMAGES_TAG=1.4-STAGING-latest
+    fi
+    if [ -z "$LOGS_LOCATION" ]
+    then
+        LOGS_LOCATION=$TESTDIR
+    fi
+fi
+echo $WORKSPACE
+
+# add dynamic ports from kubernetes master
+if [ -z "$TEST_CI_BE_HOST" ]
+then
+    TEST_CI_BE_HOST="$(ifconfig  'eth0' | sed -n '2p' | awk '{print $2}' | sed 's/addr://g')"
+    TEST_CI_BE_PORT=8285
+    TEST_CI_CATALOG_HOST=$TEST_CI_BE_HOST
+    TEST_CI_CATALOG_PORT=$TEST_CI_BE_PORT
+    TEST_CI_AP_HOST=$TEST_CI_BE_HOST
+    TEST_CI_AP_PORT=8080
+fi
+
+
+echo "host $TEST_CI_BE_HOST"
+
+if [ -e "./target/ciTest" ]
+then
+       rm -Rf ./target/ciTest
+fi
+
+
+mkdir -p $TESTDIR
+echo "running from $TESTDIR"
+
+mkdir -p $TESTDIR/data/logs/cucumber
+mkdir -p $TESTDIR/data/scripts
+mkdir -p $TESTDIR/data/environments
+
+cp $WORKSPACE/sdc-os-chef/environments/Template.json $TESTDIR/TEST_CI.json
+cp $WORKSPACE/sdc-os-chef/scripts/docker_run.sh $TESTDIR/data/scripts
+cp $WORKSPACE/cucumber-js-test-apis-ci/config.json $TESTDIR/data/environments/dockerConfig.json
+
+
+chmod 777 $TESTDIR/data/scripts/docker_run.sh
+
+sed -i "s/xxx/TEST_CI/g" $TESTDIR/TEST_CI.json
+sed -i "s/yyy/$TEST_CI_BE_HOST/g" $TESTDIR/TEST_CI.json
+sed -i "s/8080/$TEST_CI_BE_PORT/g" $TESTDIR/TEST_CI.json
+mv $TESTDIR/TEST_CI.json $TESTDIR/data/environments
+
+echo "getting images for $IMAGES_TAG"
+OLD_WORKSPACE=$WORKSPACE
+export WORKSPACE=$TESTDIR
+$WORKSPACE/data/scripts/docker_run.sh -e TEST_CI -r $IMAGES_TAG -sim -p 10001
+
+echo "setting configuration"
+
+sed -i "s/onboarding.port/$TEST_CI_BE_PORT/g" $TESTDIR/data/environments/dockerConfig.json
+sed -i "s/onboarding.server/$TEST_CI_BE_HOST/g" $TESTDIR/data/environments/dockerConfig.json
+sed -i "s/onboarding.user/cs0008/g" $TESTDIR/data/environments/dockerConfig.json
+sed -i "s/CatalogBE.port/$TEST_CI_CATALOG_PORT/g" $TESTDIR/data/environments/dockerConfig.json
+sed -i "s/CatalogBE.server/$TEST_CI_CATALOG_HOST/g" $TESTDIR/data/environments/dockerConfig.json
+sed -i "s/CatalogBE.user/cs0008/g" $TESTDIR/data/environments/dockerConfig.json
+sed -i "s/activity_spec.port/$TEST_CI_AP_PORT/g" $TESTDIR/data/environments/dockerConfig.json
+sed -i "s/activity_spec.server/$TEST_CI_AP_HOST/g" $TESTDIR/data/environments/dockerConfig.json
+sed -i "s/activity_spec.user/cs0008/g" $TESTDIR/data/environments/dockerConfig.json
+
+cat $TESTDIR/data/environments/dockerConfig.json
+
+echo "time to run the cucumber"
+
+# TODO check status and tar stuff
+docker run --name cucumber-sdc-api-tests --volume $WORKSPACE/data/environments:/var/lib/tests/environments --volume $WORKSPACE/data/logs/cucumber:/var/lib/tests/report onap/cucumber-sdc-api-tests:latest
+DOCKER_ID=`docker ps -a --filter name="cucumber-sdc-api-test" --format "{{.ID}}"`
+EXIT_STATUS=`docker inspect $DOCKER_ID --format='{{.State.ExitCode}}'`
+echo "cucumber docker exited with status $EXIT_STATUS"
+
+tar -czf $TESTDIR/logs_$BUILD_NUMBER.tar.gz $TESTDIR/data/logs $TESTDIR/data/environments
+## Move to NFS location
+echo "Logs can be found at: $LOGS_LOCATION/logs_$BUILD_NUMBER.tar.gz"
+if [ ! -d "$LOGS_LOCATION" ]; then
+  sudo mkdir -p $LOGS_LOCATION
+fi
+
+sudo cp $TESTDIR/logs_$BUILD_NUMBER.tar.gz $LOG_LOCATION_SERVER_PREFIX$LOGS_LOCATION/logs_$BUILD_NUMBER.tar.gz
+sudo cp $TESTDIR/data/cucumber/report.html $LOGS_LOCATION/emailable-report-$BUILD_NUMBER.html
+WORKSPACE=$OLD_WORKSPACE
+
+echo "removing all the dockers"
+docker ps -a --filter "name=sdc-" | grep $IMAGES_TAG | cut -d " " -f1 | xargs docker rm -f
+
+exit $EXIT_STATUS

diff --git a/cucumber-js-test-apis-ci/pom.xml b/cucumber-js-test-apis-ci/pom.xml
index d3dda71..0d2f134 100644 (file)
--- a/cucumber-js-test-apis-ci/pom.xml
+++ b/cucumber-js-test-apis-ci/pom.xml
@@ -106,7 +106,7 @@
               <images>
                 <!-- Build sanity image -->
                 <image>
-                  <name>nfv/cucumber-sdc-api-tests</name>
+                  <name>onap/cucumber-sdc-api-tests</name>
                   <alias>cucumber-sdc-api-tests</alias>
                   <build>
                     <cleanup>try</cleanup>
@@ -128,7 +128,7 @@
                 </goals>
                 <configuration>
                   <removeAll>true</removeAll>
-                  <image>nfv/cucumber-sdc-api-tests</image>
+                  <image>onap/cucumber-sdc-api-tests</image>
                 </configuration>
               </execution>
               <execution>
@@ -145,7 +145,7 @@
                   <goal>push</goal>
                 </goals>
                 <configuration>
-                  <image>nfv/cucumber-sdc-api-tests</image>
+                  <image>onap/cucumber-sdc-api-tests</image>
                 </configuration>
               </execution>
             </executions>