diff --git a/deploy/tfs.sh b/deploy/tfs.sh index 49c2c69c99a76a8d3cec84f5d56ef36fab3cd2fa..cd27f903c4c0c938ae374e18f77cdae14e665641 100755 --- a/deploy/tfs.sh +++ b/deploy/tfs.sh @@ -220,8 +220,12 @@ else fi printf "\n" -# Before deployment change the telemetry LOAD_BALANCER_IP -sed -i "s|_LOAD_BALANCER_IP_|$LOAD_BALANCER_IP|g" manifests/telemetryservice.yaml +if [[ "$TFS_COMPONENTS" == *"telemetry"* ]]; then + echo "Configuring Telemetry Service..." + + # Before deployment change the telemetry LOAD_BALANCER_IP + sed -i "s|_LOAD_BALANCER_IP_|$LOAD_BALANCER_IP|g" manifests/telemetryservice.yaml +fi for COMPONENT in $TFS_COMPONENTS; do echo "Processing '$COMPONENT' component..." @@ -605,8 +609,12 @@ if [[ "$TFS_COMPONENTS" == *"monitoring"* ]] && [[ "$TFS_COMPONENTS" == *"webui" printf "\n\n" fi -# Revert _LOAD_BALANCER_IP_ for the next deployment -sed -i "s|$LOAD_BALANCER_IP|_LOAD_BALANCER_IP_|g" manifests/telemetryservice.yaml +if [[ "$TFS_COMPONENTS" == *"telemetry"* ]]; then + echo "Deconfiguring Telemetry Service..." + + # Revert _LOAD_BALANCER_IP_ for the next deployment + sed -i "s|$LOAD_BALANCER_IP|_LOAD_BALANCER_IP_|g" manifests/telemetryservice.yaml +fi echo "Pruning Docker Images..." docker image prune --force diff --git a/src/tests/ofc24/deploy_specs.sh b/src/tests/ofc24/deploy_specs.sh index 97a5c14fe43893d91762f47bd94dc983e3e1595b..3a03cb246fb715f45ded5979e0cd40bd635aa402 100755 --- a/src/tests/ofc24/deploy_specs.sh +++ b/src/tests/ofc24/deploy_specs.sh @@ -21,7 +21,7 @@ export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/" # Set the list of components, separated by spaces, you want to build images for, and deploy. #export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_generator" -export TFS_COMPONENTS="context device pathcomp service nbi" +export TFS_COMPONENTS="context device pathcomp service nbi webui" # Uncomment to activate Monitoring #export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring" @@ -107,7 +107,7 @@ export CRDB_DEPLOY_MODE="single" export CRDB_DROP_DATABASE_IF_EXISTS="YES" # Disable flag for re-deploying CockroachDB from scratch. -export CRDB_REDEPLOY="YES" +export CRDB_REDEPLOY="" # ----- NATS ------------------------------------------------------------------- diff --git a/src/tests/ofc24/descriptors/old/1.context.json b/src/tests/ofc24/descriptors/old/1.context.json old mode 100755 new mode 100644 diff --git a/src/tests/ofc24/descriptors/old/2.device1.json b/src/tests/ofc24/descriptors/old/2.device1.json old mode 100755 new mode 100644 diff --git a/src/tests/ofc24/descriptors/old/3.device2.json b/src/tests/ofc24/descriptors/old/3.device2.json old mode 100755 new mode 100644 diff --git a/src/tests/ofc24/descriptors/old/4.device3_R1.json b/src/tests/ofc24/descriptors/old/4.device3_R1.json old mode 100755 new mode 100644 diff --git a/src/tests/ofc24/descriptors/old/5.device4_R2.json b/src/tests/ofc24/descriptors/old/5.device4_R2.json old mode 100755 new mode 100644 diff --git a/src/tests/ofc24/descriptors/old/6.links.json b/src/tests/ofc24/descriptors/old/6.links.json old mode 100755 new mode 100644 diff --git a/src/tests/ofc24/descriptors/service-bidir.json b/src/tests/ofc24/descriptors/service-bidir.json old mode 100755 new mode 100644 diff --git a/src/tests/ofc24/descriptors/service-unidir.json b/src/tests/ofc24/descriptors/service-unidir.json old mode 100755 new mode 100644