Merge lp:~ericsnowcurrently/landscape-bundles/release-17.03 into lp:landscape-bundles

[Eric Snow]

Update for the 17.03 release.

Update for the 17.03 release.

Note that the Makefile changes (and ubuntu-deps removal) are there to make landscape-builder happy.

Testing instructions:

(Note that this won't work by default until the 17.03 PPA is set up; use the proposed PPA until then).

1. Deploy using Juju.
2. Verify the version is 17.03.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make render
Result: Fail
Revno: 36
Branch: lp:~ericsnowcurrently/landscape-bundles/release-17.03
Jenkins: https://ci.lscape.net/job/latch-test-trusty/947/

review: Needs Fixing (test results)

[Alberto Donato (ack)]

I wonder if we shouldn't update the charm instead, and leave the "source" option to the default.

review: Needs Information

[Eric Snow (ericsnowcurrently)]

> I wonder if we shouldn't update the charm instead, and leave the "source"
> option to the default.

tl;dr That's fine with me.

My only concern would be how we can test the bundle properly before the charm gets pushed to the stable channel. AFAIU, the bundle would use the charm from the stable channel. Since the charm really can't be tested functionally on its own (currently), that means we'd have to release the charm to the stable channel before we could test the bundle (and the charm). That said, if anything functional changes in the charm we have the same problem, since we'd want to test the new charm (via the bundle).

So ultimately I don't think it's a problem to rely on the charm defaults in the bundle. The testing story for the charm is already a bit muddled. However, if the functional testing story were a bit cleaner then I'd be a bit happier about it. :) That could involve better functional testing in the charm repo or a way to easily test the bundle against a non-stable charm (or even a completely unreleased local dev one). That isn't something we need to worry about here though, particularly with something as innocuous as a version bump. :)

Long story short: I'll go ahead and drop the version from the bundle.

[lp:~ericsnowcurrently/landscape-bundles/release-17.03]

37. By Eric Snow on 2017-03-21

Defer to the charm for the default source.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make render
Result: Fail
Revno: 37
Branch: lp:~ericsnowcurrently/landscape-bundles/release-17.03
Jenkins: https://ci.lscape.net/job/latch-test-trusty/993/

review: Needs Fixing (test results)

[Alberto Donato (ack)]

> > I wonder if we shouldn't update the charm instead, and leave the "source"
> > option to the default.
>
> tl;dr That's fine with me.
>
> My only concern would be how we can test the bundle properly before the charm
> gets pushed to the stable channel. AFAIU, the bundle would use the charm from
> the stable channel. Since the charm really can't be tested functionally on
> its own (currently), that means we'd have to release the charm to the stable
> channel before we could test the bundle (and the charm). That said, if
> anything functional changes in the charm we have the same problem, since we'd
> want to test the new charm (via the bundle).

Can't you reference the new revision even if it's published only to the edge channel?

>
> So ultimately I don't think it's a problem to rely on the charm defaults in
> the bundle. The testing story for the charm is already a bit muddled.
> However, if the functional testing story were a bit cleaner then I'd be a bit
> happier about it. :) That could involve better functional testing in the
> charm repo or a way to easily test the bundle against a non-stable charm (or
> even a completely unreleased local dev one). That isn't something we need to
> worry about here though, particularly with something as innocuous as a version
> bump. :)
>
> Long story short: I'll go ahead and drop the version from the bundle.

[Eric Snow (ericsnowcurrently)]

> Can't you reference the new revision even if it's published only to the
> edge channel?

Good point. Currently we don't specify a revision in the bundle, so it uses the one in the stable channel. Explicitly providing the revision would fix the issue of release testing. However, wouldn't it cause a problem for development testing (i.e. "make stage-landscape-charm && make -C build/landscape-charm deploy-dense-maas")?

[Alberto Donato (ack)]

> > Can't you reference the new revision even if it's published only to the
> > edge channel?
>
> Good point. Currently we don't specify a revision in the bundle, so it uses
> the one in the stable channel. Explicitly providing the revision would fix
> the issue of release testing. However, wouldn't it cause a problem for
> development testing (i.e. "make stage-landscape-charm && make -C build
> /landscape-charm deploy-dense-maas")?

I probably didn't explain myself very well, what I meant is that you should be able to change the charm version in the bundle: "charm": "cs:xenial/landscape-server-1" even if that's not yet published.

[lp:~ericsnowcurrently/landscape-bundles/release-17.03]

38. By Eric Snow on 2017-03-24

Use the charm that points to the 17.03 PPA.

[Eric Snow (ericsnowcurrently)]

> I probably didn't explain myself very well, what I meant is that you should be
> able to change the charm version in the bundle: "charm": "cs:xenial/landscape-
> server-1" even if that's not yet published.

Yep. I just did so. :)

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make render
Result: Fail
Revno: 38
Branch: lp:~ericsnowcurrently/landscape-bundles/release-17.03
Jenkins: https://ci.lscape.net/job/latch-test-trusty/1048/

review: Needs Fixing (test results)

[Alberto Donato (ack)]

+1

review: Approve

[lp:~ericsnowcurrently/landscape-bundles/release-17.03]

