Merge lp:~bzoltan/click/add_overlay_ppa into lp:click/devel

[Zoltan Balogh]

Add and pin up the Overlay PPA

Add and pin up the Overlay PPA

[Colin Watson (cjwatson)]

You need to make this only apply to 15.04 frameworks, since the overlay PPA doesn't exist for anything else right now.

review: Needs Fixing

[lp:~bzoltan/click/add_overlay_ppa]

581. By Zoltan Balogh on 2015-09-26

Change silo.pref to stable-phone-overlay.pref and make pep8 happy

582. By Zoltan Balogh on 2015-09-26

Change silo.pref to stable-phone-overlay.pref and make pep8 happy

583. By Zoltan Balogh on 2015-09-26

Remove wrong changelog entry

584. By Zoltan Balogh on 2015-09-26

Remove wrong changelog entry

585. By Zoltan Balogh on 2015-09-26

Add Overlay PPA only to 15.04 targets

586. By Zoltan Balogh on 2015-09-26

Add Overlay PPA only to 15.04 targets

587. By Zoltan Balogh on 2015-09-26

fix the condition

[Zoltan Balogh (bzoltan)]

I have added a check if the target is 15.04.

[lp:~bzoltan/click/add_overlay_ppa]

588. By Zoltan Balogh on 2015-10-02

Address comments from cjwatson

589. By Zoltan Balogh on 2015-10-02

Ehh, silly fi there

590. By Zoltan Balogh on 2015-10-05

remove code duplication

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'click/chroot.py'
--- click/chroot.py	2015-06-30 08:15:16 +0000
+++ click/chroot.py	2015-10-05 11:19:26 +0000
@@ -208,6 +208,8 @@
 
 GEOIP_SERVER = "http://geoip.ubuntu.com/lookup"
 
+overlay_ppa = "ci-train-ppa-service/stable-phone-overlay"
+
 
 def get_geoip_country_code_prefix():
     click_no_local_mirror = os.environ.get('CLICK_NO_LOCAL_MIRROR', 'auto')
@@ -225,6 +227,7 @@
         pass
     return ""
 
+
 def generate_sources(series, native_arch, target_arch,
                      archive_mirror, ports_mirror, components):
     """Generate a list of strings for apts sources.list.
@@ -427,31 +430,52 @@
         finish_script = "%s/finish.sh" % mount
         with open(finish_script, 'w') as finish:
             finish.write(dedent("""\
-            #!/bin/bash
-            set -e
-            # Configure target arch
-            dpkg --add-architecture {target_arch}
-            # Reload package lists
-            apt-get update || true
-            # Pull down signature requirements
-            apt-get -y --force-yes install gnupg ubuntu-keyring
-            # Reload package lists
-            apt-get update || true
-            # Disable debconf questions so that automated builds won't prompt
-            echo set debconf/frontend Noninteractive | debconf-communicate
-            echo set debconf/priority critical | debconf-communicate
-            apt-get -y --force-yes dist-upgrade
-            # Install basic build tool set to match buildd
-            apt-get -y --force-yes install {build_pkgs}
-            # Set up expected /dev entries
-            if [ ! -r /dev/stdin ];  then ln -s /proc/self/fd/0 /dev/stdin;  fi
-            if [ ! -r /dev/stdout ]; then ln -s /proc/self/fd/1 /dev/stdout; fi
-            if [ ! -r /dev/stderr ]; then ln -s /proc/self/fd/2 /dev/stderr; fi
-            # Clean up
-            rm /finish.sh
-            apt-get clean
-            """).format(target_arch=self.target_arch,
-                        build_pkgs=' '.join(build_pkgs)))
+                #!/bin/bash
+                set -e
+                # Configure target arch
+                dpkg --add-architecture {target_arch}
+                # Reload package lists
+                apt-get update || true
+                # Pull down signature requirements
+                apt-get -y --force-yes install gnupg ubuntu-keyring
+            """).format(target_arch=self.target_arch))
+            if self.series == "vivid":
+                finish.write(dedent("""\
+                    apt-get -y --force-yes install software-properties-common
+                    add-apt-repository -y ppa:{ppa}
+                    echo "Package: *"  \
+                        > /etc/apt/preferences.d/stable-phone-overlay.pref
+                    echo \
+                        "Pin: release o=LP-PPA-{pin_ppa}" \
+                        >> /etc/apt/preferences.d/stable-phone-overlay.pref
+                    echo "Pin-Priority: 1001" \
+                        >> /etc/apt/preferences.d/stable-phone-overlay.pref
+                """).format(ppa=overlay_ppa,
+                            pin_ppa=re.sub('/', '-', overlay_ppa)))
+            finish.write(dedent("""\
+                # Reload package lists
+                apt-get update || true
+                # Disable debconf questions
+                # so that automated builds won't prompt
+                echo set debconf/frontend Noninteractive | debconf-communicate
+                echo set debconf/priority critical | debconf-communicate
+                apt-get -y --force-yes dist-upgrade
+                # Install basic build tool set to match buildd
+                apt-get -y --force-yes install {build_pkgs}
+                # Set up expected /dev entries
+                if [ ! -r /dev/stdin ];  then
+                    ln -s /proc/self/fd/0 /dev/stdin;
+                fi
+                if [ ! -r /dev/stdout ]; then
+                     ln -s /proc/self/fd/1 /dev/stdout;
+                fi
+                if [ ! -r /dev/stderr ]; then
+                     ln -s /proc/self/fd/2 /dev/stderr;
+                fi
+                # Clean up
+                rm /finish.sh
+                apt-get clean
+            """).format(build_pkgs=' '.join(build_pkgs)))
         return finish_script
 
     def _debootstrap(self, components, mount, archive):