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 67530bbecddfefc0b29fa82bfd1074917065fab9..dc601524121fca28aa7a25488c9c33ad2f70899c 100644 --- a/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml +++ b/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml @@ -23,10 +23,9 @@ build ofc25_camara_agg_net: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - HOST_IP=$(kubectl get nodes -o json | jq -r '.items[].status.addresses[] | select(.type=="InternalIP") | .address') - - echo "HOST_IP: $HOST_IP" + - echo 'HOST_IP: $HOST_IP' - sed -i "s/IP_NET_IP/${HOST_IP}/g" src/tests/${TEST_NAME}/data/agg-net-descriptor.json - sed -i "s/IP_NET_PORT/${IP_PORT}/g" src/tests/${TEST_NAME}/data/agg-net-descriptor.json - - docker buildx build -t "${TEST_NAME}:latest" -f ./src/tests/${TEST_NAME}/Dockerfile . - docker tag "${TEST_NAME}:latest" "$CI_REGISTRY_IMAGE/${TEST_NAME}:latest" - docker push "$CI_REGISTRY_IMAGE/${TEST_NAME}:latest" @@ -100,7 +99,7 @@ end2end_test ofc25_camara_agg_net: - kubectl --namespace tfs logs deployment/serviceservice -c server - kubectl --namespace tfs logs deployment/sliceservice -c server - kubectl --namespace tfs logs deployment/nbiservice -c server - - echo "L3VPN SDN Controller logs:" + - echo 'L3VPN SDN Controller logs:' - docker logs ${IP_NAME} # Destroy Scenario diff --git a/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml b/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml index bf1326ad2cf4c9e94d400d020deff3cb1c56d288..860b92a558420d787696ac22531296062c934731 100644 --- a/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml +++ b/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml @@ -25,12 +25,11 @@ build ofc25_camara_e2e: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - HOST_IP=$(kubectl get nodes -o json | jq -r '.items[].status.addresses[] | select(.type=="InternalIP") | .address') - - echo "HOST_IP: $HOST_IP" + - echo 'HOST_IP: $HOST_IP' - sed -i "s/AGG_NET_IP/${HOST_IP}/g" src/tests/${TEST_NAME}/data/camara-e2e-topology.json - sed -i "s/NCE_IP/${HOST_IP}/g" src/tests/${TEST_NAME}/data/camara-e2e-topology.json - sed -i "s/AGG_NET_PORT/${AGG_NET_PORT}/g" src/tests/${TEST_NAME}/data/camara-e2e-topology.json - sed -i "s/NCE_PORT/${NCE_PORT}/g" src/tests/${TEST_NAME}/data/camara-e2e-topology.json - - docker buildx build -t "${TEST_NAME}:latest" -f ./src/tests/${TEST_NAME}/Dockerfile . - docker tag "${TEST_NAME}:latest" "$CI_REGISTRY_IMAGE/${TEST_NAME}:latest" - docker push "$CI_REGISTRY_IMAGE/${TEST_NAME}:latest" @@ -112,10 +111,10 @@ end2end_test ofc25_camara_e2e: - kubectl --namespace tfs logs deployment/sliceservice -c server - kubectl --namespace tfs logs deployment/nbiservice -c server - - echo "NCE logs:" + - echo 'NCE logs:' - docker logs ${NCE_NAME} - - echo "Aggregation controller logs:" + - echo 'Aggregation controller logs:' - docker logs ${AGG_NET_NAME} # Destroy Scenario