Merge branch 'develop' into 8333-ops-auto-upstall-script-enhancements

docker-compose/setup-script/tests/configure/upgrade.bats

@@ -11,8 +11,12 @@ setup() {
 }
 
 teardown() {
-  cd "${WORKING_DIR}/configure" || exit 1
-  ./setup.sh
+    if [ -n "$SKIP_TEARDOWN" ]; then
+        return
+    fi
+
+    cd "${WORKING_DIR}/install" || exit 1
+    ./setup.sh
 }
 
 @test "Check all containers are upgraded" {