aboutsummaryrefslogtreecommitdiffstats
path: root/plans
diff options
context:
space:
mode:
Diffstat (limited to 'plans')
-rw-r--r--plans/aaf/aafapi/setup.sh4
-rw-r--r--plans/so/integration-testing/docker-compose.yml296
-rw-r--r--plans/so/integration-testing/setup.sh18
-rw-r--r--plans/so/integration-testing/teardown.sh4
-rw-r--r--plans/usecases/5G-bulkpm/setup.sh3
5 files changed, 311 insertions, 14 deletions
diff --git a/plans/aaf/aafapi/setup.sh b/plans/aaf/aafapi/setup.sh
index 33c524da..67cdda3a 100644
--- a/plans/aaf/aafapi/setup.sh
+++ b/plans/aaf/aafapi/setup.sh
@@ -54,6 +54,10 @@ docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_service:$AAF_DOCKER_VERSION
docker tag $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION nexus3.onap.org:10003/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION
docker tag $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION nexus3.onap.org:10003/onap/aaf/aaf_cass:2.1.6-SNAPSHOT
docker tag $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:2.1.6-SNAPSHOT
+docker tag $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION nexus3.onap.org:10003/onap/aaf/aaf_cass:2.1.7-SNAPSHOT
+docker tag $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:2.1.7-SNAPSHOT
+docker tag $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION nexus3.onap.org:10003/onap/aaf/aaf_cass:2.1.8-SNAPSHOT
+docker tag $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:2.1.8-SNAPSHOT
git clone --depth 1 http://gerrit.onap.org/r/aaf/authz -b master
git pull
diff --git a/plans/so/integration-testing/docker-compose.yml b/plans/so/integration-testing/docker-compose.yml
new file mode 100644
index 00000000..7273c4e4
--- /dev/null
+++ b/plans/so/integration-testing/docker-compose.yml
@@ -0,0 +1,296 @@
+version: '3'
+services:
+################################################################################
+ mariadb:
+ image: ${NEXUS_DOCKER_REPO_MSO}/mariadb:10.1.11
+ ports:
+ - "3306:3306"
+ volumes:
+ - ./test_lab/volumes/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
+ - ./test_lab/volumes/mariadb/conf.d:/etc/mysql/conf.d
+ environment:
+ - MYSQL_ROOT_PASSWORD=password
+ hostname:
+ mariadb.so.testlab.onap.org
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
+################################################################################
+ catalog-db-adapter:
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/catalog-db-adapter:${TAG}
+ ports:
+ - "8082:8082"
+ volumes:
+ - ./test_lab/volumes/so/ca-certificates/onapheat:/app/ca-certificates
+ - ./test_lab/volumes/so/config/catalog-db-adapter/onapheat:/app/config
+ environment:
+ - APP=catalog-db-adapter
+ - JVM_ARGS=-Xms64m -Xmx512m
+ - DB_HOST=mariadb
+# - KEYSTORE=msoClientKeyStore-onapheat.jks
+# - KEYSTORE_PASSWORD=password
+# - TRUSTSTORE=msoTrustStore.jks
+# - TRUSTSTORE_PASSWORD=password
+ hostname:
+ catalog-db-adapter.so.testlab.onap.org
+ depends_on:
+ - mariadb
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
+ command:
+ - /app/wait-for.sh
+ - -q
+ - -t
+ - "300"
+ - mariadb:3306
+ - --
+ - "/app/start-app.sh"
+################################################################################
+ request-db-adapter:
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/request-db-adapter:${TAG}
+ ports:
+ - "8083:8083"
+ volumes:
+ - ./test_lab/volumes/so/ca-certificates/onapheat:/app/ca-certificates
+ - ./test_lab/volumes/so/config/request-db-adapter/onapheat:/app/config
+ environment:
+ - APP=request-db-adapter
+ - JVM_ARGS=-Xms64m -Xmx512m
+ - DB_HOST=mariadb
+# - KEYSTORE=msoClientKeyStore-onapheat.jks
+# - KEYSTORE_PASSWORD=password
+# - TRUSTSTORE=msoTrustStore.jks
+# - TRUSTSTORE_PASSWORD=password
+ hostname:
+ request-db-adapter.so.testlab.onap.org
+ depends_on:
+ - mariadb
+ - catalog-db-adapter
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
+ command:
+ - /app/wait-for.sh
+ - -q
+ - -t
+ - "300"
+ - catalog-db-adapter:8082
+ - --
+ - "/app/start-app.sh"
+################################################################################
+ sdnc-adapter:
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/sdnc-adapter:${TAG}
+ ports:
+ - "8086:8086"
+ volumes:
+ - ./test_lab/volumes/so/ca-certificates/onapheat:/app/ca-certificates
+ - ./test_lab/volumes/so/config/sdnc-adapter/onapheat:/app/config
+ environment:
+ - APP=sdnc-adapter
+ - JVM_ARGS=-Xms64m -Xmx512m
+ - DB_HOST=mariadb
+# - KEYSTORE=msoClientKeyStore-onapheat.jks
+# - KEYSTORE_PASSWORD=password
+# - TRUSTSTORE=msoTrustStore.jks
+# - TRUSTSTORE_PASSWORD=password
+ hostname:
+ sdnc-adapter.so.testlab.onap.org
+ depends_on:
+ - mariadb
+ - catalog-db-adapter
+ - request-db-adapter
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
+ command:
+ - /app/wait-for.sh
+ - -q
+ - -t
+ - "300"
+ - request-db-adapter:8083
+ - --
+ - "/app/start-app.sh"
+################################################################################
+ openstack-adapter:
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/openstack-adapter:${TAG}
+ ports:
+ - "8087:8087"
+ volumes:
+ - ./test_lab/volumes/so/ca-certificates/onapheat:/app/ca-certificates
+ - ./test_lab/volumes/so/config/openstack-adapter/onapheat:/app/config
+ environment:
+ - APP=openstack-adapter
+ - JVM_ARGS=-Xms64m -Xmx512m
+ - DB_HOST=mariadb
+# - KEYSTORE=msoClientKeyStore-onapheat.jks
+# - KEYSTORE_PASSWORD=password
+# - TRUSTSTORE=msoTrustStore.jks
+# - TRUSTSTORE_PASSWORD=password
+ hostname:
+ openstack-adapter.so.testlab.onap.org
+ depends_on:
+ - mariadb
+ - catalog-db-adapter
+ - request-db-adapter
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
+ command:
+ - /app/wait-for.sh
+ - -q
+ - -t
+ - "300"
+ - request-db-adapter:8083
+ - --
+ - "/app/start-app.sh"
+################################################################################
+ vfc-adapter:
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/vfc-adapter:${TAG}
+ ports:
+ - "8084:8084"
+ volumes:
+ - ./test_lab/volumes/so/ca-certificates/onapheat:/app/ca-certificates
+ - ./test_lab/volumes/so/config/vfc-adapter/onapheat:/app/config
+ environment:
+ - APP=vfc-adapter
+ - JVM_ARGS=-Xms64m -Xmx512m
+ - DB_HOST=mariadb
+# - KEYSTORE=msoClientKeyStore-onapheat.jks
+# - KEYSTORE_PASSWORD=password
+# - TRUSTSTORE=msoTrustStore.jks
+# - TRUSTSTORE_PASSWORD=password
+ hostname:
+ vfc-adapter.so.testlab.onap.org
+ depends_on:
+ - mariadb
+ - catalog-db-adapter
+ - request-db-adapter
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
+ command:
+ - /app/wait-for.sh
+ - -q
+ - -t
+ - "300"
+ - request-db-adapter:8083
+ - --
+ - "/app/start-app.sh"
+################################################################################
+ sdc-controller:
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/sdc-controller:${TAG}
+ ports:
+ - "8085:8085"
+ volumes:
+ - ./test_lab/volumes/so/ca-certificates/onapheat:/app/ca-certificates
+ - ./test_lab/volumes/so/config/sdc-controller/onapheat:/app/config
+ environment:
+ - APP=sdc-controller
+ - JVM_ARGS=-Xms64m -Xmx512m
+ - DB_HOST=mariadb
+# - KEYSTORE=msoClientKeyStore-onapheat.jks
+# - KEYSTORE_PASSWORD=password
+# - TRUSTSTORE=msoTrustStore.jks
+# - TRUSTSTORE_PASSWORD=password
+ hostname:
+ sdc-controller.so.testlab.onap.org
+ depends_on:
+ - mariadb
+ - catalog-db-adapter
+ - request-db-adapter
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
+ command:
+ - /app/wait-for.sh
+ - -q
+ - -t
+ - "300"
+ - request-db-adapter:8083
+ - --
+ - "/app/start-app.sh"
+################################################################################
+ bpmn-infra:
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/bpmn-infra:${TAG}
+ ports:
+ - "8081:8081"
+ volumes:
+ - ./test_lab/volumes/so/ca-certificates/onapheat:/app/ca-certificates
+ - ./test_lab/volumes/so/config/bpmn-infra/onapheat:/app/config
+ environment:
+ - APP=bpmn-infra
+ - JVM_ARGS=-Xms64m -Xmx512m
+ - DB_HOST=mariadb
+# - KEYSTORE=msoClientKeyStore-onapheat.jks
+# - KEYSTORE_PASSWORD=password
+# - TRUSTSTORE=msoTrustStore.jks
+# - TRUSTSTORE_PASSWORD=password
+ hostname:
+ bpmn-infra.so.testlab.onap.org
+ depends_on:
+ - mariadb
+ - catalog-db-adapter
+ - request-db-adapter
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
+ command:
+ - /app/wait-for.sh
+ - -q
+ - -t
+ - "300"
+ - request-db-adapter:8083
+ - --
+ - "/app/start-app.sh"
+################################################################################
+ api-handler-infra:
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/api-handler-infra:${TAG}
+ ports:
+ - "8080:8080"
+ volumes:
+ - ./test_lab/volumes/so/ca-certificates/onapheat:/app/ca-certificates
+ - ./test_lab/volumes/so/config/api-handler-infra/onapheat:/app/config
+ environment:
+ - APP=api-handler-infra
+ - JVM_ARGS=-Xms64m -Xmx512m
+ - DB_HOST=mariadb
+# - KEYSTORE=msoClientKeyStore-onapheat.jks
+# - KEYSTORE_PASSWORD=password
+# - TRUSTSTORE=msoTrustStore.jks
+# - TRUSTSTORE_PASSWORD=password
+ hostname:
+ api-handler-infra.so.testlab.onap.org
+ depends_on:
+ - mariadb
+ - catalog-db-adapter
+ - request-db-adapter
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
+ command:
+ - /app/wait-for.sh
+ - -q
+ - -t
+ - "300"
+ - request-db-adapter:8083
+ - --
+ - "/app/start-app.sh"
diff --git a/plans/so/integration-testing/setup.sh b/plans/so/integration-testing/setup.sh
index 02c21f6e..4a35d0b2 100644
--- a/plans/so/integration-testing/setup.sh
+++ b/plans/so/integration-testing/setup.sh
@@ -17,20 +17,16 @@
# Place the scripts in run order:
# Start all process required for executing test case
-#start mariadb
-docker run -d --name mariadb -h db.mso.testlab.openecomp.org -e MYSQL_ROOT_PASSWORD=password -p 3306:3306 -v ${WORKSPACE}/scripts/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d -v ${WORKSPACE}/scripts/mariadb/conf.d:/etc/mysql/conf.d nexus3.onap.org:10001/mariadb
+git clone http://gerrit.onap.org/r/so/docker-config.git test_lab
-#start so
-docker run -d --name so -h mso.mso.testlab.openecomp.org -e MYSQL_ROOT_PASSWORD=password --link=mariadb:db.mso.testlab.openecomp.org -p 8080:8080 -v ${WORKSPACE}/scripts/so/chef-config:/shared nexus3.onap.org:10001/openecomp/mso:1.1-STAGING-latest
+export NEXUS_DOCKER_REPO_MSO=nexus3.onap.org:10001
+export TAG=1.3.1
+# bring the so dockers
+docker-compose pull
+docker-compose up -d
-SO_IP=`get-instance-ip.sh so`
-# Wait for initialization
-for i in {1..10}; do
- curl -sS ${SO_IP}:1080 && break
- echo sleep $i
- sleep $i
-done
+sleep 4m
#REPO_IP=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' so`
REPO_IP='127.0.0.1'
diff --git a/plans/so/integration-testing/teardown.sh b/plans/so/integration-testing/teardown.sh
index 1696c745..449cb399 100644
--- a/plans/so/integration-testing/teardown.sh
+++ b/plans/so/integration-testing/teardown.sh
@@ -14,6 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-kill-instance.sh mariadb
-kill-instance.sh so
+docker-compose down
diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh
index 5139cbab..64ffac17 100644
--- a/plans/usecases/5G-bulkpm/setup.sh
+++ b/plans/usecases/5G-bulkpm/setup.sh
@@ -61,6 +61,7 @@ cp $WORKSPACE/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml $WORKS
docker login -u docker -p docker nexus3.onap.org:10001
docker-compose up -d
+echo "Disregard the message ERROR: for datarouter-node Container 1234456 is unhealthy, this is expected behaiour at this stage"
docker kill datarouter-prov
docker kill datarouter-node
docker kill vescollector
@@ -126,6 +127,8 @@ cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json /tmp/
sed -i 's/dmaapmrhost/'${DMAAP_MR_IP}'/g' /tmp/datafile_endpoints.json
sed -i 's/dmaapdrhost/'${DR_PROV_IP}'/g' /tmp/datafile_endpoints.json
docker cp /tmp/datafile_endpoints.json dfc:/config/
+#Increase Logging
+docker exec dfc /bin/sh -c " sed -i 's/org.onap.dcaegen2.collectors.datafile: ERROR/org.onap.dcaegen2.collectors.datafile: TRACE/g' /config/application.yaml"
docker restart dfc
docker exec dfc /bin/sh -c "echo '${DR_NODE_IP}' dmaap-dr-node >> /etc/hosts"