launchpad-reviewers team mailing list archive

[Ines Almeida <mp+466050@xxxxxxxxxxxxxxxxxx>]

Review: Needs Fixing

Looks good! I asked for help with the `-server` vs `-grid` question we had and it turns out we should use `-server` (see https://chat.canonical.com/canonical/pl/es1hb46ystdupm3cwo3jykyfaa).

Diff comments:

> diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
> index c2d3d6d..38c6ce5 100644
> --- a/vbuilder/bundle.yaml
> +++ b/vbuilder/bundle.yaml
> @@ -123,7 +123,7 @@
>  {%-   set lp_sshkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFrjt0yytzrK9fQuG+6VgE6QStUbDmunlN7+Lv5XhmoL stg-launchpad@launchpad-bastion-ps5" %}
>  {%-   set modifiers_bos01 = '{"arm64": "10.43.0.10", "ppc64el": "10.43.0.23", "s390x": "10.43.0.15"}' %}
>  {%-   set modifiers_bos02 = '{"arm64": "10.44.0.13", "ppc64el": "10.44.0.19", "s390x": "10.44.0.14"}' %}
> -{%-   set modifiers_bos03 = '{"arm64": "10.144.0.127", "riscv64": "10.144.0.114"}' %}
> +{%-   set modifiers_bos03 = '{"amd64" : "10.144.0.206", "arm64": "10.144.0.127", "riscv64": "10.144.0.114"}' %}

Nit: extra space here after "arm64"

>  {%-   set name_prefix = "launchpad-buildd-qastaging" %}
>  {%-   set openstack_tenant_name = "vbuilder_staging_project" %}
>  {%-   set openstack_tenant_name_bos03 = "launchpad-vbuilder-staging_project" %}
> @@ -445,6 +461,16 @@ applications:
>        clamav-database-url: "{{ clamav_database_url }}"
>        launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
>        linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
> +  launchpad-buildd-image-modifier-bos03-amd64-gpu:
> +    charm: {{ charm_dir }}/launchpad-buildd-image-modifier
> +    options:
> +      clamav-database-url: "{{ clamav_database_url }}"
> +      # TODO: Check if the extra-keys are required to install extra-packages.

I checked with @axino in MM (https://chat.canonical.com/canonical/pl/es1hb46ystdupm3cwo3jykyfaa) and it seems as though we can use `-server` instead of `-grid` which means we also don't need the `extra-keys` option here.

The `extra-keys` seems to be needed if we used `-grid` because that seems like an internal PPA (https://launchpad.net/~launchpad/+archive/ubuntu/buildd-gpu).

> +      # Check why we are using -grid instead of -server (arm64-gpu).
> +      extra-keys: "-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v2\n\nmI0ESUm55wEEALrxow0PCnGeCAebH9g5+wtZBfXZdx2vZts+XsTTHxDRsMNgMC9b\n0klCgbydvkmF9WCphCjQ61Wp/Bh0C7DSXVCpA/xs55QB5VCUceIMZCbMTPq1h7Ht\ncA1f+o6+OCPUntErG6eGize6kGhdjBNPOT+q4BSIL69rPuwfM9ZyAYcBABEBAAG0\nJkxhdW5jaHBhZCBQUEEgZm9yIExhdW5jaHBhZCBEZXZlbG9wZXJziLYEEwECACAF\nAklJuecCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAtH/tsClF0rxsQA/0Q\nw0Yk+xIA1xibyf+UCF9/4fXzdo/tr76qxPRyFiv0uLbFOmW6t26jzpWBHocCHcCU\n57l7rlcEzIHFMcS9Ol6MughP4lhywf9ceeqg2SD6AXjZ0iFarwkueTcHwff5j0lG\nIzzCUVTYJ+m79f/r0dfctL2DwnX7JnT/41mEuR1qbokBHAQQAQIABgUCTB7s7wAK\nCRDFXO8hUqH8T94pCACxl/Gdo82N01H82HvNBa8zQFixNQIwNJN/VxH3WfRvissW\nOMTJnTnNOQErxUhqHrasvZf3djNoHeKRNToTTBaGiEwoySmEK05i4Toq74jWAOs6\nflD2S8natWbobK5V+B2pXZl5g/4Ay21C3H1sZlUxDCcOH9Jh8/0feAZHoSQ/V1Xa\nrEPb+TGdV0hP3Yp7+nIT91sYkj566kA8fjoxJrY/EvXGn98bhYMbMNbtS1Z0WeGp\nzG2hiL6wLSLBxz4Ae9MShOMwNyC1zmr/d1wlF0Efx1N9HaRtRq2s/zqH+ebB7Sr+\nV+SquObb0qr4eAjtslN5BxWROhf+wZM6WJO0Z6nBiQEcBBABAgAGBQJTHvsiAAoJ\nEIngjfAzAr5Z8y4H/jltxz5OwHIDoiXsyWnpjO1SZUV6I6evKpSD7huYtd7MwFZC\n0CgExsPPqLNQCUxITR+9jlqofi/QsTwP7Qq55VmIrKLrZ9KCK1qBnMa/YEXi6TeK\n65lnyN6lNOdzhcsBm3s1/U9ewWp1vsw4UAclmu6tI8GUko+e32K1QjMtIjeVejQl\nJCYDjuxfHhcFWyRo0TWu24F6VD3YxBHpne/M00yd2mLLpHdQrxw/vbvVhZkRDutQ\nemKRA81ZM2WZ1iqYOXtEs5VrD/PtU0nvSAowgeWBmcOwWn3Om+pVsnSoFo46CDvo\nC6YXOWMOMFIxfVhPWqlBkWQsnXFzgk/Xyo4vlTY=\n=Wq6H\n-----END PGP PUBLIC KEY BLOCK-----"
> +      extra-packages: "nvidia-headless-525-grid nvidia-utils-525-grid"
> +      launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
> +      linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
>    launchpad-buildd-image-modifier-bos03-arm64:
>      charm: {{ charm_dir }}/launchpad-buildd-image-modifier
>      options:


-- 
https://code.launchpad.net/~pelpsi/launchpad-mojo-specs/+git/private/+merge/466050
Your team Launchpad code reviewers is subscribed to branch ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.