From ccb61d86a4c41f88db1cc2a346b52e8cde0bf634 Mon Sep 17 00:00:00 2001
From: Wojciech Tyczynski <wojtekt@google.com>
Date: Fri, 9 Sep 2016 09:50:48 +0200
Subject: [PATCH] Comment migration test after rollback to 2.2.1 etcd

---
 hack/test-update-storage-objects.sh | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/hack/test-update-storage-objects.sh b/hack/test-update-storage-objects.sh
index bcb98f271d7..02ef84a1b23 100755
--- a/hack/test-update-storage-objects.sh
+++ b/hack/test-update-storage-objects.sh
@@ -157,14 +157,15 @@ killApiServer
 # We always perform offline migration, so we need to stop etcd.
 #######################################################
 
-kube::etcd::stop
-TARGET_STORAGE="etcd3" \
-  DATA_DIRECTORY="${ETCD_DIR}" \
-  ETCD=$(which etcd) \
-  ETCDCTL=$(which etcdctl) \
-  ATTACHLEASE="${KUBE_OUTPUT_HOSTBIN}/attachlease" \
-  ${KUBE_ROOT}/cluster/images/etcd/migrate-if-needed.sh
-kube::etcd::start
+# TODO: Uncomment once we support migration.
+#kube::etcd::stop
+#TARGET_STORAGE="etcd3" \
+#  DATA_DIRECTORY="${ETCD_DIR}" \
+#  ETCD=$(which etcd) \
+#  ETCDCTL=$(which etcdctl) \
+#  ATTACHLEASE="${KUBE_OUTPUT_HOSTBIN}/attachlease" \
+#  ${KUBE_ROOT}/cluster/images/etcd/migrate-if-needed.sh
+#kube::etcd::start
 
 
 #######################################################
@@ -175,7 +176,8 @@ kube::etcd::start
 
 KUBE_API_VERSIONS="${KUBE_NEW_API_VERSION},${KUBE_OLD_API_VERSION}"
 RUNTIME_CONFIG="api/all=false,api/${KUBE_OLD_API_VERSION}=true,api/${KUBE_NEW_API_VERSION}=true"
-startApiServer ${STORAGE_BACKEND_ETCD3} ${KUBE_NEW_STORAGE_VERSIONS} ${KUBE_STORAGE_MEDIA_TYPE_JSON}
+# TODO: Switch to STORAGE_BACKEND_ETCD3 once we support it.
+startApiServer ${STORAGE_BACKEND_ETCD2} ${KUBE_NEW_STORAGE_VERSIONS} ${KUBE_STORAGE_MEDIA_TYPE_JSON}
 
 # Update etcd objects, so that will now be stored in the new api version.
 kube::log::status "Updating storage versions in etcd"
@@ -190,7 +192,7 @@ for test in ${tests[@]}; do
   new_storage_version=${test_data[5]}
 
   kube::log::status "Verifying ${resource}/${namespace}/${name} has updated storage version ${new_storage_version} in etcd"
-  ETCDCTL_API=3 ${ETCDCTL} --endpoints="${ETCD_HOST}:${ETCD_PORT}" get "/${ETCD_PREFIX}/${resource}/${namespace}/${name}" | grep ${new_storage_version}
+  ${ETCDCTL} --endpoints="${ETCD_HOST}:${ETCD_PORT}" get "/${ETCD_PREFIX}/${resource}/${namespace}/${name}" | grep ${new_storage_version}
 done
 
 killApiServer
@@ -206,7 +208,8 @@ RUNTIME_CONFIG="api/all=false,api/${KUBE_NEW_API_VERSION}=true"
 
 # This seems to reduce flakiness.
 sleep 1
-startApiServer ${STORAGE_BACKEND_ETCD3} ${KUBE_NEW_STORAGE_VERSIONS} ${KUBE_STORAGE_MEDIA_TYPE_PROTOBUF}
+# TODO: Switch to STORAGE_BACKEND_ETCD3 once we support it.
+startApiServer ${STORAGE_BACKEND_ETCD2} ${KUBE_NEW_STORAGE_VERSIONS} ${KUBE_STORAGE_MEDIA_TYPE_PROTOBUF}
 
 for test in ${tests[@]}; do
   IFS=',' read -ra test_data <<<"$test"