Commit 811a3eb1 authored by Carlos Manso's avatar Carlos Manso
Browse files

deploy paths fixed

parent bfb879d3

src/tests/ecoc24/delete.sh

+2 −2
Original line number Diff line number Diff line
@@ -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

src/tests/ecoc24/deploy_e2e.sh

+3 −3
Original line number Diff line number Diff line
@@ -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

src/tests/ecoc24/deploy_ip.sh

+4 −4
Original line number Diff line number Diff line
@@ -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

src/tests/ecoc24/deploy_specs_e2e.sh

+1 −1
Original line number Diff line number Diff line
@@ -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"

src/tests/ecoc24/fast_redeploy.sh

+21 −21
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 
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 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 ecoc24/nginx-ingress-controller-e2e.yaml                  > ./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
@@ -31,9 +31,9 @@ kubectl --namespace tfs-e2e apply -f ecoc24/tfs-ingress-e2e.yaml > ./tmp/ 
printf "\n"



echo "Deploying tfs-ip ..."

kubectl delete -f ecoc24/nginx-ingress-controller-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 ecoc24/nginx-ingress-controller-ip.yaml                   > ./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

src/tests/ecoc24/deploy_specs_ip.sh

+1 −1

File changed.

Contains only whitespace changes.