summaryrefslogtreecommitdiffstats
path: root/cucumber-js-test-apis-ci
diff options
context:
space:
mode:
Diffstat (limited to 'cucumber-js-test-apis-ci')
-rw-r--r--cucumber-js-test-apis-ci/docker_run.sh14
-rw-r--r--cucumber-js-test-apis-ci/pom.xml50
2 files changed, 30 insertions, 34 deletions
diff --git a/cucumber-js-test-apis-ci/docker_run.sh b/cucumber-js-test-apis-ci/docker_run.sh
index 0bfbd11d54..da4c532490 100644
--- a/cucumber-js-test-apis-ci/docker_run.sh
+++ b/cucumber-js-test-apis-ci/docker_run.sh
@@ -17,19 +17,18 @@ then
fi
fi
echo "Workspace under: $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=8081
TEST_CI_CATALOG_HOST=$TEST_CI_BE_HOST
+ TEST_CI_CATALOG_PORT=8080
TEST_CI_AP_HOST=$TEST_CI_BE_HOST
TEST_CI_AP_PORT=8080
fi
-if [ -z "$TEST_CI_CATALOG_PORT" ]
-then
- TEST_CI_CATALOG_PORT=8080
-fi
+
echo "host $TEST_CI_BE_HOST"
@@ -52,14 +51,11 @@ chmod 777 $WORKSPACE/data/scripts/docker_run.sh
sed -i "s/xxx/TEST_CI/g" $WORKSPACE/TEST_CI.json
sed -i "s/yyy/$TEST_CI_BE_HOST/g" $WORKSPACE/TEST_CI.json
+sed -i "s/8080/$TEST_CI_BE_PORT/g" $WORKSPACE/TEST_CI.json
mv $WORKSPACE/TEST_CI.json $WORKSPACE/data/environments
-sed -i "s/8080:8080/$TEST_CI_CATALOG_PORT:8080/g" $WORKSPACE/data/scripts/docker_run.sh
-sed -i "s/:8080\/sdc/:$TEST_CI_CATALOG_PORT\/sdc/g" $WORKSPACE/data/scripts/docker_run.sh
-
-
echo "getting images for $IMAGES_TAG"
-$WORKSPACE/data/scripts/docker_run.sh -e TEST_CI -r $IMAGES_TAG -p 10001
+$WORKSPACE/data/scripts/docker_run.sh -e TEST_CI -r $IMAGES_TAG -sim -p 10001
echo "setting configuration"
diff --git a/cucumber-js-test-apis-ci/pom.xml b/cucumber-js-test-apis-ci/pom.xml
index 3a9e9d59bf..a6081c1786 100644
--- a/cucumber-js-test-apis-ci/pom.xml
+++ b/cucumber-js-test-apis-ci/pom.xml
@@ -9,7 +9,7 @@
<artifactId>cucumber-bdd</artifactId>
<name>cucumber-bdd</name>
<groupId>org.openecomp.sdc</groupId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
<plugins>
@@ -54,32 +54,32 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- </configuration>
- </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ </configuration>
+ </plugin>
</plugins>
<resources>
- <resource>
- <directory>${basedir}/docker</directory>
- <targetPath>${project.build.directory}/docker_assembly</targetPath>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>features/**/*</include>
- <include>stepDefinitions/**/*</include>
- <include>plugins/**/*</include>
- <include>resources/**/*</include>
- <include>*.js*</include>
- </includes>
- <targetPath>${project.build.directory}/docker_assembly/cucumber</targetPath>
- <filtering>false</filtering>
- </resource>
- </resources>
+ <resource>
+ <directory>${basedir}/docker</directory>
+ <targetPath>${project.build.directory}/docker_assembly</targetPath>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>features/**/*</include>
+ <include>stepDefinitions/**/*</include>
+ <include>plugins/**/*</include>
+ <include>resources/**/*</include>
+ <include>*.js*</include>
+ </includes>
+ <targetPath>${project.build.directory}/docker_assembly/cucumber</targetPath>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
</build>
<profiles>
<profile>