From 3f9a0960ae775678d1e1d4b598b593b59146cb0f Mon Sep 17 00:00:00 2001 From: pdragosh Date: Tue, 16 Apr 2019 13:19:45 -0400 Subject: Finish drools CSIT infra Basic health check for now. Need to have ci-management jobs enabled for this to work on every merge. Cleaning out unused scripts and mock server. Renaming policy engine script so its obvious that is what it is for. Issue-ID: POLICY-1651 Change-Id: I469823795d4a9f5531d150610ba2ed0b75585677 Signed-off-by: pdragosh Signed-off-by: Pamela Dragosh Signed-off-by: pdragosh Signed-off-by: jhh --- plans/policy/drools-applications/setup.sh | 58 +++++++++++++++++++++++++++ plans/policy/drools-applications/teardown.sh | 18 +++++++++ plans/policy/drools-applications/testplan.txt | 3 ++ plans/policy/drools-pdp/setup.sh | 17 +------- plans/policy/drools-pdp/teardown.sh | 1 - plans/policy/health/setup.sh | 21 ++-------- plans/policy/health/teardown.sh | 1 - plans/policy/health/testplan.txt | 2 +- 8 files changed, 84 insertions(+), 37 deletions(-) create mode 100755 plans/policy/drools-applications/setup.sh create mode 100755 plans/policy/drools-applications/teardown.sh create mode 100644 plans/policy/drools-applications/testplan.txt (limited to 'plans') diff --git a/plans/policy/drools-applications/setup.sh b/plans/policy/drools-applications/setup.sh new file mode 100755 index 00000000..24422a63 --- /dev/null +++ b/plans/policy/drools-applications/setup.sh @@ -0,0 +1,58 @@ +#!/bin/bash +# ============LICENSE_START======================================================= +# Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= + +echo "Uninstall docker-py and reinstall docker." +pip uninstall -y docker-py +pip uninstall -y docker +pip install -U docker==2.7.0 + +docker login -u docker -p docker nexus3.onap.org:10001 + +# Adding this waiting container to avoid race condition between api and mariadb containers. +docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-drools-apps.yml run --rm start_dependencies +docker logs mariadb +docker container ls -a + +docker-compose -f ${WORKSPACE}/scripts/policy/docker-compose-drools-apps.yml up -d +sleep 1m + +docker logs mariadb +docker logs drools +docker container ls -a + +POLICY_DROOLS_IP=`get-instance-ip.sh drools` +MARIADB_IP=`get-instance-ip.sh mariadb` + +echo DROOLS IP IS ${POLICY_DROOLS_IP} +echo MARIADB IP IS ${MARIADB_IP} + +# Wait for initialization +for i in {1..10}; do + curl -sS ${MARIADB_IP}:3306 && break + echo sleep $i + sleep $i +done + +for i in {1..10}; do + curl -sS ${POLICY_DROOLS_IP}:6969 && break + echo sleep $i + sleep $i +done + +ROBOT_VARIABLES="-v POLICY_DROOLS_IP:${POLICY_DROOLS_IP}" diff --git a/plans/policy/drools-applications/teardown.sh b/plans/policy/drools-applications/teardown.sh new file mode 100755 index 00000000..48ab171d --- /dev/null +++ b/plans/policy/drools-applications/teardown.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# +# Copyright 2019 AT&T Intellectual Property. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +kill-instance.sh drools +kill-instance.sh mariadb diff --git a/plans/policy/drools-applications/testplan.txt b/plans/policy/drools-applications/testplan.txt new file mode 100644 index 00000000..3878a4e2 --- /dev/null +++ b/plans/policy/drools-applications/testplan.txt @@ -0,0 +1,3 @@ +# Test suites are relative paths under [integration/csit.git]/tests/. +# Place the suites in run order. +policy/drools-applications diff --git a/plans/policy/drools-pdp/setup.sh b/plans/policy/drools-pdp/setup.sh index a7ed4408..459805be 100755 --- a/plans/policy/drools-pdp/setup.sh +++ b/plans/policy/drools-pdp/setup.sh @@ -17,25 +17,10 @@ # Place the scripts in run order: source ${SCRIPTS}/common_functions.sh -docker run --name i-mock -d jamesdbloom/mockserver -MOCK_IP=`get-instance-ip.sh i-mock` -echo ${MOCK_IP} - -docker inspect i-mock - -# Wait for initialization -for i in {1..10}; do - curl -sS ${MOCK_IP}:1080 && break - echo sleep $i - sleep $i -done - -${WORKSPACE}/scripts/policy/mock-hello.sh ${MOCK_IP} - source ${WORKSPACE}/scripts/policy/drools-pdp-script.sh # Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MOCK_IP:${MOCK_IP} -v IP:${IP} -v POLICY_IP:${POLICY_IP} -v PDP_IP:${PDP_IP} -v DOCKER_IP:${DOCKER_IP}" +ROBOT_VARIABLES="-v IP:${IP} -v POLICY_IP:${POLICY_IP} -v PDP_IP:${PDP_IP} -v DOCKER_IP:${DOCKER_IP}" export PDP_IP=${PDP_IP} export POLICY_IP=${POLICY_IP} export DOCKER_IP=${DOCKER_IP} diff --git a/plans/policy/drools-pdp/teardown.sh b/plans/policy/drools-pdp/teardown.sh index f1f0b21c..303ccff1 100755 --- a/plans/policy/drools-pdp/teardown.sh +++ b/plans/policy/drools-pdp/teardown.sh @@ -24,7 +24,6 @@ docker rm -v "${name}" mkdir -p "${WORKSPACE}"/archives -kill_instance i-mock kill_instance drools kill_instance pdp kill_instance brmsgw diff --git a/plans/policy/health/setup.sh b/plans/policy/health/setup.sh index 890df9b4..c99af3fa 100755 --- a/plans/policy/health/setup.sh +++ b/plans/policy/health/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2017 AT&T Intellectual Property. All rights reserved. +# Copyright 2017, 2019 AT&T Intellectual Property. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,25 +17,10 @@ # Place the scripts in run order: source ${SCRIPTS}/common_functions.sh -docker run --name i-mock -d jamesdbloom/mockserver -MOCK_IP=`get-instance-ip.sh i-mock` -echo ${MOCK_IP} - -docker inspect i-mock - -# Wait for initialization -for i in {1..10}; do - curl -sS ${MOCK_IP}:1080 && break - echo sleep $i - sleep $i -done - -${WORKSPACE}/scripts/policy/mock-hello.sh ${MOCK_IP} - -source ${WORKSPACE}/scripts/policy/script1.sh +source ${WORKSPACE}/scripts/policy/engine.sh # Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MOCK_IP:${MOCK_IP} -v IP:${IP} -v POLICY_IP:${POLICY_IP} -v PDP_IP:${PDP_IP} -v DOCKER_IP:${DOCKER_IP}" +ROBOT_VARIABLES="-v IP:${IP} -v POLICY_IP:${POLICY_IP} -v PDP_IP:${PDP_IP} -v DOCKER_IP:${DOCKER_IP}" export PDP_IP=${PDP_IP} export POLICY_IP=${POLICY_IP} export DOCKER_IP=${DOCKER_IP} diff --git a/plans/policy/health/teardown.sh b/plans/policy/health/teardown.sh index f1f0b21c..303ccff1 100755 --- a/plans/policy/health/teardown.sh +++ b/plans/policy/health/teardown.sh @@ -24,7 +24,6 @@ docker rm -v "${name}" mkdir -p "${WORKSPACE}"/archives -kill_instance i-mock kill_instance drools kill_instance pdp kill_instance brmsgw diff --git a/plans/policy/health/testplan.txt b/plans/policy/health/testplan.txt index ab8a5b08..6bad34fc 100644 --- a/plans/policy/health/testplan.txt +++ b/plans/policy/health/testplan.txt @@ -1,3 +1,3 @@ # Test suites are relative paths under [integration/csit.git]/tests/. # Place the suites in run order. -policy/suite1 +policy/engine -- cgit 1.2.3-korg