From 4900dcbafcceb14bee46d2b6ddbacc6e1cc18d48 Mon Sep 17 00:00:00 2001
From: Joshua Hesketh <josh@nitrotech.org>
Date: Thu, 20 Feb 2014 13:34:27 +1100
Subject: [PATCH] Tweak timeouts based on recent failures

Also remove useless dataset (devstack_150)

Change-Id: I000e77d80bf326701225b9e21fb0816e4a002748
---
 .../datasets_devstack_150/config.json         | 19 -------------------
 .../datasets_devstack_150/input.json          | 19 -------------------
 .../datasets_user_001/user_001/config.json    |  4 +++-
 etc/turbo-hipster/config.json                 |  4 ----
 4 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 datasets/datasets_devstack_150/datasets_devstack_150/config.json
 delete mode 100644 datasets/datasets_devstack_150/datasets_devstack_150/input.json

diff --git a/datasets/datasets_devstack_150/datasets_devstack_150/config.json b/datasets/datasets_devstack_150/datasets_devstack_150/config.json
deleted file mode 100644
index d76c2c7..0000000
--- a/datasets/datasets_devstack_150/datasets_devstack_150/config.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "Innodb_rows_read": {
-        "default": 1000
-    }, 
-    "XInnodb_rows_changed": {
-        "default": 1000
-    }, 
-    "database": "datasets_devstack_150", 
-    "db_pass": "tester", 
-    "db_user": "nova", 
-    "logging_conf": "logging.conf", 
-    "maximum_migration_times": {
-        "151->152": 67.0, 
-        "default": 60
-    }, 
-    "project": "openstack/nova", 
-    "seed_data": "nova.sql", 
-    "type": "mysql"
-}
\ No newline at end of file
diff --git a/datasets/datasets_devstack_150/datasets_devstack_150/input.json b/datasets/datasets_devstack_150/datasets_devstack_150/input.json
deleted file mode 100644
index d623614..0000000
--- a/datasets/datasets_devstack_150/datasets_devstack_150/input.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "project": "openstack/nova",
-    "type": "mysql",
-    "db_user": "nova",
-    "db_pass": "tester",
-    "database": "datasets_devstack_150",
-    "seed_data": "nova.sql",
-    "logging_conf": "logging.conf",
-    "maximum_migration_times": {
-        "default": 60
-    },
-    "XInnodb_rows_changed": {
-        "default": 1000
-    },
-    "Innodb_rows_read": {
-        "default": 1000
-    }
-}
-
diff --git a/datasets/datasets_user_001/user_001/config.json b/datasets/datasets_user_001/user_001/config.json
index 11a3505..97f1ddb 100644
--- a/datasets/datasets_user_001/user_001/config.json
+++ b/datasets/datasets_user_001/user_001/config.json
@@ -26,7 +26,7 @@
     "db_user": "nova", 
     "logging_conf": "logging.conf", 
     "maximum_migration_times": {
-        "134->135": 116.0, 
+        "134->135": 200.0, 
         "135->134": 97.0, 
         "137->138": 85.0, 
         "138->137": 100.0, 
@@ -44,6 +44,8 @@
         "215->216": 137.0, 
         "229->230": 122.0, 
         "230->229": 84.0, 
+        "230->231": 120,
+        "231->230": 120,
         "_138_bugs": [
             1263835
         ], 
diff --git a/etc/turbo-hipster/config.json b/etc/turbo-hipster/config.json
index aa33e06..9a3457b 100644
--- a/etc/turbo-hipster/config.json
+++ b/etc/turbo-hipster/config.json
@@ -15,10 +15,6 @@
             "name": "gate_real_db_upgrade",
             "datasets_dir": "/var/lib/turbo-hipster/datasets_devstack_131007",
             "function": "build:gate-real-db-upgrade_nova_mysql_devstack_131007"
-        }, {
-            "name": "gate_real_db_upgrade",
-            "datasets_dir": "/var/lib/turbo-hipster/datasets_devstack_150",
-            "function": "build:gate-real-db-upgrade_nova_mysql_devstack_150"
         }, {
             "name": "gate_real_db_upgrade",
             "datasets_dir": "/var/lib/turbo-hipster/datasets_trivial_500",