From 98369b193d4e7127881dd2e932f57ec0bc8c5005 Mon Sep 17 00:00:00 2001 From: Yuli Shlosberg Date: Tue, 10 Apr 2018 19:36:24 +0300 Subject: fix ui-ci pom Change-Id: I9ab31dc822245fa9fdc5f5d5e75d948d31d58690 Issue-ID: SDC-384 Signed-off-by: Yuli Shlosberg --- sdc-os-chef/scripts/docker_run.sh | 2 +- .../openecomp/sdc/ci/tests/config/MainToTest.java | 22 +++++------ ui-ci/pom.xml | 45 +--------------------- 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 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 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 @@ -305,49 +305,6 @@ - org.apache.maven.plugins - maven-dependency-plugin - 3.1.0 - - - unpack-dependencies - package - - unpack-dependencies - - - true - ${project.build.directory}/classes - true - true - true - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - package - - jar - - - - - false - org.openecomp.sdc.ci.tests.execute.setup.SetupCDTest - - - jar-with-dependencies - - - - - + -- cgit 1.2.3-korg