Fix Aether-in-a-box Configuation Values for Jenkins Tests

Change-Id: I79937b2672cbe2c995018a35d4736a744c1ae597
diff --git a/Makefile b/Makefile
index 8c8a0e6..7099d2c 100644
--- a/Makefile
+++ b/Makefile
@@ -137,7 +137,7 @@
 	sudo ip route replace 192.168.252.0/24 via 192.168.251.1 dev enb
 	kubectl apply -f $(RESOURCEDIR)/router.yaml
 	kubectl wait pod -n default --for=condition=Ready -l app=router --timeout=300s
-	kubectl -n default exec router ip route add 10.250.0.0/16 via 192.168.250.3
+	kubectl -n default exec router ip route add 172.250.0.0/16 via 192.168.250.3
 	kubectl delete net-attach-def core-net
 	touch $@
 
@@ -202,7 +202,8 @@
 	helm delete -n omec oaisim || true
 	helm delete -n omec omec-control-plane || true
 	helm delete -n omec omec-user-plane || true
-	cd $(M); rm -f oaisim omec
+	kubectl delete po router || true
+	cd $(M); rm -f oaisim omec fabric
 
 clean: reset-test
 	kubectl delete po router || true
diff --git a/aether-in-a-box-values.yaml b/aether-in-a-box-values.yaml
index 2a44a98..1b639d7 100644
--- a/aether-in-a-box-values.yaml
+++ b/aether-in-a-box-values.yaml
@@ -15,7 +15,7 @@
   spgwc:
     pfcp: true
     ueIpPool:
-      ip: 10.250.0.0
+      ip: 172.250.0.0
   upf:
     name: "oaisim"
     sriov: