Merge "Update Ubuntu docker image"

[releng/builder.git] / jjb / packaging / test-ports-nofeature.sh

diff --git a/jjb/packaging/test-ports-nofeature.sh b/jjb/packaging/test-ports-nofeature.sh
index 9cdc6e23f93793ca1afa8128759312e0318b5962..84f4a6968d0110cbe2502b3b3b987fe00ee41868 100644 (file)
--- a/jjb/packaging/test-ports-nofeature.sh
+++ b/jjb/packaging/test-ports-nofeature.sh
@@ -13,8 +13,7 @@ set -ex -o pipefail
 declare -a expected_ports=("1099" "8101" "44444")
 
 # Ports that should only be open after odl-nevirt-openstack is installed
-# 8080 is Nitrogen and Carbon only, not Oxygen
-declare -a unexpected_ports=("2550" "6633" "6640" "6644" "6653" "8080" "8181" "8185")
+declare -a unexpected_ports=("2550" "6633" "6640" "6644" "6653" "8181" "8185")
 
 # Make sure expected ports open
 COUNT="0"
@@ -38,7 +37,7 @@ while true; do
         echo "Closed ports:"
         printf '%s\n' "${closed_ports[@]}"
         break
-    elif [ $COUNT -gt 120 ]; then
+    elif [ $COUNT -gt 300 ]; then
         echo "Timeout waiting ports to open"
         echo "Open ports:"
         printf '%s\n' "${open_ports[@]}"