Merge lp:~simpoir/landscape-charm/bionic-source-build into lp:~landscape/landscape-charm/trunk

[Simon Poirier]

Adds support for bionic.

Adds support for bionic.

Also sets local repo trusted for source installs, so it doesn't error on the unsigned repo.

Testing instructions.

# build source tarball since the PPA doesn't have bionic packages (yet)
cd landscape/trunk/standalone && make standalone-package-source
cp landscape-server_*.tar.gz path/to/this_charm/
juju deploy . --series bionic --config source="deb https://<redacted>@private-ppa.launchpad.net/landscape/lds-trunk/ubuntu bionic main" --config key=6E85A86E4652B4E6

juju debug-log # look for deployment errors

# feel free to also deploy and relate haproxy, postgresql and rabbitmq-server

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Fail
Revno: 393
Branch: lp:~simpoir/landscape-charm/bionic-source-build
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3899/

review: Needs Fixing (test results)

[lp:~simpoir/landscape-charm/bionic-source-build]

394. By Simon Poirier on 2018-07-13

lint

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 394
Branch: lp:~simpoir/landscape-charm/bionic-source-build
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3900/

review: Approve (test results)

[Dave Jones (waveform)]

Deployment of charm went smoothly, as did deployment and relation of postgresql and rabbitmq-server. Hit a snag with haproxy though: deployed fine but fails to relate complaining it can't find an SSL cert:

unit-haproxy-1: 21:46:09 DEBUG unit.haproxy/1.reverseproxy-relation-changed [ALERT] 207/204609 (6354) : parsing [/etc/
haproxy/haproxy.cfg:59] : 'bind 0.0.0.0:443' : unable to load SSL certificate file '/var/lib/haproxy/default.pem' file
 does not exist.
unit-haproxy-1: 21:46:09 DEBUG unit.haproxy/1.reverseproxy-relation-changed [ALERT] 207/204609 (6354) : Parsing [/etc/
haproxy/haproxy.cfg:129]: frontend 'haproxy-1-80' has the same name as frontend 'haproxy-1-80' declared at /etc/haprox
y/haproxy.cfg:22.
unit-haproxy-1: 21:46:09 DEBUG unit.haproxy/1.reverseproxy-relation-changed [ALERT] 207/204609 (6354) : Error(s) found
 in configuration file : /etc/haproxy/haproxy.cfg
unit-haproxy-1: 21:46:09 DEBUG unit.haproxy/1.reverseproxy-relation-changed [ALERT] 207/204609 (6354) : Fatal errors f
ound in configuration.
unit-haproxy-1: 21:46:09 INFO unit.haproxy/1.juju-log reverseproxy:7: HAProxy configuration check failed, exiting.
unit-haproxy-1: 21:46:09 ERROR juju.worker.uniter.operation hook "reverseproxy-relation-changed" failed: exit status 1

I wonder if that's expected though; something the deployer is meant to provide?

[Dave Jones (waveform)]

Right, all looks good - SSL cert deployment is as expected; +1

review: Approve

=== modified file 'lib/apt.py'
--- lib/apt.py	2017-03-04 02:50:00 +0000
+++ lib/apt.py	2018-07-13 14:11:40 +0000
@@ -69,11 +69,13 @@
     """
 
     def __init__(self, hookenv=hookenv, fetch=fetch, subprocess=subprocess,
-                 paths=default_paths):
+                 paths=default_paths, sources_file=None):
         self._hookenv = hookenv
         self._fetch = fetch
         self._subprocess = subprocess
         self._paths = paths
+        self._sources_file = (
+            sources_file or "/etc/apt/sources.list.d/landscape.list")
 
         self._runner = CommandRunner(hookenv, subprocess)
 
@@ -237,7 +239,9 @@
         runner = self._runner.in_dir(repo_dir)
         runner.shell(BUILD_LOCAL_REPO)
 
-        self._fetch.add_source("deb file://%s/ ./" % repo_dir)
+        # SoftwareProperties does not store trusted flag.
+        with open(self._sources_file, "w") as sources:
+            sources.write("deb [trusted=yes] file://%s/ ./" % repo_dir)
         self._fetch.apt_update(fatal=True)
 
         return True

=== modified file 'lib/tests/test_apt.py'
--- lib/tests/test_apt.py	2016-07-12 22:55:20 +0000
+++ lib/tests/test_apt.py	2018-07-13 14:11:40 +0000
@@ -20,13 +20,14 @@
         self.subprocess = SubprocessStub()
         self.root_dir = self.useFixture(RootDir())
         self.paths = self.root_dir.paths
+        self.sources_file = self.useFixture(TempDir()).join("landscape.list")
         self.subprocess.add_fake_executable("add-apt-repository")
         self.subprocess.add_fake_executable("apt-mark")
         self.subprocess.add_fake_executable(
             "/usr/lib/pbuilder/pbuilder-satisfydepends")
         self.apt = Apt(
             hookenv=self.hookenv, fetch=self.fetch, subprocess=self.subprocess,
-            paths=self.paths)
+            paths=self.paths, sources_file=self.sources_file)
 
     def _create_local_tarball(self, name, version):
         """Create a local minimal source package tarball that can be built.
@@ -177,13 +178,16 @@
         self.assertTrue(os.path.exists(os.path.join(
             repo_dir, "landscape-server_1.2.3_all.deb")))
 
-        self.assertEqual(
-            [("ppa:landscape/14.10", None),
-             ("deb file://%s/build/repo/ ./" % self.hookenv.charm_dir(),
-              None)],
-            self.fetch.sources)
+        self.assertEqual([("ppa:landscape/14.10", None)], self.fetch.sources)
         # XXX: We should check that the generated repository is valid.
 
+        with open(self.sources_file) as sources_file:
+            sources = sources_file.read()
+        self.assertEqual(
+            "deb [trusted=yes] file://{}/build/repo/ ./".format(
+                self.hookenv.charm_dir()),
+            sources)
+
     def test_local_tarball_not_new(self):
         """
         If the landscape tarball hasn't changed, it won't be built.

=== modified file 'metadata.yaml'
--- metadata.yaml	2016-05-18 18:36:20 +0000
+++ metadata.yaml	2018-07-13 14:11:40 +0000
@@ -20,5 +20,6 @@
     interface: landscape-hosted
     scope: container
 series:
+  - bionic
   - xenial
   - trusty