gistfile1.diff

diff --git a/build/upgradomatic b/build/upgradomatic
index 8f82213..e01e3eb 100755
--- a/build/upgradomatic
+++ b/build/upgradomatic
@@ -209,18 +209,19 @@ def load_rhlogin(config)
   match[1]
 end

-def update_devenv(mig_config, devenv, new_version)
+def update_devenv(mig_config, devenv, stage, new_version)
   puts "Updating devenv #{devenv}"

-  command("scp -i ~/.ssh/libra.pem -r #{mig_config['tmp']}/#{new_version}/devenv-local root@#{devenv}:/root/")
-  command("scp -i ~/.ssh/libra.pem #{mig_config['tmp']}/#{new_version}/local.repo root@#{devenv}:/etc/yum.repos.d/")
+  command("ssh root@#{devenv} chmod 600 openshift-test/misc/libra.pem")
+  command("ssh root@#{devenv} scp -i openshift-test/misc/libra.pem -o StrictHostKeyChecking=no -r devenv-local root@#{stage}:")
+  command("ssh root@#{devenv} scp -i openshift-test/misc/libra.pem -o StrictHostKeyChecking=no /etc/yum.repos.d/local.repo root@#{stage}:/etc/yum.r

-  command("ssh root@#{devenv} sed -i -e \"s/stage/candidate/g\" /etc/yum.repos.d/devenv.repo 2>&1")
-  command("ssh root@#{devenv} \"yum -y update --enablerepo devenv-local > /root/update.#{new_version}.log 2>&1\"")
+  command("ssh root@#{stage} sed -i -e \"s/stage/candidate/g\" /etc/yum.repos.d/devenv.repo 2>&1")
+  command("ssh root@#{stage} \"yum -y update --enablerepo devenv-local > /root/update.#{new_version}.log 2>&1\"")

   puts "Running rhc-admin-migrate-datastore for #{new_version}"
   # TODO: make conditional
-  command("ssh root@#{devenv} rhc-admin-migrate-datastore --compatible --version #{new_version}")
+  command("ssh root@#{stage} rhc-admin-migrate-datastore --compatible --version #{new_version}")
 end

 def upgrade_apps(new_version, apps, devenv)
@@ -305,6 +306,7 @@ begin
         ["--version", "-v", GetoptLong::REQUIRED_ARGUMENT],
         ["--command", "-c", GetoptLong::REQUIRED_ARGUMENT],
         ["--devenv",  "-d", GetoptLong::REQUIRED_ARGUMENT],
+        ["--stage",   "-s", GetoptLong::REQUIRED_ARGUMENT],
         ["--apps",    "-a", GetoptLong::REQUIRED_ARGUMENT]
     )
 rescue Exception => e
@@ -369,7 +371,8 @@ when 'setup'
   store_apps(mig_config, apps)
 when 'update'
   devenv = opt['devenv']
-  update_devenv(mig_config, devenv, new_version)
+  stage = opt['stage']
+  update_devenv(mig_config, devenv, stage, new_version)
 when 'upgrade'
   devenv = opt['devenv']
   apps = load_apps(mig_config)