Merge ~andreserl/maas:prepare_for_bionic into maas:master

[Andres Rodriguez]

Update snap and packaging generation scripts to work on bionic

[Blake Rouse (blake-rouse)]

review: Needs Information

[MAAS Lander (maas-lander)]

UNIT TESTS
-b prepare_for_bionic lp:~andreserl/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: ddac3368749fb3203b4ac0e5b6649f9b90c5c8c7

review: Approve

[Blake Rouse (blake-rouse)]

review: Needs Fixing

[Blake Rouse (blake-rouse)]

review: Approve

[Newell Jensen (newell-jensen)]

I think you need to update the Makefile as well don't you? It has 3.5 hardcoded in there for make sync-dev-snap.

review: Needs Information

[MAAS Lander (maas-lander)]

LANDING
-b prepare_for_bionic lp:~andreserl/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/990/consoleText

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 6730199..be06561 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: maas
 version: git
-version-script: utilities/calc-snap-version  
+version-script: utilities/calc-snap-version
 summary: Metal as a Service
 description: |
   Total automation of your physical servers for amazing data center operational efficiency.
@@ -116,12 +116,17 @@ parts:
       - python3-simplejson
       - python3-markupsafe
     organize:
-        lib/python3.5/site-packages/etc: etc
-        lib/python3.5/site-packages/usr: usr
+        lib/python3.*/site-packages/etc/*: etc
+        lib/python3.*/site-packages/usr/bin/*: usr/bin
+        lib/python3.*/site-packages/usr/lib/*: usr/lib
+        lib/python3.*/site-packages/usr/sbin/*: usr/sbin
+        lib/python3.*/site-packages/usr/share/*: usr/share
         usr/lib/curtin/helpers: usr/lib/python3/dist-packages/helpers
     filesets:
       remove:
-        - -lib/python3.5/site-packages/maastesting
+        - -lib/python3.*/site-packages/etc
+        - -lib/python3.*/site-packages/usr
+        - -lib/python3/dist-packages/maastesting
         - -share
         - -usr/include/libjs-angularjs
         - -usr/share/applications
@@ -148,8 +153,8 @@ parts:
     plugin: dump
     source: twisted/plugins
     organize:
-      maasrackd.py: lib/python3.5/site-packages/twisted/plugins/maasrackd.py
-      maasregiond.py: lib/python3.5/site-packages/twisted/plugins/maasregiond.py
+      maasrackd.py: usr/lib/python3/dist-packages/twisted/plugins/maasrackd.py
+      maasregiond.py: usr/lib/python3/dist-packages/twisted/plugins/maasregiond.py
   snap:
     plugin: dump
     source: snap
diff --git a/utilities/release-build b/utilities/release-build
index 36a21f9..3c0a5af 100755
--- a/utilities/release-build
+++ b/utilities/release-build
@@ -67,7 +67,7 @@ TARBALL="maas_$FULL_VER.orig.tar.gz"
 
 get_orig_source() {
         git archive --format=tar.gz --prefix="${PKG}-${FULL_VER}.orig/" ${COMMIT} -o ${TARBALL}
-	
+
 }
 # Obtain the tarball from a local branch
 get_orig_source
@@ -84,26 +84,8 @@ tar zxvf ${PKG}_${FULL_VER}.orig.tar.gz
 cd "${PKG}-${FULL_VER}.orig/"
 cp -r $ROOTDIR/debian .
 
-if echo "$PACKAGE_DISTROS" | grep -q "xenial"; then
+if echo "$PACKAGE_DISTROS" | grep -q "bionic"; then
     cp $ROOTDIR/debian/changelog debian/changelog
-    sed -i "s/) UNRELEASED;/~16.04.1) xenial;/i" debian/changelog
+    sed -i "s/) UNRELEASED;/~18.04.1) bionic;/i" debian/changelog
     debuild -S -sa
 fi
-
-if echo "$PACKAGE_DISTROS" | grep -q "yakkety"; then
-    cp $ROOTDIR/debian/changelog debian/changelog
-    sed -i "s/) UNRELEASED;/~16.10.1) yakkety;/" debian/changelog
-    debuild -S
-fi
-
-if echo "$PACKAGE_DISTROS" | grep -q "zesty"; then
-    cp $ROOTDIR/debian/changelog debian/changelog
-    sed -i "s/) UNRELEASED;/~17.04.1) zesty;/" debian/changelog
-    debuild -S
-fi
-
-if echo "$PACKAGE_DISTROS" | grep -q "artful"; then
-    cp $ROOTDIR/debian/changelog debian/changelog
-    sed -i "s/) UNRELEASED;/~17.10.1) artful;/" debian/changelog
-    debuild -S
-fi