diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-05-22 15:21:25 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-05-22 15:21:25 +0300 |
| commit | fb044c6f6f5a0ab3eb33ae5d99a7c0ebfbcb8ad6 (patch) | |
| tree | a31ae9e20a3bff7a84967bd87dd86df892c17dac | |
| parent | 1536d0cafa0cf0af9e6d5f71bd1fd797be869fca (diff) | |
| download | linaro-aws-tools-fb044c6f6f5a0ab3eb33ae5d99a7c0ebfbcb8ad6.tar.gz | |
Revert "Fix linaro-ami.conf to use git URL."
I have had more generic fix for this in my local tree.
This reverts commit 1536d0cafa0cf0af9e6d5f71bd1fd797be869fca.
| -rw-r--r-- | linaro-ami/linaro-ami.conf | 12 | ||||
| -rw-r--r-- | linaro-ami/linaro_ami.py | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/linaro-ami/linaro-ami.conf b/linaro-ami/linaro-ami.conf index 274b931..2059693 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 git +vcs_install = sudo apt-get --assume-yes install bzr key_name = linaro-ami-key [ab-natty-64bit] base_ami = ami-87c31aee -init_script_repo = http://git.linaro.org/git-ro/infrastructure/linaro-android-build-tools.git +init_script_repo = lp:linaro-android-build-tools 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 = http://git.linaro.org/git-ro/infrastructure/linaro-android-build-tools.git +init_script_repo = lp:linaro-android-build-tools 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 = http://git.linaro.org/git-ro/ci/lci-build-tools.git +init_script_repo = lp:~linaro-infrastructure/linaro-ci/lci-build-tools 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 = http://git.linaro.org/git-ro/ci/lci-build-tools.git +init_script_repo = lp:~linaro-infrastructure/linaro-ci/lci-build-tools 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 = http://git.linaro.org/git-ro/ci/lci-build-tools.git +init_script_repo = lp:~linaro-infrastructure/linaro-ci/lci-build-tools 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 75c210d..9b76dd7 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("Cloning slave init repo.") - command_output = self.executor.execute( - "git clone %s slave-init" % script_repo) - self.log.debug(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) script_command = "sudo bash slave-init/" + self.config.get( ami_name, "init_script") |