aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Marcinkiewicz <piotr.marcinkiewicz@nokia.com>2020-12-01 14:26:48 +0100
committerPiotr Marcinkiewicz <piotr.marcinkiewicz@nokia.com>2020-12-01 13:32:52 +0000
commit98dbf16463d0720497e3a8679c16b0a6da052f6b (patch)
tree3f0a158c61ab842486763b5eb6d6ee416355a725
parent3d5a877e6378d6b904d7283c12cfb466b1d00212 (diff)
Update oom-cert-service tests to take images from Guilin branch
Issue-ID: OOM-2559 Signed-off-by: Piotr Marcinkiewicz <piotr.marcinkiewicz@nokia.com> Change-Id: I75e2cc61f34be516c333e4ca935069d6ba3dc9f5
-rw-r--r--plans/oom-platform-cert-service/certservice/docker-compose.yml2
-rw-r--r--tests/oom-platform-cert-service/certservice/resources/cert-service-properties.robot2
-rw-r--r--tests/oom-platform-cert-service/postprocessor/resources/test-properties.robot2
3 files changed, 3 insertions, 3 deletions
diff --git a/plans/oom-platform-cert-service/certservice/docker-compose.yml b/plans/oom-platform-cert-service/certservice/docker-compose.yml
index b281101a..665b9e75 100644
--- a/plans/oom-platform-cert-service/certservice/docker-compose.yml
+++ b/plans/oom-platform-cert-service/certservice/docker-compose.yml
@@ -19,7 +19,7 @@ services:
- certservice
oom-cert-service:
- image: nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-api:latest
+ image: nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-api:guilin-latest
volumes:
- $CONFIGURATION_PATH:/etc/onap/oom/certservice/cmpServers.json
- ./certs/truststore.jks:/etc/onap/oom/certservice/certs/truststore.jks
diff --git a/tests/oom-platform-cert-service/certservice/resources/cert-service-properties.robot b/tests/oom-platform-cert-service/certservice/resources/cert-service-properties.robot
index ff0500a2..b2eb98fe 100644
--- a/tests/oom-platform-cert-service/certservice/resources/cert-service-properties.robot
+++ b/tests/oom-platform-cert-service/certservice/resources/cert-service-properties.robot
@@ -24,7 +24,7 @@ ${VALID_ENV_FILE_P12} %{WORKSPACE}/tests/oom-platform-cert-se
${VALID_ENV_FILE_PEM} %{WORKSPACE}/tests/oom-platform-cert-service/certservice/assets/valid_client_docker_pem.env
${INVALID_ENV_FILE_OUTPUT_TYPE} %{WORKSPACE}/tests/oom-platform-cert-service/certservice/assets/invalid_client_docker_output_type.env
${INVALID_ENV_FILE} %{WORKSPACE}/tests/oom-platform-cert-service/certservice/assets/invalid_client_docker.env
-${DOCKER_CLIENT_IMAGE} nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-client:latest
+${DOCKER_CLIENT_IMAGE} nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-client:guilin-latest
${CLIENT_CONTAINER_NAME} %{ClientContainerName}
${CERT_SERVICE_NETWORK} certservice_certservice
${MOUNT_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/certservice/tmp
diff --git a/tests/oom-platform-cert-service/postprocessor/resources/test-properties.robot b/tests/oom-platform-cert-service/postprocessor/resources/test-properties.robot
index 80fc06af..38718979 100644
--- a/tests/oom-platform-cert-service/postprocessor/resources/test-properties.robot
+++ b/tests/oom-platform-cert-service/postprocessor/resources/test-properties.robot
@@ -1,6 +1,6 @@
*** Variables ***
-${CERT_POST_PROCESSOR_DOCKER_IMAGE} nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-post-processor:latest
+${CERT_POST_PROCESSOR_DOCKER_IMAGE} nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-post-processor:guilin-latest
${CERT_POST_PROCESSOR_CONTAINER_NAME} %{CertServicePostProcessorContainerName}
${BASE_PATH} %{WORKSPACE}/tests/oom-platform-cert-service/postprocessor
${MOUNT_PATH} ${BASE_PATH}/tmp