summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuli Shlosberg <ys9693@att.com>2018-04-10 19:36:24 +0300
committerMichael Lando <ml636r@att.com>2018-04-10 16:50:42 +0000
commit98369b193d4e7127881dd2e932f57ec0bc8c5005 (patch)
tree6934fba2818b004874dd31b21907485206ba9ba9
parent74109e2c0e019dae8ea5fd418a7616d330bad921 (diff)
fix ui-ci pom
Change-Id: I9ab31dc822245fa9fdc5f5d5e75d948d31d58690 Issue-ID: SDC-384 Signed-off-by: Yuli Shlosberg <ys9693@att.com>
-rwxr-xr-xsdc-os-chef/scripts/docker_run.sh2
-rw-r--r--test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/config/MainToTest.java22
-rw-r--r--ui-ci/pom.xml45
3 files changed, 13 insertions, 56 deletions
diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh
index 5303458f0e..d5f4c333e9 100755
--- a/sdc-os-chef/scripts/docker_run.sh
+++ b/sdc-os-chef/scripts/docker_run.sh
@@ -409,7 +409,7 @@ fi
function sdc-sim {
echo "docker run sdc-webSimulator..."
if [ ${LOCAL} = false ]; then
- docker pull ${PREFIX}/sdc-sim:${RELEASE}
+ docker pull ${PREFIX}/sdc-simulator:${RELEASE}
fi
probe_sim
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/config/MainToTest.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/config/MainToTest.java
index 64f1a72034..ae2eec8d52 100644
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/config/MainToTest.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/config/MainToTest.java
@@ -20,17 +20,17 @@ public class MainToTest {
private static final String CREDENTIALS_FILE = "credentials.yaml";
- public static void main(String[] args) throws Exception {
- System.out.println("Hello World!"); // Display the string.
- System.out.println("user.dir: " + System.getProperty("user.dir"));
- System.out.println(UserRoleEnum.DESIGNER.getFirstName());
- String file = readFile();
- convertToJson(file);
- Either<Service, RestResponse> createDefaultService1e = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true);
-
-
-
- }
+// public static void main(String[] args) throws Exception {
+// System.out.println("Hello World!"); // Display the string.
+// System.out.println("user.dir: " + System.getProperty("user.dir"));
+// System.out.println(UserRoleEnum.DESIGNER.getFirstName());
+// String file = readFile();
+// convertToJson(file);
+// Either<Service, RestResponse> createDefaultService1e = AtomicOperationUtils.createDefaultService(UserRoleEnum.DESIGNER, true);
+//
+//
+//
+// }
private static String convertToJson(String yamlString) {
Yaml yaml = new Yaml();
diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml
index f34127401c..9317bccff7 100644
--- a/ui-ci/pom.xml
+++ b/ui-ci/pom.xml
@@ -306,49 +306,6 @@
<!-- ============================================= -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>3.1.0</version>
- <executions>
- <execution>
- <id>unpack-dependencies</id>
- <phase>package</phase>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
- <silent>true</silent>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <overWriteReleases>true</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- <overWriteIfNewer>true</overWriteIfNewer>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.0.2</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>false</addClasspath>
- <mainClass>org.openecomp.sdc.ci.tests.execute.setup.SetupCDTest</mainClass>
- </manifest>
- </archive>
- <classifier>jar-with-dependencies</classifier>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -369,7 +326,7 @@
</configuration>
</execution>
</executions>
- </plugin-->
+ </plugin>
</plugins>
</build>