aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilo Casagrande <milo.casagrande@linaro.org>2014-05-16 17:28:16 +0200
committerMilo Casagrande <milo.casagrande@linaro.org>2014-05-16 17:28:16 +0200
commit1536d0cafa0cf0af9e6d5f71bd1fd797be869fca (patch)
tree5dd1db469a7cde08efb9aedecb00f6eac723fe65
parent3c4d5f308e61216fe8382d1cae050b6f193d4cfd (diff)
Fix linaro-ami.conf to use git URL.
* Fix URLs of required initial repos in AMI creation. * Convert old bzr command into git clone operation. Change-Id: Id01de13d7524316eb9708ec4c34cce91187d6388
-rw-r--r--linaro-ami/linaro-ami.conf12
-rw-r--r--linaro-ami/linaro_ami.py8
2 files changed, 10 insertions, 10 deletions
diff --git a/linaro-ami/linaro-ami.conf b/linaro-ami/linaro-ami.conf
index 2059693..274b931 100644
--- a/linaro-ami/linaro-ami.conf
+++ b/linaro-ami/linaro-ami.conf
@@ -5,36 +5,36 @@
[DEFAULT]
instance_type = t1.micro
log_file = linaro-ami.log
-vcs_install = sudo apt-get --assume-yes install bzr
+vcs_install = sudo apt-get --assume-yes install bzr git
key_name = linaro-ami-key
[ab-natty-64bit]
base_ami = ami-87c31aee
-init_script_repo = lp:linaro-android-build-tools
+init_script_repo = http://git.linaro.org/git-ro/infrastructure/linaro-android-build-tools.git
init_script = node/setup-build-android
description = Build Slave AMI for android-build.linaro.org based on Natty 64bit
[ab-precise-64bit]
base_ami = ami-23d9a94a
-init_script_repo = lp:linaro-android-build-tools
+init_script_repo = http://git.linaro.org/git-ro/infrastructure/linaro-android-build-tools.git
init_script = node/setup-build-android
description = Build Slave AMI for android-build.linaro.org based on Precise 64bit
[ci-natty-64bit]
base_ami = ami-87c31aee
-init_script_repo = lp:~linaro-infrastructure/linaro-ci/lci-build-tools
+init_script_repo = http://git.linaro.org/git-ro/ci/lci-build-tools.git
init_script = node/setup-natty-node
description = Build Slave AMI for ci.linaro.org based on Natty 64bit
[ci-oneiric-64bit]
base_ami = ami-baba68d3
-init_script_repo = lp:~linaro-infrastructure/linaro-ci/lci-build-tools
+init_script_repo = http://git.linaro.org/git-ro/ci/lci-build-tools.git
init_script = node/setup-oneiric-node
description = Build Slave AMI for ci.linaro.org based on Oneiric 64bit
[ci-precise-64bit]
base_ami = ami-a29943cb
-init_script_repo = lp:~linaro-infrastructure/linaro-ci/lci-build-tools
+init_script_repo = http://git.linaro.org/git-ro/ci/lci-build-tools.git
init_script = node/setup-precise-node
description = Build Slave AMI for ci.linaro.org based on Precise 64bit
diff --git a/linaro-ami/linaro_ami.py b/linaro-ami/linaro_ami.py
index 9b76dd7..75c210d 100644
--- a/linaro-ami/linaro_ami.py
+++ b/linaro-ami/linaro_ami.py
@@ -88,10 +88,10 @@ class LinaroAMI:
"DEFAULT", "vcs_install"))
self.log.debug(install_command_output)
- self.log.info("Branching slave init repo.")
- bzr_command_output = self.executor.execute(
- "bzr branch %s slave-init" % script_repo)
- self.log.debug(bzr_command_output)
+ self.log.info("Cloning slave init repo.")
+ command_output = self.executor.execute(
+ "git clone %s slave-init" % script_repo)
+ self.log.debug(command_output)
script_command = "sudo bash slave-init/" + self.config.get(
ami_name, "init_script")