39. By Eric Snow on 2017-03-27

Be explicit about the series.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make render
Result: Fail
Revno: 39
Branch: lp:~ericsnowcurrently/landscape-bundles/release-17.03
Jenkins: https://ci.lscape.net/job/latch-test-trusty/1057/

review: Needs Fixing (test results)

[lp:~ericsnowcurrently/landscape-bundles/release-17.03]

40. By Eric Snow on 2017-03-27

Add the ci-test make target.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make render
Result: Fail
Revno: 40
Branch: lp:~ericsnowcurrently/landscape-bundles/release-17.03
Jenkins: https://ci.lscape.net/job/latch-test-trusty/1064/

review: Needs Fixing (test results)

[lp:~ericsnowcurrently/landscape-bundles/release-17.03]

41. By Eric Snow on 2017-03-27

Fix ubuntu-deps for CI.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make render
Result: Fail
Revno: 41
Branch: lp:~ericsnowcurrently/landscape-bundles/release-17.03
Jenkins: https://ci.lscape.net/job/latch-test-trusty/1065/

review: Needs Fixing (test results)

[lp:~ericsnowcurrently/landscape-bundles/release-17.03]

42. By Eric Snow on 2017-03-27

Drop the ubuntu-deps script.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make render
Result: Fail
Revno: 42
Branch: lp:~ericsnowcurrently/landscape-bundles/release-17.03
Jenkins: https://ci.lscape.net/job/latch-test-trusty/1066/

review: Needs Fixing (test results)

[lp:~ericsnowcurrently/landscape-bundles/release-17.03]

43. By Eric Snow on 2017-03-27

Fix a typo.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make render
Result: Success
Revno: 43
Branch: lp:~ericsnowcurrently/landscape-bundles/release-17.03
Jenkins: https://ci.lscape.net/job/latch-test-trusty/1067/

review: Approve (test results)

[David Britton (dpb)]

marking as n-i just so I get a chance to review.

review: Needs Information

[Chad Smith (chad.smith)]

review: Abstain

[David Britton (dpb)]

+1

review: Approve

=== modified file 'Makefile'
--- Makefile	2017-01-20 20:06:23 +0000
+++ Makefile	2017-03-27 22:12:49 +0000
@@ -25,7 +25,17 @@
 
 .PHONY: deps
 deps:
-	@./ubuntu-deps
+	sudo add-apt-repository -y ppa:juju/stable
+	sudo apt-get update
+	sudo apt-get install -y \
+        charm
+	sudo apt-get install -y \
+        python3-jinja2 \
+        python3-yaml \
+        jq
+
+.PHONY: ci-test
+ci-test: deps render
 
 .PHONY: clean
 clean:

=== modified file 'render-bundles'
--- render-bundles	2016-12-13 17:05:38 +0000
+++ render-bundles	2017-03-27 22:12:49 +0000
@@ -16,9 +16,9 @@
         "memory": 2048},
     "haproxy": {},
     "landscape": {
-        "charm": "cs:xenial/landscape-server-0",
+        "charm": "cs:xenial/landscape-server-20",
         "memory": 2048,
-        "source": "ppa:landscape/16.06",
+        # We defer to the default "source" from the charm.
         "key": "4652B4E6"}
 }
 

=== removed file 'ubuntu-deps'
--- ubuntu-deps	2016-07-22 14:45:43 +0000
+++ ubuntu-deps	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-#!/bin/bash -u
-
-set -u
-
-INTERACTIVE=0
-tty -s && INTERACTIVE=1
-
-function apt_get() {
-    local skip=0
-
-    # first check if this is necessary - we don't want to ask for sudo
-    # unless we need it, since this is run from make build-devel
-    output=$(apt-get -s $*)
-    if [ $? -ne 0 ]; then
-        echo "Error: Dependency simulation failed: $*"
-        exit 1
-    fi
-
-    # Check for any lines that start with Inst, which signifies
-    # a package will be installed or upgraded
-    echo "$output" | grep '^Inst ' > /dev/null || skip=1
-
-    if [ $skip -eq 1 ]; then
-        echo " * Skipping: $*"
-        return
-    fi
-    
-    release=$(lsb_release -cs)
-    # needed for the "charm" tool
-    if [ "$release" == "trusty" ]; then
-        sudo add-apt-repository -y ppa:juju/stable
-    fi
-    sudo apt-get update
-
-    if [ $INTERACTIVE -eq 0 ]; then
-        DEBIAN_FRONTEND=noninteractive sudo apt-get \
-            -y --force-yes -o Dpkg::Options::='--force-confold' $*
-    else
-        sudo apt-get $*
-    fi
-
-    if [ $? -ne 0 ]; then
-        echo "Error: Package installation failed: $*"
-        exit 1
-    fi
-}
-
-
-function install_deps {
-    apt_get install \
-        python3-jinja2 \
-        python3-yaml \
-        jq \
-        charm
-}
-
-
-# If running non-interactively, go ahead and apt-get update
-# before we start, keeps jenkins slaves and the like updated
-[ $INTERACTIVE -eq 0 ] && sudo apt-get update
-
-install_deps