2
0
mirror of https://github.com/linka-cloud/d2vm.git synced 2026-01-24 02:25:04 +00:00

chore: update distro releases

Signed-off-by: Adphi <philippe.adrien.nousse@gmail.com>
This commit is contained in:
2026-01-21 18:11:50 +01:00
parent 897f49a452
commit 113541c1d6
4 changed files with 31 additions and 26 deletions

View File

@@ -2,7 +2,6 @@ name: Tests and Build
on: on:
push: push:
branches: [ "*" ]
tags: [ "v*" ] tags: [ "v*" ]
pull_request: pull_request:
branches: [ main ] branches: [ main ]
@@ -59,7 +58,7 @@ jobs:
- kalilinux - kalilinux
- alpine - alpine
- centos - centos
- quay.io/centos/centos:stream9 - quay.io/centos/centos:stream
steps: steps:
- name: Checkout - name: Checkout
@@ -102,13 +101,13 @@ jobs:
strategy: strategy:
matrix: matrix:
image: image:
- alpine:3.17 - alpine:3.23
- ubuntu:20.04
- ubuntu:22.04 - ubuntu:22.04
- debian:10 - ubuntu:24.04
- debian:11 - debian:12
- debian:13
- centos:8 - centos:8
- quay.io/centos/centos:stream9 - quay.io/centos/centos:stream10
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3

View File

@@ -68,10 +68,6 @@ func TestConfig(t *testing.T) {
image string image string
config Config config Config
}{ }{
{
image: "ubuntu:18.04",
config: configDebian,
},
{ {
image: "ubuntu:20.04", image: "ubuntu:20.04",
config: configUbuntu, config: configUbuntu,
@@ -80,22 +76,26 @@ func TestConfig(t *testing.T) {
image: "ubuntu:22.04", image: "ubuntu:22.04",
config: configUbuntu, config: configUbuntu,
}, },
{
image: "ubuntu:24.04",
config: configUbuntu,
},
{ {
image: "ubuntu:latest", image: "ubuntu:latest",
config: configUbuntu, config: configUbuntu,
}, },
{
image: "debian:9",
config: configDebian,
},
{
image: "debian:10",
config: configDebian,
},
{ {
image: "debian:11", image: "debian:11",
config: configDebian, config: configDebian,
}, },
{
image: "debian:12",
config: configDebian,
},
{
image: "debian:13",
config: configDebian,
},
{ {
image: "debian:latest", image: "debian:latest",
config: configDebian, config: configDebian,
@@ -105,7 +105,7 @@ func TestConfig(t *testing.T) {
config: configDebian, config: configDebian,
}, },
{ {
image: "alpine:3.16", image: "alpine:3.20",
config: configAlpine, config: configAlpine,
}, },
{ {
@@ -120,6 +120,10 @@ func TestConfig(t *testing.T) {
image: "quay.io/centos/centos:stream9", image: "quay.io/centos/centos:stream9",
config: configCentOS, config: configCentOS,
}, },
{
image: "quay.io/centos/centos:stream10",
config: configCentOS,
},
} }
exec.SetDebug(true) exec.SetDebug(true)

View File

@@ -47,13 +47,13 @@ type img struct {
var ( var (
images = []img{ images = []img{
{name: "alpine:3.17", luks: "Enter passphrase for /dev/sda2:"}, {name: "alpine:3.23", luks: "Enter passphrase for /dev/sda2:"},
{name: "ubuntu:20.04", luks: "Please unlock disk root:"},
{name: "ubuntu:22.04", luks: "Please unlock disk root:"}, {name: "ubuntu:22.04", luks: "Please unlock disk root:"},
{name: "debian:10", luks: "Please unlock disk root:"}, {name: "ubuntu:24.04", luks: "Please unlock disk root:"},
{name: "debian:11", luks: "Please unlock disk root:"}, {name: "debian:12", luks: "Please unlock disk root:"},
{name: "debian:13", luks: "Please unlock disk root:"},
{name: "centos:8", luks: "Please enter passphrase for disk"}, {name: "centos:8", luks: "Please enter passphrase for disk"},
{name: "quay.io/centos/centos:stream9", luks: "Please enter passphrase for disk"}, {name: "quay.io/centos/centos:stream10", luks: "Please enter passphrase for disk"},
} }
imgNames = func() []string { imgNames = func() []string {
var imgs []string var imgs []string
@@ -147,6 +147,8 @@ imgs:
login := []byte("login:") login := []byte("login:")
password := []byte("Password:") password := []byte("Password:")
s := bufio.NewScanner(outr) s := bufio.NewScanner(outr)
// fix failed to scan output: bufio.Scanner: token too long
s.Buffer(make([]byte, 0, 64*1024), 10*1024*1024)
s.Split(func(data []byte, atEOF bool) (advance int, token []byte, err error) { s.Split(func(data []byte, atEOF bool) (advance int, token []byte, err error) {
if i := bytes.Index(data, []byte(img.luks)); i >= 0 { if i := bytes.Index(data, []byte(img.luks)); i >= 0 {
return i + len(img.luks), []byte(img.luks), nil return i + len(img.luks), []byte(img.luks), nil

View File

@@ -46,5 +46,5 @@ RUN apk add --no-cache \
{{- if .GrubEFI }} {{- if .GrubEFI }}
grub-efi \ grub-efi \
{{- end }} {{- end }}
grub grub || true
{{- end }} {{- end }}