aboutsummaryrefslogtreecommitdiffstats
path: root/plans/so
diff options
context:
space:
mode:
authorAndrewLamb <andrew.a.lamb@est.tech>2021-02-16 10:32:49 +0000
committerAndrewLamb <andrew.a.lamb@est.tech>2021-02-16 10:33:40 +0000
commit5f175a20d8bd5f6f4592a215c38732292ec318da (patch)
tree00274fa2c293d3f6c8da05ff17b38186ed60e6e4 /plans/so
parent79201240f3e7acfe06b39becace9318c86ce2943 (diff)
Extract Docker Tag For SOL003 Adapter
Change-Id: I5703bfda1400b1425915fb3f409da20ce6c343a1 Issue-ID: INT-1860 Signed-off-by: AndrewLamb <andrew.a.lamb@est.tech>
Diffstat (limited to 'plans/so')
-rw-r--r--plans/so/integration-etsi-testing/config/env1
-rw-r--r--plans/so/integration-etsi-testing/docker-compose.local.yml2
-rw-r--r--plans/so/integration-etsi-testing/docker-compose.yml2
-rwxr-xr-xplans/so/integration-etsi-testing/setup.sh2
4 files changed, 4 insertions, 3 deletions
diff --git a/plans/so/integration-etsi-testing/config/env b/plans/so/integration-etsi-testing/config/env
index c0d8210a..0a20fdb9 100644
--- a/plans/so/integration-etsi-testing/config/env
+++ b/plans/so/integration-etsi-testing/config/env
@@ -5,3 +5,4 @@ TIME_OUT_DEFAULT_VALUE_SEC=1200
PROJECT_NAME=etsiintegrationtesting
DEFAULT_NETWORK_NAME=etsiintegrationtesting_default
ETSI_CATALOG_IMAGE_VERSION=1.0.9
+SOL_003_ADAPTER_IMAGE_VERSION=1.8.0-STAGING-latest
diff --git a/plans/so/integration-etsi-testing/docker-compose.local.yml b/plans/so/integration-etsi-testing/docker-compose.local.yml
index 26b45a3d..c7c37aa0 100644
--- a/plans/so/integration-etsi-testing/docker-compose.local.yml
+++ b/plans/so/integration-etsi-testing/docker-compose.local.yml
@@ -26,7 +26,7 @@ services:
image: onap/so/so-monitoring:${TAG}
################################################################################
so-vnfm-adapter:
- image: onap/so/vnfm-adapter:${TAG}
+ image: onap/so/vnfm-adapter:${SOL_003_ADAPTER_IMAGE_VERSION}
################################################################################
modeling-etsicatalog:
image: ${NEXUS_DOCKER_REPO_MSO}/onap/modeling/etsicatalog:${ETSI_CATALOG_IMAGE_VERSION}
diff --git a/plans/so/integration-etsi-testing/docker-compose.yml b/plans/so/integration-etsi-testing/docker-compose.yml
index cc753118..772fb6f0 100644
--- a/plans/so/integration-etsi-testing/docker-compose.yml
+++ b/plans/so/integration-etsi-testing/docker-compose.yml
@@ -220,7 +220,7 @@ services:
- request-db-adapter
################################################################################
so-vnfm-adapter:
- image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/vnfm-adapter:${TAG}
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/vnfm-adapter:${SOL_003_ADAPTER_IMAGE_VERSION}
ports:
- "9092:9092"
volumes:
diff --git a/plans/so/integration-etsi-testing/setup.sh b/plans/so/integration-etsi-testing/setup.sh
index 98fa1e32..51cc8480 100755
--- a/plans/so/integration-etsi-testing/setup.sh
+++ b/plans/so/integration-etsi-testing/setup.sh
@@ -49,7 +49,7 @@ echo "Running $SCRIPT_HOME/$SCRIPT_NAME ..."
export $(egrep -v '^#' $ENV_FILE | xargs)
-MANDATORY_VARIABLES_NAMES=( "NEXUS_DOCKER_REPO_MSO" "DOCKER_ENVIRONMENT" "TAG" "TIME_OUT_DEFAULT_VALUE_SEC" "PROJECT_NAME" "DEFAULT_NETWORK_NAME", "ETSI_CATALOG_IMAGE_VERSION")
+MANDATORY_VARIABLES_NAMES=( "NEXUS_DOCKER_REPO_MSO" "DOCKER_ENVIRONMENT" "TAG" "TIME_OUT_DEFAULT_VALUE_SEC" "PROJECT_NAME" "DEFAULT_NETWORK_NAME", "ETSI_CATALOG_IMAGE_VERSION", "SOL_003_ADAPTER_IMAGE_VERSION")
for var in "${MANDATORY_VARIABLES_NAMES[@]}"
do