Merge pull request #1120 from AkihiroSuda/move-el9-out-of-experimental

templates: Promote EL9 from experimental

Author: AkihiroSuda

examples/README.md

@@ -5,53 +5,55 @@
 Default: [`default.yaml`](./default.yaml) (⭐Ubuntu, with containerd/nerdctl)
 
 Distro:
-- [`almalinux.yaml`](./almalinux.yaml): AlmaLinux
+- [`almalinux-8.yaml`](./almalinux-8.yaml): AlmaLinux 8
+- [`almalinux-9.yaml`](./almalinux-9.yaml), `almalinux.yaml`: AlmaLinux 9
 - [`alpine.yaml`](./alpine.yaml): ⭐Alpine Linux
 - [`archlinux.yaml`](./archlinux.yaml): ⭐Arch Linux
-- [`centos-stream.yaml`](./centos-stream.yaml): CentOS Stream 8
+- [`centos-stream-8.yaml`](./centos-stream-8.yaml): CentOS Stream 8
+- [`centos-stream-9.yaml`](./centos-stream-9.yaml), `centos-stream.yaml`: CentOS Stream 9
 - [`debian.yaml`](./debian.yaml): ⭐Debian GNU/Linux
 - [`fedora.yaml`](./fedora.yaml): ⭐Fedora
 - [`opensuse.yaml`](./opensuse.yaml): ⭐openSUSE Leap
-- [`oraclelinux.yaml`](./oraclelinux.yaml): Oracle Linux
-- [`rocky.yaml`](./rocky.yaml): Rocky Linux
+- [`oraclelinux-8.yaml`](./oraclelinux-8.yaml): Oracle Linux 8
+- [`oraclelinux-9.yaml`](./oraclelinux-9.yaml), `oraclelinux.yaml`: Oracle Linux 9
+- [`rocky-8.yaml`](./rocky-8.yaml): Rocky Linux 8
+- [`rocky-9.yaml`](./rocky-9.yaml), `rocky.yaml`: Rocky Linux 9
 - [`ubuntu.yaml`](./ubuntu.yaml): Ubuntu (same as `default.yaml` but without extra YAML lines)
 - [`ubuntu-lts.yaml`](./ubuntu-lts.yaml): Ubuntu LTS (same as `ubuntu.yaml` but pinned to an LTS version)
+- [`deprecated/centos-7.yaml`](./deprecated/centos-7.yaml): [deprecated] CentOS Linux 7
+- [`experimental/opensuse-tumbleweed.yaml`](experimental/opensuse-tumbleweed.yaml): [experimental] openSUSE Tumbleweed
 
 Container engines:
+- [`apptainer.yaml`](./apptainer.yaml): Apptainer
+- [`apptainer-rootful.yaml`](./apptainer-rootful.yaml): Apptainer (rootful)
 - [`docker.yaml`](./docker.yaml): Docker
 - [`docker-rootful.yaml`](./docker-rootful.yaml): Docker (rootful)
 - [`podman.yaml`](./podman.yaml): Podman
 - [`podman-rootful.yaml`](./podman-rootful.yaml): Podman (rootful)
-- [`apptainer.yaml`](./apptainer.yaml): Apptainer
-- [`apptainer-rootful.yaml`](./apptainer-rootful.yaml): Apptainer (rootful)
 - LXD is installed in the default Ubuntu template, so there is no `lxd.yaml`
 
 Container image builders:
 - [`buildkit.yaml`](./buildkit.yaml): BuildKit
 
 Container orchestration:
