Merge "Move GBP openstack branch to newton"

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 99c83f650dc79ad00d708c011a5b4f59956b0a76..a5d6460378896b5a3e023fa248797c6f039d09d3 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -57,7 +57,7 @@
 
     tools_system_count: 2
 
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170406-0546'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170516-0740'
 
     enable-networking-l2gw: 'yes'
 

diff --git a/jjb/opendaylight-infra-cleanup-stale-stacks.sh b/jjb/opendaylight-infra-cleanup-stale-stacks.sh
index 2d7c928b9d979e8d8225455a733ecf252803340f..d99938b3444dbbc09a741e9dc4305eba0c4334f9 100644 (file)
--- a/jjb/opendaylight-infra-cleanup-stale-stacks.sh
+++ b/jjb/opendaylight-infra-cleanup-stale-stacks.sh
@@ -39,21 +39,36 @@ for STACK_NAME in "${OS_STACKS[@]}"; do
     if [[ "${ACTIVE_BUILDS[@]}" =~ $STACK_NAME ]]; then
         # No need to delete stacks if there exists an active build for them
         continue
-    elif [[ "$STACK_STATUS" =~ DELETE_FAILED ]]; then
-        echo "Stack delete failed, trying to stack abandon now."
-        # stack abandon does not work on RS, therefore requires acquiring a token
-        # and using http delete method to abondon DELETE_FAILED stacks
-        # Todo: remove the change once RS fixes the issue upstream
-        # openstack stack abandon "$STACK_NAME"
-        STACK_ID=$(openstack stack show -f json -c "id" "$STACK_NAME" | jq -r '."id"')
-        TOKEN=$(openstack token issue -f json -c id | jq -r '.id')
-        curl -si -X DELETE -H "Content-Type: application/json" -H "Accept: application/json"\
-            -H "x-auth-token: $TOKEN"\
-            "https://dfw.orchestration.api.rackspacecloud.com/v1/904885/stacks/$STACK_NAME/$STACK_ID/abandon"
-        STACK_SHOW=$(openstack stack show "$STACK_NAME")
-        echo "$STACK_SHOW"
     else
-        echo "Deleting orphaned stack: $STACK_NAME"
-        openstack stack delete --yes "$STACK_NAME"
+        OS_STATUS=$(openstack stack show -f json -c stack_status "$stack" | jq -r '.stack_status')
+        case "$OS_STATUS" in
+            DELETE_IN_PROGRESS)
+                echo "skipping delete, $stack is already DELETE in progress."
+                continue
+            ;;
+            DELETE_FAILED)
+                echo "Stack delete failed, trying to stack abandon now."
+                # stack abandon does not work on RS, therefore requires acquiring a token
+                # and using http delete method to abondon DELETE_FAILED stacks
+                # Todo: remove the change once RS fixes the issue upstream
+                # openstack stack abandon "$STACK_NAME"
+                STACK_ID=$(openstack stack show -f json -c "id" "$STACK_NAME" | jq -r '."id"')
+                TOKEN=$(openstack token issue -f json -c id | jq -r '.id')
+                curl -si -X DELETE -H "Content-Type: application/json" -H "Accept: application/json"\
+                    -H "x-auth-token: $TOKEN"\
+                    "https://dfw.orchestration.api.rackspacecloud.com/v1/904885/stacks/$STACK_NAME/$STACK_ID/abandon"
+                STACK_SHOW=$(openstack stack show "$STACK_NAME")
+                echo "$STACK_SHOW"
+                continue
+            ;;
+            CREATE_COMPLETE|CREATE_FAILED)
+                echo "Deleting orphaned stack: $stack"
+                openstack stack delete --yes "$stack"
+                continue
+            ;;
+            *)
+                continue
+            ;;
+        esac
     fi
 done