launchpad-reviewers team mailing list archive

[Simone Pelosi <mp+488259@xxxxxxxxxxxxxxxxxx>]

Simone Pelosi has proposed merging ~pelpsi/launchpad-mojo-specs/+git/private:fetch-service-snap-bump-to-314-and-new-config into ~launchpad/launchpad-mojo-specs/+git/private:master.

Commit message:
lp-fetch-service: fetch service snap bump to 314
    
This release adds inspectors for apt commands,
bld bin files and charmcraft repositories and fixes a race in snap inspection.
Add the "store" and "bldbin" entries, and the "esm" entry under the apt repositories
in the fetch-service configuration accordingly.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~pelpsi/launchpad-mojo-specs/+git/private/+merge/488259
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~pelpsi/launchpad-mojo-specs/+git/private:fetch-service-snap-bump-to-314-and-new-config into ~launchpad/launchpad-mojo-specs/+git/private:master.

diff --git a/lp-fetch-service/bundle.yaml b/lp-fetch-service/bundle.yaml
index f4cd194..9733d7d 100644
--- a/lp-fetch-service/bundle.yaml
+++ b/lp-fetch-service/bundle.yaml
@@ -6,13 +6,13 @@
 {%-   set nagios_master = "nagios.ps5.internal" %}
 {%- elif stage_name == "qastaging" %}
 {%-   set devel = False %}
-{%-   set fetch_service_snap_revision = 277 %}
+{%-   set fetch_service_snap_revision = 314 %}
 {%-   set nagios_context = "lp-stagingstack-fetch-service" %}
 {%-   set nagios_hostgroups = "stagingstack-lp" %}
 {%-   set nagios_master = "devops-nagios.ps5.internal" %}
 {%- else %}
 {%-   set devel = True %}