+- [`faasd.yaml`](./faasd.yaml): [Faasd](https://docs.openfaas.com/deployment/faasd/)
 - [`k3s.yaml`](./k3s.yaml): Kubernetes via k3s
 - [`k8s.yaml`](./k8s.yaml): Kubernetes via kubeadm
 - [`nomad.yaml`](./nomad.yaml): Nomad
-- [`faasd.yaml`](./faasd.yaml): [Faasd](https://docs.openfaas.com/deployment/faasd/)
 
-Others:
+Optional feature enablers:
 - [`vmnet.yaml`](./vmnet.yaml): ⭐enable [`vmnet.framework`](../docs/network.md)
-- [`deprecated/centos-7.yaml`](./deprecated/centos-7.yaml): [deprecated] CentOS Linux 7
-- [`experimental/almalinux-9.yaml`](experimental/almalinux-9.yaml): [experimental] AlmaLinux 9
-- [`experimental/rocky-9.yaml`](experimental/rocky-9.yaml): [experimental] Rocky Linux 9
-- [`experimental/oraclelinux-9.yaml`](experimental/oraclelinux-9.yaml): [experimental] Oracle Linux 9
-- [`experimental/centos-stream-9.yaml`](experimental/centos-stream-9.yaml): [experimental] CentOS Stream 9
-- [`experimental/opensuse-tumbleweed.yaml`](experimental/opensuse-tumbleweed.yaml): [experimental] openSUSE Tumbleweed
 - [`experimental/9p.yaml`](experimental/9p.yaml): [experimental] use 9p mount type
 - [`experimental/riscv64.yaml`](experimental/riscv64.yaml): [experimental] RISC-V
 
 Lost+found:
 - ~`centos.yaml`~: Removed in Lima v0.8.0, as CentOS 8 reached [EOL](https://www.centos.org/centos-linux-eol/).
-  Replaced by [`rocky.yaml`](./rocky.yaml), [`almalinux.yaml`](./almalinux.yaml), [`oraclelinux.yaml`](./oraclelinux.yaml),
-  and [`centos-stream.yaml`](./centos-stream.yaml).
-- ~`singularity.yaml`~: Moved to [`apptainer-rootful.yaml`](./apptainer-rootful.yaml) in Lima v0.12.1, as Singularity was renamed to Apptainer.
-- ~`experimental/apptainer.yaml`~: Moved to [`apptainer.yaml`](./apptainer.yaml) in Lima v0.12.1
+  Replaced by [`almalinux.yaml`](./almalinux.yaml), [`centos-stream.yaml`](./centos-stream.yaml), [`oraclelinux.yaml`](./oraclelinux.yaml),
+  and [`rocky.yaml`](./rocky.yaml).
+- ~`singularity.yaml`~: Moved to [`apptainer-rootful.yaml`](./apptainer-rootful.yaml) in Lima v0.13.0, as Singularity was renamed to Apptainer.
+- ~`experimental/apptainer.yaml`~: Moved to [`apptainer.yaml`](./apptainer.yaml) in Lima v0.13.0.
+- ~`experimental/{almalinux,centos-stream-9,oraclelinux,rocky}-9.yaml`~: Moved to [`almalinux-9.yaml`](./almalinux.yaml), [`centos-stream-9.yaml`](./centos-stream-9.yaml),
+  [`oraclelinux-9.yaml`](./oraclelinux-9.yaml), and [`rocky-9.yaml`](./rocky-9.yaml) in Lima v0.13.0.
 
 ## Tier 1
 

examples/almalinux-8.yaml

@@ -0,0 +1,22 @@
+# This example requires Lima v0.8.3 or later.
+
+# NOTE: EL8-based distros are known not to work on M1 chips: https://github.com/lima-vm/lima/issues/841
+# EL9-based distros are known to work.
+
+images:
+- location: "http://repo.almalinux.org/almalinux/8.6/cloud/x86_64/images/AlmaLinux-8-GenericCloud-8.6-20220513.x86_64.qcow2"
+  arch: "x86_64"
+  digest: "sha256:1563c0b09d98e7a606e1e737f1c810830aeb0cbe37ac5585f3696be62f0a32b4"
+- location: "http://repo.almalinux.org/almalinux/8.6/cloud/aarch64/images/AlmaLinux-8-GenericCloud-8.6-20220513.aarch64.qcow2"
+  arch: "aarch64"
+  digest: "sha256:d00960b398f257d83ade160eea954caf95a060ad5d74f3af9feeb17e0aa0b6e2"
+mounts:
+- location: "~"
+- location: "/tmp/lima"
+  writable: true
+firmware:
+  legacyBIOS: true
+cpuType:
+  # Workaround for "vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed" on Intel Mac
+  # https://bugs.launchpad.net/qemu/+bug/1838390
+  x86_64: "Haswell-v4"

examples/experimental/almalinux-9.yaml renamed to examples/almalinux-9.yaml

@@ -0,0 +1 @@
+almalinux-9.yaml

examples/almalinux.yaml

@@ -0,0 +1,22 @@
+# This example requires Lima v0.8.3 or later.
+
+# NOTE: EL8-based distros are known not to work on M1 chips: https://github.com/lima-vm/lima/issues/841
+# EL9-based distros are known to work.
+
+images:
+- location: "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220125.1.x86_64.qcow2"
+  arch: "x86_64"
+  digest: "sha256:a25560ab39e10594ee7a4a1dadcba7bf303b7c3c41559b4a7fc3c522540a6672"
+- location: "https://cloud.centos.org/centos/8-stream/aarch64/images/CentOS-Stream-GenericCloud-8-20220125.1.aarch64.qcow2"
+  arch: "aarch64"
+  digest: "sha256:d973991085db0ca8373e1d9948440213cdc76b6acf8f17aa2aed2163c1347cbc"
+mounts:
+- location: "~"
+- location: "/tmp/lima"
+  writable: true
+firmware:
+  legacyBIOS: true
+cpuType:
+  # Workaround for "vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed" on Intel Mac
+  # https://bugs.launchpad.net/qemu/+bug/1838390
+  x86_64: "Haswell-v4"

examples/almalinux.yaml

@@ -0,0 +1 @@
+centos-stream-9.yaml

examples/centos-stream-8.yaml

@@ -0,0 +1,24 @@
+# This example requires Lima v0.9.0 or later.
+# Oracle image licence: https://www.oracle.com/downloads/licenses/oracle-linux-license.html
+# Image source: https://yum.oracle.com/oracle-linux-templates.html
+
+# NOTE: EL8-based distros are known not to work on M1 chips: https://github.com/lima-vm/lima/issues/841
+# EL9-based distros are known to work.
+
+images:
+- location: "https://yum.oracle.com/templates/OracleLinux/OL8/u6/x86_64/OL8U6_x86_64-kvm-b126.qcow"
+  arch: "x86_64"
+  digest: "sha256:f00bf07669b1b9b07de446140ed0ac4f3f310160104a41715cfa051d0ded3eed"
+- location: "https://yum.oracle.com/templates/OracleLinux/OL8/u6/aarch64/OL8U6_aarch64-kvm-b2.qcow"
+  arch: "aarch64"
+  digest: "sha256:7fcf1765c5aa346be85eb8df0bc03d9e71b83dba6724fa7c41421be541d2ff93"
+mounts:
+- location: "~"
+- location: "/tmp/lima"
+  writable: true
+firmware:
+  legacyBIOS: true
+cpuType:
+  # Workaround for "vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed" on Intel Mac
+  # https://bugs.launchpad.net/qemu/+bug/1838390
+  x86_64: "Haswell-v4"

examples/experimental/centos-stream-9.yaml renamed to examples/centos-stream-9.yaml

@@ -0,0 +1 @@
+oraclelinux-9.yaml

examples/centos-stream.yaml

@@ -0,0 +1,22 @@
+# This example requires Lima v0.8.3 or later.
+
+# NOTE: EL8-based distros are known not to work on M1 chips: https://github.com/lima-vm/lima/issues/841
+# EL9-based distros are known to work.
+
+images:
+- location: "https://dl.rockylinux.org/pub/rocky/8.6/images/Rocky-8-GenericCloud-8.6.20220702.0.x86_64.qcow2"
+  arch: "x86_64"
+  digest: "sha256:7b786a39eeb96e22dd85386377ff186737f6c1b9a5faa105b0a0a7a4895c29d0"
+- location: "https://dl.rockylinux.org/pub/rocky/8.6/images/Rocky-8-GenericCloud-8.6.20220702.0.aarch64.qcow2"
+  arch: "aarch64"
+  digest: "sha256:42da3cc0c10677d37e43f862c4a8f3ab3b72bcccc91ce0c0ef9f4100f4b950b4"
+mounts:
+- location: "~"
+- location: "/tmp/lima"
+  writable: true
+firmware:
+  legacyBIOS: true
+cpuType:
+  # Workaround for "vmx_write_mem: mmu_gva_to_gpa XXXXXXXXXXXXXXXX failed" on Intel Mac
+  # https://bugs.launchpad.net/qemu/+bug/1838390
+  x86_64: "Haswell-v4"

examples/centos-stream.yaml

@@ -0,0 +1 @@
+rocky-9.yaml