From 375d64be3681c61601bbd7cba33265ce5682487c Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Thu, 30 Nov 2017 14:37:02 -0500 Subject: Output the Robot logs at the proper place MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A small webserver in bind behind /share/logs specifically to display the logs, so we need to correctly output them there. As specified in the robot scripts. see https://gerrit.onap.org/r/gitweb?p=testsuite/properties.git;a=blob;f=ete.sh;h=93070c995d12f2cdb59275477e9ca6be2956e696;hb=refs/heads/amsterdam#l20 see https://gerrit.onap.org/r/gitweb?p=testsuite/properties.git;a=blob;f=demo.sh;h=e7dcd51db31a58d75095c60fde93abc1d8c2b01c;hb=refs/heads/amsterdam#l147 Change-Id: I5a41c9865295d2db0ded131bb985ef323a79ecc5 Issue-ID: OOM-382 Signed-off-by: Alexis de Talhouët --- kubernetes/robot/demo-k8s.sh | 2 +- kubernetes/robot/ete-k8s.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kubernetes') diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh index a870972ed6..2836fca85d 100755 --- a/kubernetes/robot/demo-k8s.sh +++ b/kubernetes/robot/demo-k8s.sh @@ -124,4 +124,4 @@ done ETEHOME=/var/opt/OpenECOMP_ETE VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/integration_robot_properties.py -V /share/config/integration_preload_parameters.py" POD=$(kubectl --namespace onap-robot get pods | sed 's/ .*//'| grep robot) -kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d ${ETEHOME}/html/logs/demo/${TAG} -i ${TAG} --display 89 2> ${TAG}.out +kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/demo/${TAG} -i ${TAG} --display 89 2> ${TAG}.out diff --git a/kubernetes/robot/ete-k8s.sh b/kubernetes/robot/ete-k8s.sh index 26eedc97f7..2305a584c3 100755 --- a/kubernetes/robot/ete-k8s.sh +++ b/kubernetes/robot/ete-k8s.sh @@ -20,4 +20,4 @@ VARIABLES="-v GLOBAL_BUILD_NUMBER:$$" #docker exec openecompete_container ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --display 88 POD=$(kubectl --namespace onap-robot get pods | sed 's/ .*//'| grep robot) -kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d ${ETEHOME}/html/logs/ete/${OUTPUT_FOLDER} ${TAGS} --display 88 +kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --display 88 -- cgit 1.2.3-korg From d38af0d7d919384aeb421a94d2d5c6af6e7f622e Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Thu, 30 Nov 2017 15:38:34 -0500 Subject: Fix docker image name for AAI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They change from openecomp to onap, and i didn't catch that in https://gerrit.onap.org/r/#/c/25163/ so fixing here; Change-Id: Ibd422ae441b478b75b2382d1701f7d56a594a7b5 Issue-ID: OOM-432 Signed-off-by: Alexis de Talhouët --- kubernetes/aai/values.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kubernetes') diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml index 524d534b61..ce625b7ab3 100644 --- a/kubernetes/aai/values.yaml +++ b/kubernetes/aai/values.yaml @@ -7,19 +7,19 @@ image: aaiProxyVersion: 1.1.0 aaiHbaseImage: aaionap/hbase aaiHbaseVersion: 1.2.0 - modelLoaderImage: nexus3.onap.org:10001/openecomp/model-loader + modelLoaderImage: nexus3.onap.org:10001/onap/model-loader modelLoaderVersion: v1.1.0 aaiResourcesImage: nexus3.onap.org:10001/openecomp/aai-resources aaiResourcesVersion: v1.1.0 aaiTraversalImage: nexus3.onap.org:10001/openecomp/aai-traversal aaiTraversalVersion: v1.1.0 - dataRouterImage: nexus3.onap.org:10001/openecomp/data-router + dataRouterImage: nexus3.onap.org:10001/onap/data-router dataRouterVersion: v1.1.0 elasticsearchImage: elasticsearch elasticsearchVersion: 2.4.1 - searchDataImage: nexus3.onap.org:10001/openecomp/search-data-service + searchDataImage: nexus3.onap.org:10001/onap/search-data-service searchDataVersion: v1.1.0 - sparkyBeImage: nexus3.onap.org:10001/openecomp/sparky-be + sparkyBeImage: nexus3.onap.org:10001/onap/sparky-be sparkyBeVersion: v1.1.0 gremlinServerImage: aaionap/gremlin-server filebeat: docker.elastic.co/beats/filebeat:5.5.0 -- cgit 1.2.3-korg From 27db46de65bf954a04b6c35fa811069c547e0930 Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Thu, 30 Nov 2017 16:17:20 -0500 Subject: Fix ONAP entity-event-policy.xml bean package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib0ecc3437a2b02768147b1ba4d6fedc187e02c52 Issue-ID: OOM-432 Signed-off-by: Alexis de Talhouët --- .../src/config/aai/data-router/dynamic/conf/entity-event-policy.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kubernetes') diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml b/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml index e0dd8cb8f5..e995053f12 100644 --- a/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml +++ b/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml @@ -4,7 +4,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + @@ -18,7 +18,7 @@ - + - + \ No newline at end of file -- cgit 1.2.3-korg