diff --git a/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml b/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml index b757e184f271e2a6a6942543bbc037560d189396..f69c37b38a5a4414c2d75f816ed12035cbb0d53c 100644 --- a/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml +++ b/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml @@ -29,7 +29,7 @@ end2end_test ofc25_camara_agg_net: - docker buildx build -t "${IP_NAME}:latest" -f ./src/tests/tools/mock_ietf_l3vpn_sdn_ctrl/Dockerfile ./src/tests/tools/mock_ietf_l3vpn_sdn_ctrl - docker rm -f ${TEST_NAME} || true - docker rm -f ${IP_NAME} || true - - docker run -d --name ${IP_NAME} -p ${IP_PORT}:8443 $CI_REGISTRY_IMAGE/${IP_NAME}:latest + - docker run -d --name ${IP_NAME} -p ${IP_PORT}:8443 ${IP_NAME}:latest script: # Check MicroK8s is ready @@ -53,14 +53,14 @@ end2end_test ofc25_camara_agg_net: docker run -t --rm --name ${TEST_NAME} --network=host --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh" --volume "$PWD/src/tests/${TEST_NAME}:/opt/results" - $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-onboarding.sh + ${TEST_NAME}:latest /var/teraflow/run-onboarding.sh # Run end-to-end test: configure service TFS - > docker run -t --rm --name ${TEST_NAME} --network=host --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh" --volume "$PWD/src/tests/${TEST_NAME}:/opt/results" - $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-agg-net-ietf-slice-operations.sh + ${TEST_NAME}:latest /var/teraflow/run-agg-net-ietf-slice-operations.sh after_script: - kubectl --namespace tfs logs deployment/contextservice -c server diff --git a/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml b/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml index 571d3ddeaf88f67c89d265570bd3b1be96df139e..c78468180ee8fdf855c0dd096031d49bd53ceec3 100644 --- a/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml +++ b/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml @@ -35,8 +35,8 @@ end2end_test ofc25_camara_e2e: - docker rm -f ${TEST_NAME} || true - docker rm -f ${AGG_NET_NAME} || true - docker rm -f ${NCE_NAME} || true - - docker run -d --name ${NCE_NAME} -p ${NCE_PORT}:8443 $CI_REGISTRY_IMAGE/${NCE_NAME}:latest - - docker run -d --name ${AGG_NET_NAME} -p ${AGG_NET_PORT}:8443 $CI_REGISTRY_IMAGE/${AGG_NET_NAME}:latest + - docker run -d --name ${NCE_NAME} -p ${NCE_PORT}:8443 ${NCE_NAME}:latest + - docker run -d --name ${AGG_NET_NAME} -p ${AGG_NET_PORT}:8443 ${AGG_NET_NAME}:latest script: # Check MicroK8s is ready @@ -60,14 +60,14 @@ end2end_test ofc25_camara_e2e: docker run -t --rm --name ${TEST_NAME} --network=host --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh" --volume "$PWD/src/tests/${TEST_NAME}:/opt/results" - $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-onboarding.sh + ${TEST_NAME}:latest /var/teraflow/run-onboarding.sh # Run end-to-end test: configure service TFS - > docker run -t --rm --name ${TEST_NAME} --network=host --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh" --volume "$PWD/src/tests/${TEST_NAME}:/opt/results" - $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-e2e-ietf-slice-operations.sh + ${TEST_NAME}:latest /var/teraflow/run-e2e-ietf-slice-operations.sh after_script: - kubectl --namespace tfs logs deployment/contextservice -c server