aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--csit/README.md1
-rwxr-xr-xcsit/plans/cps/setup.sh2
-rwxr-xr-xdocker-compose/docker-compose.yml4
3 files changed, 3 insertions, 4 deletions
diff --git a/csit/README.md b/csit/README.md
index baa636bab4..cdf535f87e 100644
--- a/csit/README.md
+++ b/csit/README.md
@@ -68,4 +68,3 @@ Execute test from current cps folder:
```bash
./csit/run-project-csit.sh
```
-
diff --git a/csit/plans/cps/setup.sh b/csit/plans/cps/setup.sh
index 2fc0ec4877..5911c3955d 100755
--- a/csit/plans/cps/setup.sh
+++ b/csit/plans/cps/setup.sh
@@ -37,7 +37,7 @@ export CPS_CORE_HOST=$LOCAL_IP
export DB_USERNAME=cps
export DB_PASSWORD=cps
# Use latest image version
-export VERSION=latest
+#export VERSION=latest
# download docker-compose of a required version (1.25.0 supports configuration of version 3.7)
curl -L https://github.com/docker/compose/releases/download/1.25.0/docker-compose-`uname -s`-`uname -m` > docker-compose
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 660ca820cc..0524da1608 100755
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -97,7 +97,7 @@ services:
cps-and-ncmp:
container_name: cps-and-ncmp
- image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${VERSION:-latest}
+ image: ${DOCKER_REPO_SNAPSHOT:-nexus3.onap.org:10003}/onap/cps-and-ncmp:${VERSION_CPS_AND_NCMP:-latest}
ports:
- "8883:8080"
- "8887:8081"
@@ -118,7 +118,7 @@ services:
ncmp-dmi-plugin:
container_name: ncmp-dmi-plugin
- image: ${DOCKER_REPO:-nexus3.onap.org:10003}/onap/ncmp-dmi-plugin:${VERSION:-latest}
+ image: ${DOCKER_REPO_PROXY:-nexus3.onap.org:10001}/onap/ncmp-dmi-plugin:${VERSION_DMI_PLUGIN:-1.0.3}
ports:
- "8783:8080"
- "8787:8081"