Merge lp:~cjohnston/uci-engine/update-u-c-s-i-references into lp:uci-engine

[Chris Johnston]

Fix references to lp:ubuntu-ci-services-itself

With the move to lp:uci-engine, we need to update references

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:415
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/462/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/462/rebuild

review: Approve (continuous-integration)

[Vincent Ladeuil (vila)]

Well done, all external branches already created and up to date !

review: Approve

=== modified file 'TRICKS'
--- TRICKS	2014-03-21 20:49:23 +0000
+++ TRICKS	2014-03-27 12:42:27 +0000
@@ -168,7 +168,7 @@
 Airline.
 
 export CI_PPA=ppa:canonical-ci-engineering/ci-airline-phase-0
-export CI_BRANCH=lp:ubuntu-ci-services-itself
+export CI_BRANCH=lp:uci-engine
 export CI_CODE_SOURCE=branch
 
 cheetah fill --env juju-deployer/configs/unit_config.yaml.tmpl -p > juju-deployer/configs/unit_config.yaml
@@ -311,7 +311,7 @@
 # bzr whoami "bugfixer <[e-mail]>"
 # cd /srv
 # bzr init-repo .
-# bzr branch lp:ubuntu-ci-services-itself trunk
+# bzr branch lp:uci-engine trunk
 
 Really turn the payload into a branch:
 

=== modified file 'ci-utils/ci_utils/setup_helper.py'
--- ci-utils/ci_utils/setup_helper.py	2014-03-10 22:25:00 +0000
+++ ci-utils/ci_utils/setup_helper.py	2014-03-27 12:42:27 +0000
@@ -21,7 +21,7 @@
 from setuptools.package_index import PackageIndex
 
 # A branch with all the ez-install deps in a single directory, ie:
-#   lp:~canonical-ci-engineering/ubuntu-ci-services-itself/deps
+#   lp:~canonical-ci-engineering/uci-engine/deps
 PINNED_BRANCH = os.environ.get('CI_DEPS_BRANCH', '')
 _deps = os.path.join(os.path.dirname(__file__), '../../.deps')
 PINNED_LOCAL = os.environ.get('CI_DEPS_LOCAL', os.path.abspath(_deps))

=== modified file 'debian/control'
--- debian/control	2014-03-14 10:37:28 +0000
+++ debian/control	2014-03-27 12:42:27 +0000
@@ -15,7 +15,7 @@
  python-setuptools
 Standards-Version: 3.9.4
 X-Python-Version: >= 2.7
-Vcs-Bzr: https://code.launchpad.net/~canonical-ci-engineering/ubuntu-ci-services-itself/trunk
+Vcs-Bzr: https://code.launchpad.net/~canonical-ci-engineering/uci-engine/trunk
 
 Package: uci-utils
 Architecture: all

=== modified file 'debian/copyright'
--- debian/copyright	2014-03-07 00:31:30 +0000
+++ debian/copyright	2014-03-27 12:42:27 +0000
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: uci-source
-Source: http://launchpad.net/ubuntu-ci-services-itself
+Source: http://launchpad.net/uci-engine
 
 Files: *
 Copyright: 2013-2014 Canonical Ltd.

=== modified file 'juju-deployer/branch-source-builder.yaml.tmpl'
--- juju-deployer/branch-source-builder.yaml.tmpl	2014-03-14 10:37:28 +0000
+++ juju-deployer/branch-source-builder.yaml.tmpl	2014-03-27 12:42:27 +0000
@@ -36,7 +36,7 @@
                 install_keys: |
                     - ""
         rabbit:
-            branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/rabbitmq-server@46
+            branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@46
             charm: rabbitmq
             options:
                 management_plugin: true

=== modified file 'juju-deployer/deploy.py'
--- juju-deployer/deploy.py	2014-03-14 23:53:04 +0000
+++ juju-deployer/deploy.py	2014-03-27 12:42:27 +0000
@@ -61,7 +61,7 @@
     cheetah_vars = {
         'OS_USERNAME': None,
         'CI_CODE_SOURCE': 'branch',
-        'CI_BRANCH': 'lp:ubuntu-ci-services-itself',
+        'CI_BRANCH': 'lp:uci-engine',
         'CI_PAYLOAD_URL': 'n/a',
         'CI_LAUNCHPAD_USER': None,
         'CI_LAUNCHPAD_PPA_OWNER': None,

=== modified file 'juju-deployer/image-builder.yaml.tmpl'
--- juju-deployer/image-builder.yaml.tmpl	2014-03-14 10:37:28 +0000
+++ juju-deployer/image-builder.yaml.tmpl	2014-03-27 12:42:27 +0000
@@ -36,7 +36,7 @@
                 install_keys: |
                     - ""
         rabbit:
-            branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/rabbitmq-server@46
+            branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@46
             charm: rabbitmq
             options:
                 management_plugin: true

=== modified file 'juju-deployer/lander.yaml.tmpl'
--- juju-deployer/lander.yaml.tmpl	2014-03-14 10:37:28 +0000
+++ juju-deployer/lander.yaml.tmpl	2014-03-27 12:42:27 +0000
@@ -43,7 +43,7 @@
                 unit-config: include-base64://configs/unit_config.yaml
                 main: ./run-python ./lander/lander/run_worker.py --service-name ts-django --service-port 8080 --delay 10
         rabbit:
-            branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/rabbitmq-server@46
+            branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@46
             charm: rabbitmq
     relations:
         - ["lander-jenkins:extension", "lander-jenkins-sub:extension"]

=== modified file 'juju-deployer/production-only.yaml'
--- juju-deployer/production-only.yaml	2014-03-22 00:03:42 +0000
+++ juju-deployer/production-only.yaml	2014-03-27 12:42:27 +0000
@@ -8,7 +8,7 @@
         # like tests/ppa_assigner/test.py which would trigger cleaning of a
         # ppa when its not really necessary
         ppa-cleaner:
-            branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/upstart@7
+            branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/upstart@7
             charm: upstart
             options:
                 service-name: ppa-cleaner

=== modified file 'juju-deployer/test-runner.yaml.tmpl'
--- juju-deployer/test-runner.yaml.tmpl	2014-03-10 22:25:00 +0000
+++ juju-deployer/test-runner.yaml.tmpl	2014-03-27 12:42:27 +0000
@@ -43,7 +43,7 @@
                 install_keys: |
                     - ""
         rabbit:
-            branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/rabbitmq-server@46
+            branch: lp:~canonical-ci-engineering/charms/precise/uci-engine/rabbitmq-server@46
             charm: rabbitmq
             options:
                 management_plugin: true

=== modified file 'tarmac.sh'
--- tarmac.sh	2014-03-10 22:25:00 +0000
+++ tarmac.sh	2014-03-27 12:42:27 +0000
@@ -16,7 +16,7 @@
 
 # REQUIRES: python-pip python-virtualenv python-setuptools python-dev
 
-export CI_DEPS_BRANCH="lp:~canonical-ci-engineering/ubuntu-ci-services-itself/deps"
+export CI_DEPS_BRANCH="lp:~canonical-ci-engineering/uci-engine/deps"
 
 set -e
 if [ -z $1 ] ; then