fix ui-ci pom 61/41961/2
authorYuli Shlosberg <ys9693@att.com>
Tue, 10 Apr 2018 16:36:24 +0000 (19:36 +0300)
committerMichael Lando <ml636r@att.com>
Tue, 10 Apr 2018 16:50:42 +0000 (16:50 +0000)
Change-Id: I9ab31dc822245fa9fdc5f5d5e75d948d31d58690
Issue-ID: SDC-384
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
sdc-os-chef/scripts/docker_run.sh
test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/config/MainToTest.java
ui-ci/pom.xml

index 5303458..d5f4c33 100755 (executable)
@@ -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
index 64f1a72..ae2eec8 100644 (file)
@@ -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();
index f341274..9317bcc 100644 (file)
                        <!-- Create the JAR file with its dependencies -->
                        <!-- ============================================= -->
                        <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>
                                                </configuration>
                                        </execution>
                                </executions>
-                       </plugin-->
+                       </plugin>
 
                </plugins>
        </build>