Merge ~ogayot/curtin:fix-apt-source-example into curtin:master

[Olivier Gayot]

Fix format of examples/apt-source.yaml

Fix format of examples/apt-source.yaml so that it can be passed to apt-config.

Currently, passing the examples/apt-source.yaml file to curtin apt-config fails:

  $ python3 -m curtin apt-config -c examples/apt-source.yaml

  yaml.parser.ParserError: while parsing a block collection
    in "<byte string>", line 80, column 7:
            - arches: [amd64, i386, default]
            ^
  expected <block end>, but found '?'
    in "<byte string>", line 82, column 7:
            uri: http://us.archive.ubuntu.co ...

[Dan Bungert (dbungert)]

review: Approve

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:03c23bd6da8901d198816b3a3fdf60f1ffa9eb6f

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~ogayot/curtin/+git/curtin/+merge/413757/+edit-commit-message

https://jenkins.ubuntu.com/server/job/curtin-ci/218/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/218/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/218/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/218/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/218/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/218//rebuild

review: Needs Fixing (continuous-integration)

[Dan Bungert (dbungert)]

Ignore the test run failure, https://code.launchpad.net/~dbungert/curtin/+git/curtin/+merge/413644 will address that

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:cb9aa6d1293c3228a473c76cc294bd45ad02145f

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~ogayot/curtin/+git/curtin/+merge/413757/+edit-commit-message

https://jenkins.ubuntu.com/server/job/curtin-ci/219/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/219/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/219/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/219/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/219/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/219//rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:c53aa99f2eaf996ade8009bb11758a7a5849b605

No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want jenkins to rebuild you need to trigger it yourself):
https://code.launchpad.net/~ogayot/curtin/+git/curtin/+merge/413757/+edit-commit-message

https://jenkins.ubuntu.com/server/job/curtin-ci/224/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/224/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/224/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/224/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/224/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/224//rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:c53aa99f2eaf996ade8009bb11758a7a5849b605
https://jenkins.ubuntu.com/server/job/curtin-ci/225/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/225/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/225/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/225/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/225/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/225//rebuild

review: Approve (continuous-integration)

[Server Team CI bot (server-team-bot)]

Commit message lints:
- Line #0 has 4 too many characters. Line starts with: "Fix format of examples/apt-source.yaml"...

review: Needs Fixing

[Server Team CI bot (server-team-bot)]

review: Approve (continuous-integration)

diff --git a/examples/apt-source.yaml b/examples/apt-source.yaml
index f0f7108..36c3173 100644
--- a/examples/apt-source.yaml
+++ b/examples/apt-source.yaml
@@ -77,7 +77,7 @@ apt:
     # arches is list of architectures the following config applies to
     # the special keyword "default" applies to any architecture not explicitly
     # listed.
-      - arches: [amd64, i386, default]
+    - arches: [amd64, i386, default]
       # uri is just defining the target as-is
       uri: http://us.archive.ubuntu.com/ubuntu
       #
@@ -100,7 +100,7 @@ apt:
   # security is optional, if not defined it is set to the same value as primary
   security:
     uri: http://security.ubuntu.com/ubuntu
-    [...]
+    # [...]
 
   # if no mirrors are specified at all, or all lookups fail it will use:
   # primary: http://archive.ubuntu.com/ubuntu