-{%-   set fetch_service_snap_revision = 277 %}
+{%-   set fetch_service_snap_revision = 314 %}
 {%-   set nagios_context = "lp-devel-fetch-service" %}
 {%-   set nagios_hostgroups = "devel-lp" %}
 {#-   The configured nagios_master doesn't have to be real, but it does have
@@ -66,6 +66,15 @@ applications:
               - name: publisher-id
                 value: [canonical]
 
+          store:
+            urls:
+              - https://api.staging.snapcraft.io:443/v2/bins/info/**
+
+          bldbin:
+            urls:
+              - https://api.staging.snapcraft.io:443/api/v1/bins/download/**
+              - https://canonical-*.cdn.staging.snapcraftcontent.com:443/download-origin/canonical-*/**
+
           apt:
             repositories:
               default:
@@ -74,7 +83,6 @@ applications:
                   - http://*.archive.ubuntu.com/ubuntu
                   - http://security.ubuntu.com/ubuntu
                   - http://ports.ubuntu.com/ubuntu-ports
-                  - https://esm.ubuntu.com:443/*/ubuntu
                   - http://ftpmaster.internal/ubuntu
                 dists:
                   - "*"
@@ -110,6 +118,76 @@ applications:
                   uOgcXny1UlwtCUzlrSaP
                   =9AdM
                   -----END PGP PUBLIC KEY BLOCK-----
+              esm:
+                urls:
+                  - https://esm.ubuntu.com:443/*/ubuntu
+                dists:
+                  - "*"
+                components:
+                  - "*"
+                public-key: |
+                  -----BEGIN PGP PUBLIC KEY BLOCK-----
+                  Comment: Hostname:
+                  Version: Hockeypuck 2.2
+
+                  xsFNBF3WVA4BEAC7MDr8HClfKptSd4VeB12Vy+Ao/4NpY2ITdkRed4vfh/4eBWWn
+                  3+in6So2ekweifACSxScB/M9zVObsI1cab7QPMkIiATNUfIyOEP7iNWLX4+AytM1
+                  LP3bZo8OpghnLZNstCGbiRUO4CDNmCI04DOPCu9EVEO4WWNuWIMRwCLShDSf7Cid
+                  J2fn2TT/7vsmA4eI3YnAne+u8g4X2zMHQFkHANhylB0lPyThXo5jaxHImzm4wf/2
+                  LF8f1Y1nRQObS2jcvYc3fm9B7iOGpyNAw3h6hrPKH5T9tY/ZoMtFHqn66J1CBSHb
+                  hDkEvA46X50su4yAHeSiEG/hMYG7SoHzmAsjEXnvkTIE41WhmxlidQnRs2uWy34U
+                  7VmOpaidWn3R99fNHYOtSOB6bpIvls8snWSQ63jcFXnt05nVZsp/Ixzl0Oqitynx
+                  DFwoxEwt3ZuCHwxbx2vZ+FiZXVFN7I0IyBDOEL6XS27FNaMCZ7Q/6z/ckdWto55E
+                  264OWf9lnw31bXFXHWSusRXWzD6FK8dqWgjtrWwRxlvF4jm688lqpjac6fFES3UK
+                  BhjyHXFGL/+HHZ9CNxlLYF5QnXq1mGR0Ykw975u8KoOFSLBqsx+1a21m6dfzujY7
+                  2Gq6Sju+9Yo1aOF+CNvTMYdRBoDL4sFj6VAmUsszMA5aAb+82pOCaDvGJQARAQAB
+                  zTVVYnVudHUgQXBwcyBBdXRvbWF0aWMgU2lnbmluZyBLZXkgPGVzbUBjYW5vbmlj
+                  YWwuY29tPsLBeAQTAQIAIgUCXdZUDgIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgEC
+                  F4AACgkQqwGhAdtTkHuTOw/8Czv42TSpwHz+eNtl3ZFyxta9rR/qWC3h+vMu0R/l
+                  5KU3aQQOygWOoUcr1QTPSSg3v/H+v/8vqVq2UuUxSIfpMxBj2kIX2vqskv6Roez7
+                  xR8lVDa0a47z/NYMfKpxrEJxOLh/c7I6aAsa597bTqDHtucHL/22BvfUJJqw6jq1
+                  7SswP5lqKPBFz7x+E2hgfJE7Vn7h0ICm29FkWnOeTKfj8VwTAeKXKUI9Hw6+aqr9
+                  29Y2NdLsYZ57mpivRLNM9sBZoF3avP1pUC2k0IwP3dwh4AxUMXjRRPh173iXBfR2
+                  yAf1lWET/5+8dSBrfFIZSo+FF/EEBmqIVtJpHkq8+YxUbCLbkoikRi2kwrgyXLEn
+                  FqxSU2Ab0xurFHiHcJoCGVD38xjznO5cQl7H4K9+B/rFpTTowOHbOcFpKAzpYqB5
+                  8rnR1yRSsB33zac8xesUIfzYWRtLc5/VIb5mOkWlb62d8emILx2XuRFVjKq6mKki
+                  oGckhDUOuEFrjW1cQq+PWBBxyJoXcy6wGSoPJ/ELeaf9zg8SF0jwuN6BPHVBeJ/E
+                  W53zR5iV0N9fRT+M2JN5tc5HenO92xLgPAh+GPWLYmPdTmHu+kFozqsHx/NUw2iP
+                  PBL6Q1VZytt2Uf6qLPUx7GpYMKf42Vldb0feFo/YA/lzOgPlY29pDLKXbse6o+Sr
+                  kmnCwPMEEAEKAB0WIQSuFW2FH6EUY505Vy5peOGN+xAtAgUCZYHw2QAKCRBpeOGN
+                  +xAtAsFGC/sElB6xJDM0taBAqAis+PuRQ82HyB9a5DuvkaKqDX49TEM2yq+ikYQl
+                  LfG4rJTHusbK6YbK/phXlo0VmNYWQc1VFqKSUzSWPAKDmzAajDpXU6PCKk+MHsY2
+                  pi8DnGfAjHbe3HHXm3/53eoAFNJLtM21D2f/70pWngIRYrcOWck1NzPgONxHiA8i
+                  EyC+CD6xTVTeXX0jRdqTApmkhfSEi1/1ornevzgGVQscUzkLgdtLc7hzCC+S3Hv4
+                  lDjh4O27LZNiYy2pShMM5znGNLEace1zvcL+qau4xg/p3ZohopcfsECvBZcjtIHN
+                  UDDGwSkFzPN7mtRihdS0JEZTnzDF9lJoSCTiynJgaR9rGILwRBXhLC5b78hBUKxH
+                  IYre9rrmr0OpfKxRPJEUZkhn4lzCRscmoFX7yDUYCUmzJM2RLXZ4NRJk0oMfQExw
+                  tzSX2TxxAm4nTPmqimFY2BWofbus0wpivyXLKnmfbdXarPlV+nRj1uVbMoyiEZ4f
+                  hGtjjxVBWvfOwU0EXdZUDgEQAKBoUuIvCP2R5LLd9AKQoDPfDW7zcr8jywLx1ph3
+                  U3rYJ/liMKv+xTQ0DYvqo3ROTe5oQ2+haJ4Ns0bkynSMg+48tgrnu7iYmJ8L1ZdG
+                  V8HxhTVh9zvSwQpoz5JdJ5FEGo5t2/whGdQfJvp8orzK7bUA2MORtN6s7iWDHZKu
+                  tEZrYztniir+0zA6Fq4RmE0xwsTOYaVmqBiCDWZujIE4tccOBOuvd2yBu6j6EITJ
+                  oaFn981tDFd4WzDWBIJhllH2u3QgzizXG8QswlI52FARHEg8Vin9sAz/jqEo9qCb
+                  SX+SpYQdgSMvCKJSC0tFZD9kKSEjZEjXLeB3yQ5BOaLa5q6hDd6xbSTS4yt9lDw/
+                  gb2ZQtu4kNZikib+4S8dOyYiLhoBWU6E4vWL8DEKYhY3MiicFdGtDd4pudajru9+
+                  bnooBClhjllcW2k3zrNc2uyfSSQF0zXNtmqrkmHmDKrn/bybcQs4mU4Owt8R5nkX
+                  efYVYd/zA19yQFSJLne+Thzjyl4v04onYW5CkGxpO9Ol+sjnyhgSlf/PNrv4hj1a
+                  /RDX4292g3zxCE9W8jThXRO6Xuo3CwIUk6Ad2Fuud+D7NWIo3nTpBi+Z7KwkxuPJ
+                  x5LPvNBwwyjw7tokavaxVWC7qbIWTq6ZiUrOzTgG0By1FHbzBfAZ0UADGDSxeKtY
+                  4lkTABEBAAHCwV8EGAECAAkFAl3WVA4CGwwACgkQqwGhAdtTkHs4exAAhxMLSXtG
+                  NWsb3K02AOZpdJs68RPJsk47XbnfqZa7LaCxtxlIFU94i1l0j3TvRNm6AEoAnvzq
+                  ZL3fz0mupVDEE3rO7+UY3aUeEaa21GcDFwTtTzp5haGCggv9Qt6k9tqoQg7ibA/u
+                  bDWWZXOrhnS+0TlFdYdgbjXGt0Ld6IT8ldECWoMROdG0/goOweiYK0At4mrPcEF4
+                  PdaK0zzuff9F2rfUkWD6ltqdshgv8OvIKrKowdy3z39JJo1niDqIgt076CyXzlUh
+                  uAzEy+tYitgmMLA1VgsbdWYcTl2yPpZaivITiaQYgIcXSBCCwQbeNhrzSfCrt/p3
+                  egB6m4gzrrGax1VLRlPayC+g70wHkg6YipCawwPGLbh4PeVxXBSG6NTJi9TVGWiL
+                  glRf8hMqwlaYCpCbhtCqbres6M+KS7b8EIzSlYcwzzjChHRyTq5awXQK+D7DzeG2
+                  OGqu0BDRo6SCJxJRnvjqkJ6nLTYGYo8ZZRrCDpUeoT75GmYyXo5jpzVoQC5FHC9N
+                  jgVGSjmBTHLQWXFiS7L8QF9H5pGVWqfDNxF3T7k1lh6A5UH71y+ASzisUUU+0erC
+                  HhCzCnXmXxMAz3DC+bgApSecJcKy9Yth5XLA7Y+9Ol0GK4Hg9AMG8KlRVomllE52
+                  gW1RgFwq9IQ21MOzB9P6bUCyfF3cBYjgVT4=
+                  =tskY
+                  -----END PGP PUBLIC KEY BLOCK-----
         {#- Revision configuration for the fetch service snap. #}
         revision: {{ fetch_service_snap_revision }}
         log_hosts_allow: "launchpad-bastion-ps5.internal"