From 2d3d8dcf6ef1bd2a161c69d561c629c5ec3f59c4 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Thu, 27 Sep 2018 10:29:30 -0700 Subject: Move CSIT to integration/csit repo To facilite branching of CSIT tests, all CSIT test code and scripts are relocated to the integration/csit repo. Change-Id: I6777cd414e43dbf2bfa6215f7e50849e1a6a2e59 Issue-ID: INT-671 Signed-off-by: Gary Wu --- .../dmaap-message-router/dmaap-mr-launch.sh | 114 --------------------- .../dmaap-message-router/dmaap-mr-teardown.sh | 24 ----- 2 files changed, 138 deletions(-) delete mode 100755 test/csit/scripts/dmaap-message-router/dmaap-mr-launch.sh delete mode 100755 test/csit/scripts/dmaap-message-router/dmaap-mr-teardown.sh (limited to 'test/csit/scripts/dmaap-message-router') diff --git a/test/csit/scripts/dmaap-message-router/dmaap-mr-launch.sh b/test/csit/scripts/dmaap-message-router/dmaap-mr-launch.sh deleted file mode 100755 index 36d316890..000000000 --- a/test/csit/scripts/dmaap-message-router/dmaap-mr-launch.sh +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/bash -# -# ============LICENSE_START======================================================= -# ONAP DMAAP MR -# ================================================================================ -# Copyright (C) 2018 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. -# ============LICENSE_END============================================ -# =================================================================== -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -# This script is a copy of plans/dmaap/mrpubsub/setup.sh, placed in the scripts -# dir, and edited to be a callable function from other plans. e.g. dmaap-buscontroller needs it. -# -source ${SCRIPTS}/common_functions.sh - -# function to launch DMaaP MR docker containers. -# sets global var IP with assigned IP address of MR container. -# (kafka and zk containers are not called externally) - -function dmaap_mr_launch() { - # - # the default prefix for docker containers is the directory name containing the docker-compose.yml file. - # It can be over-written by an env variable COMPOSE_PROJECT_NAME. This env var seems to be set in the Jenkins CSIT environment - COMPOSE_PREFIX=${COMPOSE_PROJECT_NAME:-docker-compose} - echo "COMPOSE_PROJECT_NAME=$COMPOSE_PROJECT_NAME" - echo "COMPOSE_PREFIX=$COMPOSE_PREFIX" - - # Clone DMaaP Message Router repo - mkdir -p $WORKSPACE/archives/dmaapmr - cd $WORKSPACE/archives/dmaapmr - #unset http_proxy https_proxy - git clone --depth 1 http://gerrit.onap.org/r/dmaap/messagerouter/messageservice -b master - cd messageservice - git pull - cd $WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose - cp $WORKSPACE/archives/dmaapmr/messageservice/bundleconfig-local/etc/appprops/MsgRtrApi.properties /var/tmp/ - - - # start DMaaP MR containers with docker compose and configuration from docker-compose.yml - docker login -u docker -p docker nexus3.onap.org:10001 - docker-compose up -d - docker ps - - # Wait for initialization of Docker contaienr for DMaaP MR, Kafka and Zookeeper - for i in {1..50}; do - if [ $(docker inspect --format '{{ .State.Running }}' ${COMPOSE_PREFIX}_dmaap_1) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' ${COMPOSE_PREFIX}_zookeeper_1) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' ${COMPOSE_PREFIX}_dmaap_1) ] - then - echo "DMaaP Service Running" - break - else - echo sleep $i - sleep $i - fi - done - - - DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${COMPOSE_PREFIX}_dmaap_1) - IP=${DMAAP_MR_IP} - KAFKA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${COMPOSE_PREFIX}_kafka_1) - ZOOKEEPER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${COMPOSE_PREFIX}_zookeeper_1) - - echo DMAAP_MR_IP=${DMAAP_MR_IP} - echo IP=${IP} - echo KAFKA_IP=${KAFKA_IP} - echo ZOOKEEPER_IP=${ZOOKEEPER_IP} - - # Initial docker-compose up and down is for populating kafka and zookeeper IPs in /var/tmp/MsgRtrApi.properites - docker-compose down - - # Update kafkfa and zookeeper properties in MsgRtrApi.propeties which will be copied to DMaaP Container - sed -i -e 's//'$ZOOKEEPER_IP'/' /var/tmp/MsgRtrApi.properties - sed -i -e 's/:/'$KAFKA_IP':9092/' /var/tmp/MsgRtrApi.properties - - docker-compose build - docker login -u docker -p docker nexus3.onap.org:10001 - docker-compose up -d - - # Wait for initialization of Docker containers - for i in {1..50}; do - if [ $(docker inspect --format '{{ .State.Running }}' ${COMPOSE_PREFIX}_dmaap_1) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' ${COMPOSE_PREFIX}_zookeeper_1) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' ${COMPOSE_PREFIX}_dmaap_1) ] - then - echo "DMaaP Service Running" - break - else - echo sleep $i - sleep $i - fi - done - - # Wait for initialization of docker services - for i in {1..50}; do - curl -sS -m 1 ${DMAAP_MR_IP}:3904/events/TestTopic && break - echo sleep $i - sleep $i - done -} - diff --git a/test/csit/scripts/dmaap-message-router/dmaap-mr-teardown.sh b/test/csit/scripts/dmaap-message-router/dmaap-mr-teardown.sh deleted file mode 100755 index ac6d798c9..000000000 --- a/test/csit/scripts/dmaap-message-router/dmaap-mr-teardown.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# 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. -# -# Modifications copyright (c) 2018 AT&T Intellectual Property -# - -function dmaap_mr_teardown() { -kill-instance.sh docker-compose_dmaap_1 -kill-instance.sh docker-compose_kafka_1 -kill-instance.sh docker-compose_zookeeper_1 -} -- cgit 1.2.3-korg