diff options
| author | Zuul <zuul@review.opendev.org> | 2023-03-15 15:57:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-03-15 15:57:00 +0000 |
| commit | bc5bc85d9c3340975f9f5d6d3c3003db39421464 (patch) | |
| tree | c0faeaabcceaf557e142b04d004ca6c7f531bf4d | |
| parent | c5de8cb54b161018b3a1f6b2aa7bd0f94b78bdd6 (diff) | |
| parent | d81a616780a97022bd21fe064c5bcf0e30fc1a75 (diff) | |
| download | zuul-bc5bc85d9c3340975f9f5d6d3c3003db39421464.tar.gz | |
Merge "tutorial: Update node to jammy"
| -rw-r--r-- | doc/source/examples/etc_nodepool/nodepool.yaml | 4 | ||||
| -rw-r--r-- | doc/source/examples/node-Dockerfile | 2 | ||||
| -rw-r--r-- | doc/source/examples/zuul-config/zuul.d/jobs.yaml | 4 | ||||
| -rw-r--r-- | doc/source/examples/zuul-config/zuul.d/jobs2.yaml | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/doc/source/examples/etc_nodepool/nodepool.yaml b/doc/source/examples/etc_nodepool/nodepool.yaml index 1c1830635..105b0ef54 100644 --- a/doc/source/examples/etc_nodepool/nodepool.yaml +++ b/doc/source/examples/etc_nodepool/nodepool.yaml @@ -7,7 +7,7 @@ zookeeper-tls: ca: /var/certs/certs/cacert.pem labels: - - name: ubuntu-focal + - name: ubuntu-jammy providers: - name: static-vms @@ -16,7 +16,7 @@ providers: - name: main nodes: - name: node - labels: ubuntu-focal + labels: ubuntu-jammy host-key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOgHJYejINIKzUiuSJ2MN8uPc+dfFrZ9JH1hLWS8gI+g" python-path: /usr/bin/python3 username: root diff --git a/doc/source/examples/node-Dockerfile b/doc/source/examples/node-Dockerfile index ff74aa592..b588bcf2c 100644 --- a/doc/source/examples/node-Dockerfile +++ b/doc/source/examples/node-Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/ubuntu:20.04 +FROM docker.io/ubuntu:22.04 RUN apt-get update \ && DEBIAN_FRONTEND="noninteractive" apt-get -y install \ diff --git a/doc/source/examples/zuul-config/zuul.d/jobs.yaml b/doc/source/examples/zuul-config/zuul.d/jobs.yaml index 8ad979e46..bb9822f48 100644 --- a/doc/source/examples/zuul-config/zuul.d/jobs.yaml +++ b/doc/source/examples/zuul-config/zuul.d/jobs.yaml @@ -3,5 +3,5 @@ parent: null nodeset: nodes: - - name: ubuntu-focal - label: ubuntu-focal + - name: ubuntu-jammy + label: ubuntu-jammy diff --git a/doc/source/examples/zuul-config/zuul.d/jobs2.yaml b/doc/source/examples/zuul-config/zuul.d/jobs2.yaml index a6ed1a633..c7b4a6878 100644 --- a/doc/source/examples/zuul-config/zuul.d/jobs2.yaml +++ b/doc/source/examples/zuul-config/zuul.d/jobs2.yaml @@ -18,5 +18,5 @@ timeout: 1800 nodeset: nodes: - - name: ubuntu-focal - label: ubuntu-focal + - name: ubuntu-jammy + label: ubuntu-jammy |