xubuntu-dev team mailing list archive

[Steve Langasek <mp+435316@xxxxxxxxxxxxxxxxxx>]

Review: Needs Fixing

definitely getting closer.

Diff comments:

> diff --git a/etc/config b/etc/config
> index 524e7d8..5f67f7a 100644
> --- a/etc/config
> +++ b/etc/config
> @@ -50,6 +50,9 @@ case $DIST in
>      focal)
>          ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio lubuntu ubuntukylin ubuntu-mate ubuntu-budgie}"
>          ;;
> +    jammy)
> +        ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio lubuntu ubuntukylin ubuntu-mate ubuntu-budgie}"
> +        ;;

since xubuntu-minimal is no longer a separate project, this is not needed here

>      *)
>          ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio lubuntu ubuntukylin ubuntu-mate ubuntu-budgie ubuntu-unity}"
>          ;;
> diff --git a/etc/default-arches b/etc/default-arches
> index 5572c9f..7882ed1 100644
> --- a/etc/default-arches
> +++ b/etc/default-arches
> @@ -67,6 +67,7 @@ ubuntustudio		*			focal-			amd64
>  
>  xubuntu			*			trusty-bionic		amd64 i386
>  xubuntu			*			focal-			amd64
> +xubuntu-minimal			*			lunar-			amd64

Not necessary to specify, it's ok to just use the catch-all at the very bottom which is also amd64 by default

>  
>  *			dvd			trusty-bionic		amd64 i386
>  *			dvd			*			amd64
> diff --git a/etc/livefs-launchpad b/etc/livefs-launchpad
> index d4fced2..0a5e2a6 100644
> --- a/etc/livefs-launchpad
> +++ b/etc/livefs-launchpad
> @@ -8,6 +8,7 @@ ubuntu-canary			daily-live		*		disco-		ubuntu-cdimage/ubuntu-canary
>  ubuntu-desktop-preinstalled daily-preinstalled	focal-		*		ubuntu-cdimage/ubuntu-preinstalled
>  kubuntu			daily-live		*		*		ubuntu-cdimage/kubuntu
>  xubuntu			daily-live		*		*		ubuntu-cdimage/xubuntu
> +xubuntu-minimal			daily-live		lunar-		*		ubuntu-cdimage/xubuntu-minimal

correct, and https://launchpad.net/~ubuntu-cdimage/+livefs/ubuntu/lunar/xubuntu-minimal has now been created.

>  ubuntu-server		daily			trusty-		*		ubuntu-cdimage/ubuntu-server
>  ubuntu-server		daily-preinstalled	xenial-		*		ubuntu-cdimage/cpc
>  ubuntu-server-live	daily-live		bionic-		*		ubuntu-cdimage/ubuntu-server-live
> diff --git a/etc/qa-products b/etc/qa-products
> index ea32841..0af6b3d 100644
> --- a/etc/qa-products
> +++ b/etc/qa-products
> @@ -119,6 +119,7 @@ Ubuntu Unity Desktop amd64					ubuntu-unity	daily-live			desktop					amd64			iso
>  # Xubuntu
>  Xubuntu Desktop amd64						xubuntu			daily-live			desktop					amd64			iso
>  Xubuntu Desktop i386						xubuntu			daily-live			desktop					i386			iso
> +Xubuntu Minimal amd64						xubuntu/minimal daily-live			desktop					amd64			iso

I believe you want 'minimal' here instead of 'desktop'.  Also I'm not sure I see a reason to have a 'xubuntu/minimal' product instead of 'xubuntu' but it also seems to be harmless - all the other examples of product names with slashes in them in this file are not represented as separate products in the iso.qa.ubuntu.com admin interface, so it seems to be a no-op?

>  
>  # Ubuntu WSL (special case, not built via cdimage)
>  Ubuntu WSL									ubuntu			wsl					desktop					amd64			iso
> diff --git a/lib/cdimage/tests/test_tree.py b/lib/cdimage/tests/test_tree.py
> index c293665..e7103de 100644
> --- a/lib/cdimage/tests/test_tree.py
> +++ b/lib/cdimage/tests/test_tree.py
> @@ -311,7 +311,7 @@ class TestPublisherWebIndices(TestCase):
>               [vanilla, "//cdimage.ubuntu.com/include/lubuntu/style.css"]),
>              ("xubuntu",
>               [assets + "/vanilla-framework-version-1.8.0.min.css",
> -              "//cdimage.ubuntu.com/include/xubuntu/style.css"]),
> +              "//cdimage.ubuntu.com/include/xubuntu/style.css"])

appears to be an unrelated change

>          ):
>              self.config["PROJECT"] = project
>              publisher = Publisher(self.tree, "daily")


-- 
https://code.launchpad.net/~xubuntu-dev/ubuntu-cdimage/+git/ubuntu-cdimage/+merge/435316
Your team Xubuntu Developers is subscribed to branch ~xubuntu-dev/ubuntu-cdimage:xubuntu-core.