From 811a3eb1002af81ac64e5ab9cfb4ffef811610b1 Mon Sep 17 00:00:00 2001
From: mansoca <carlos.manso@cttc.es>
Date: Sun, 31 Mar 2024 14:38:00 +0200
Subject: [PATCH] deploy paths fixed
---
src/tests/ecoc24/delete.sh | 4 +--
src/tests/ecoc24/deploy_e2e.sh | 6 ++--
src/tests/ecoc24/deploy_ip.sh | 8 +++---
src/tests/ecoc24/deploy_specs_e2e.sh | 2 +-
src/tests/ecoc24/deploy_specs_ip.sh | 2 +-
src/tests/ecoc24/fast_redeploy.sh | 42 ++++++++++++++--------------
6 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/tests/ecoc24/delete.sh b/src/tests/ecoc24/delete.sh
index 3acd872a3..6ad12d15c 100755
--- a/src/tests/ecoc24/delete.sh
+++ b/src/tests/ecoc24/delete.sh
@@ -18,5 +18,5 @@
kubectl delete namespace tfs-e2e tfs-ip
# Delete secondary ingress controllers
-kubectl delete -f ecoc24/nginx-ingress-controller-e2e.yaml
-kubectl delete -f ecoc24/nginx-ingress-controller-ip.yaml
+kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
+kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml
diff --git a/src/tests/ecoc24/deploy_e2e.sh b/src/tests/ecoc24/deploy_e2e.sh
index 7f1bfe945..8e1041cf9 100755
--- a/src/tests/ecoc24/deploy_e2e.sh
+++ b/src/tests/ecoc24/deploy_e2e.sh
@@ -18,12 +18,12 @@
kubectl delete namespace tfs-e2e
# Delete secondary ingress controllers
-kubectl delete -f ecoc24/nginx-ingress-controller-e2e.yaml
+kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
# Create secondary ingress controllers
-kubectl apply -f ecoc24/nginx-ingress-controller-e2e.yaml
+kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
# Deploy TFS for E2E
-source ecoc24/deploy_specs_e2e.sh
+source src/tests/ecoc24/deploy_specs_e2e.sh
./deploy/all.sh
mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_e2e.sh
diff --git a/src/tests/ecoc24/deploy_ip.sh b/src/tests/ecoc24/deploy_ip.sh
index 5d14f2b07..f51e9762b 100755
--- a/src/tests/ecoc24/deploy_ip.sh
+++ b/src/tests/ecoc24/deploy_ip.sh
@@ -18,12 +18,12 @@
kubectl delete namespace tfs-ip
# Delete secondary ingress controllers
-kubectl delete -f ecoc24/nginx-ingress-controller-ip.yaml
+kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml
# Create secondary ingress controllers
-kubectl apply -f ecoc24/nginx-ingress-controller-ip.yaml
+kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml
-# Deploy TFS for ip
-source ecoc24/deploy_specs_ip.sh
+# Deploy TFS for IP
+source src/tests/ecoc24/deploy_specs_ip.sh
./deploy/all.sh
mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_ip.sh
diff --git a/src/tests/ecoc24/deploy_specs_e2e.sh b/src/tests/ecoc24/deploy_specs_e2e.sh
index 1d9a6228b..f91933694 100755
--- a/src/tests/ecoc24/deploy_specs_e2e.sh
+++ b/src/tests/ecoc24/deploy_specs_e2e.sh
@@ -48,7 +48,7 @@ export TFS_IMAGE_TAG="dev"
export TFS_K8S_NAMESPACE="tfs-e2e"
# Set additional manifest files to be applied after the deployment
-export TFS_EXTRA_MANIFESTS="src/testsecoc24/tfs-ingress-e2e.yaml"
+export TFS_EXTRA_MANIFESTS="src/tests/ecoc24/tfs-ingress-e2e.yaml"
# Uncomment to monitor performance of components
export TFS_EXTRA_MANIFESTS="${TFS_EXTRA_MANIFESTS} manifests/servicemonitors.yaml"
diff --git a/src/tests/ecoc24/deploy_specs_ip.sh b/src/tests/ecoc24/deploy_specs_ip.sh
index 256e6e8e2..12c718330 100755
--- a/src/tests/ecoc24/deploy_specs_ip.sh
+++ b/src/tests/ecoc24/deploy_specs_ip.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 webui "
+export TFS_COMPONENTS="context device pathcomp service nbi webui"
# Uncomment to activate Monitoring
diff --git a/src/tests/ecoc24/fast_redeploy.sh b/src/tests/ecoc24/fast_redeploy.sh
index cef672fed..0a6d9bf32 100755
--- a/src/tests/ecoc24/fast_redeploy.sh
+++ b/src/tests/ecoc24/fast_redeploy.sh
@@ -17,31 +17,31 @@
kubectl delete namespace tfs-e2e tfs-ip
echo "Deploying tfs-e2e ..."
-kubectl delete -f ecoc24/nginx-ingress-controller-e2e.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl create namespace tfs-e2e > ./tmp/logs/deploy-tfs-e2e.log
-kubectl apply -f ecoc24/nginx-ingress-controller-e2e.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/contextservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/deviceservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
+kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml > ./tmp/logs/deploy-tfs-e2e.log
+kubectl create namespace tfs-e2e > ./tmp/logs/deploy-tfs-e2e.log
+kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml > ./tmp/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/manifests/contextservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/manifests/deviceservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
kubectl --namespace tfs-e2e apply -f ./tmp/manifests/e2eorchestratorservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/pathcompservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/serviceservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/sliceservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/webuiservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ecoc24/tfs-ingress-e2e.yaml > ./tmp/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/manifests/pathcompservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/manifests/serviceservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/manifests/sliceservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/manifests/webuiservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ecoc24/tfs-ingress-e2e.yaml > ./tmp/logs/deploy-tfs-e2e.log
printf "\n"
echo "Deploying tfs-ip ..."
-kubectl delete -f ecoc24/nginx-ingress-controller-ip.yaml > ./tmp/logs/deploy-tfs-ip.log
-kubectl create namespace tfs-ip > ./tmp/logs/deploy-tfs-ip.log
-kubectl apply -f ecoc24/nginx-ingress-controller-ip.yaml > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/contextservice.yaml > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/deviceservice.yaml > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/pathcompservice.yaml > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/serviceservice.yaml > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/sliceservice.yaml > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/vntmanagerservice.yaml > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/webuiservice.yaml > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ecoc24/tfs-ingress-ip.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl create namespace tfs-ip > ./tmp/logs/deploy-tfs-ip.log
+kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/manifests/contextservice.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/manifests/deviceservice.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/manifests/pathcompservice.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/manifests/serviceservice.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/manifests/sliceservice.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/manifests/vntmanagerservice.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/manifests/webuiservice.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ecoc24/tfs-ingress-ip.yaml > ./tmp/logs/deploy-tfs-ip.log
printf "\n"
echo "Waiting tfs-e2e ..."
--
GitLab