diff options
| author |   lukegleeson <luke.gleeson@est.tech> | 2022-10-25 17:11:18 +0100 |
|---|---|---|
| committer | lukegleeson <luke.gleeson@est.tech> | 2022-11-09 14:29:35 +0000 |
| commit | 4010d074d4738e31aa72113ee7e267949f95382b (patch) | |
| tree | f73e37481d5496c055f0638c18cc5fc6aa1bf04f /csit/plans | |
| parent | 4c7dd740f975d446cbeadeb260a49499a740eb0f (diff) | |
Bump DMI Version for CSIT Tests
Bumped DMI Version for CSIT tests to 1.1.0 Jakarta Release
Added two Docker Repos with different ports
- 10002 is port for released images
- 10003 is the port for snapshot images
Added DMI to docker compose for cps-ncmp and postgres which is using the 3.7 docker version tag
The lack of version tag in the docker compose for DMI is another issue which was causing it to fail.
Issue-ID: CPS-1355
Signed-off-by: lukegleeson <luke.gleeson@est.tech>
Change-Id: I27e3bd6f226a221a973e55cb73bb81fee310e11c
Diffstat (limited to 'csit/plans')
| -rwxr-xr-x | csit/plans/cps/setup.sh | 17 | ||||
| -rw-r--r-- | csit/plans/cps/test.properties | 5 |
2 files changed, 5 insertions, 17 deletions
diff --git a/csit/plans/cps/setup.sh b/csit/plans/cps/setup.sh index 6ef4c9a1fe..41072067e8 100755 --- a/csit/plans/cps/setup.sh +++ b/csit/plans/cps/setup.sh @@ -18,7 +18,7 @@ # Modifications copyright (c) 2020-2021 Samsung Electronics Co., Ltd. # Modifications Copyright (C) 2021 Pantheon.tech # Modifications Copyright (C) 2021 Bell Canada. -# Modifications Copyright (C) 2021 Nordix Foundation. +# Modifications Copyright (C) 2021-2022 Nordix Foundation. # # Branched from ccsdk/distribution to this repository Feb 23, 2021 # @@ -64,20 +64,7 @@ cd $WORKSPACE/archives/dc-cps curl -L https://github.com/docker/compose/releases/download/1.25.0/docker-compose-`uname -s`-`uname -m` > docker-compose chmod +x docker-compose -# start CPS and PostgreSQL containers with docker compose -./docker-compose up -d - -###################### setup onap-dmi-plugin ############################ - -cd $WORKSPACE/archives -git clone "https://gerrit.onap.org/r/cps/ncmp-dmi-plugin" -mkdir -p $WORKSPACE/archives/dc-dmi -cat $WORKSPACE/archives/ncmp-dmi-plugin/docker-compose/docker-compose.yml -cp $WORKSPACE/archives/ncmp-dmi-plugin/docker-compose/*.yml $WORKSPACE/archives/dc-dmi -cd $WORKSPACE/archives/dc-dmi -# copy docker-compose (downloaded already for cps) -cp $WORKSPACE/archives/dc-cps/docker-compose . -chmod +x docker-compose +# start CPS-NCMP, DMI, and PostgreSQL containers with docker compose ./docker-compose up -d ###################### setup sdnc ####################################### diff --git a/csit/plans/cps/test.properties b/csit/plans/cps/test.properties index 53b7d40d0b..80d9729706 100644 --- a/csit/plans/cps/test.properties +++ b/csit/plans/cps/test.properties @@ -20,7 +20,8 @@ DMI_PASSWORD=cpsr0cks! DMI_MANAGEMENT_PORT=8787 DMI_SERVICE_URL=http://$LOCAL_IP:$DMI_PORT -DOCKER_REPO=nexus3.onap.org:10003 +SNAPSHOT_DOCKER_REPO=nexus3.onap.org:10003 +RELEASE_DOCKER_REPO=nexus3.onap.org:10002 CPS_VERSION=latest -DMI_VERSION=1.1.0-SNAPSHOT-latest
\ No newline at end of file +DMI_VERSION=1.1.0
\ No newline at end of file |