Merge lp:~smoser/maas-images/trunk.simplestreams-git into lp:maas-images

[Scott Moser]

Adjust to using simplestreams from git instead of bzr.

simplestreams has moved from bzr to git.
Just update references to it's bzr to use git instead.

=== modified file 'doc/setup.txt'
--- doc/setup.txt	2014-03-28 20:06:40 +0000
+++ doc/setup.txt	2018-06-25 19:19:19 +0000
@@ -1,29 +1,3 @@
-## in order to try this / setup development
-## Trusty system
-
-MEPH_V2_BZR="lp:~smoser/maas/maas-ephemerals-v2"
-
-BD="/mnt"
-PKGS="bzr make"
-SRC_D="$BD/src"
-TENV="$SRC_D/simplestreams/tools/tenv"
-
-CI_DAILY_INDEX="http://cloud-images.ubuntu.com/daily/streams/v1/index.json"
-CI_MIRROR_D="$BD/mirrors/cloud-images-daily"
-
-[ -w "$BD" ] || sudo chown $(id -u):$(id -g) "$BD"
-
-sudo apt-get update --quiet
-sudo apt-get install --quiet --assume-yes $pkgs </dev/null
-
-mkdir -p "$SRC_D" "$CI_MIRROR_D"
-
-bzr branch lp:simplestreams "$SRC_D/simplestreams"
-( cd "$SRC_D/simplestreams" && make gnupg )
-
-bzr branch "$MEPH_V2_BZR" "$SRC_D/meph-v2"
-( cd "$SRC_D/simplestreams" && make gnupg )
-
-$TENV sstream-mirror --progress --max=1 "$CI_DAILY_INDEX" "$CI_MIRROR_D"
-
-# vi: syntax=sh
+To set up system for development, including installation of packages
+execute:
+  ./system-setup

=== modified file 'system-setup'
--- system-setup	2017-11-22 20:10:41 +0000
+++ system-setup	2018-06-25 19:19:19 +0000
@@ -2,7 +2,8 @@
 
 _APT_UPDATED=false
 MEPH2_BRANCH="lp:maas-images"
-SSTREAM_BRANCH="lp:simplestreams"
+SSTREAM_REPO="https://git.launchpad.net/simplestreams"
+SSTREAM_BRANCH="master"
 CROSS_DEPS=( qemu-user-static u-boot-tools )
 MEPH2_D=""
 # MEPH2_SIMPLESTREAMS can be:
@@ -128,10 +129,11 @@
 fi
 
 if [ "$MEPH2_SIMPLESTREAMS" = "branch" ]; then
-    sstream_d="$MEPH2_D/simplestreams.bzr"
+    sstream_d="$MEPH2_D/simplestreams.git"
     if [ ! -d "$sstream_d" ]; then
-        bzr branch "$SSTREAM_BRANCH" "$sstream_d" &&
-            ln -snf simplestreams.bzr/simplestreams "$MEPH2_D/simplestreams" ||
+        git clone "--branch=${SSTREAM_BRANCH}" \
+                "${SSTREAM_REPO}" "${sstream_d}" &&
+            ln -snf "${sstream_d}/simplestreams" "$MEPH2_D/simplestreams" ||
             fail "failed to get $SSTREAM_BRANCH"
         out=$(cd "$MEPH2_D" && python3 -c 'import simplestreams' 2>&1) ||
             fail "error getting simplestreams: $out"

=== modified file 'tox.ini'
--- tox.ini	2016-08-01 17:46:47 +0000
+++ tox.ini	2018-06-25 19:19:19 +0000
@@ -5,7 +5,7 @@
 [testenv]
 basepython=python3
 deps =
-     bzr+lp:simplestreams
+     git+https://git.launchpad.net/simplestreams
      pyyaml
      distro_info
 
@@ -18,7 +18,7 @@
 # we explicitly list those dependencies here.
 deps =
     pyyaml
-    bzr+lp:simplestreams
+    git+https://git.launchpad.net/simplestreams
 commands = {toxinidir}/bin/meph2-util --help
 
 [testenv:flake8]