aboutsummaryrefslogtreecommitdiffstats
path: root/fdio.infra
diff options
context:
space:
mode:
Diffstat (limited to 'fdio.infra')
-rw-r--r--fdio.infra/pxe/docker-dnsmasq/Dockerfile2
-rwxr-xr-xfdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf4
-rw-r--r--fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8c:766
-rw-r--r--fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:53:966
-rw-r--r--fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:aa:4c2
-rw-r--r--fdio.infra/pxe/docker-nginx/Dockerfile2
-rw-r--r--fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8a:8c:76/user-data4
-rw-r--r--fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8b:53:96/user-data4
8 files changed, 15 insertions, 15 deletions
diff --git a/fdio.infra/pxe/docker-dnsmasq/Dockerfile b/fdio.infra/pxe/docker-dnsmasq/Dockerfile
index aa342975e0..8b2cc2bd41 100644
--- a/fdio.infra/pxe/docker-dnsmasq/Dockerfile
+++ b/fdio.infra/pxe/docker-dnsmasq/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:24.04 as ubuntu_noble
+FROM ubuntu:24.04 AS ubuntu_noble
LABEL Description="ubuntu intermediate image"
LABEL Version="2.0"
diff --git a/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf b/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf
index 320eba64e2..9e9bad23ca 100755
--- a/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf
+++ b/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf
@@ -55,8 +55,8 @@ dhcp-host=a0:a3:3b:c1:14:28,10.30.51.36,s17-t33-sut1,infinite # enahisic2i0
dhcp-host=a0:a3:3b:c1:12:fa,10.30.51.37,s18-t33-sut2,infinite # enahisic2i0
dhcp-host=40:8d:5c:e7:b2:6e,10.30.51.38,fdio-marvell-dev,infinite # enP2p1s0v0
dhcp-host=ac:1f:6b:8b:53:60,10.30.51.49,s19-t33t211-tg1,infinite # eno1
-dhcp-host=ac:1f:6b:8a:8c:76,10.30.51.50,s1-t11-sut1,infinite # eno1
-dhcp-host=ac:1f:6b:8b:53:96,10.30.51.51,s2-t12-sut1,infinite # eno1
+dhcp-host=ac:1f:6b:8a:8c:76,10.30.51.50,s50-nomad,infinite # eno1
+dhcp-host=ac:1f:6b:8b:53:96,10.30.51.51,s51-nomad,infinite # eno1
dhcp-host=7c:c2:55:27:58:36,10.30.51.52,s52-t21-sut1,infinite # eno1
dhcp-host=7c:c2:55:25:3b:4a,10.30.51.53,s53-t21-tg1,infinite # eno1
dhcp-host=7c:c2:55:27:58:44,10.30.51.54,s54-t22-sut1,infinite # eno1
diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8c:76 b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8c:76
index 7c3f2591e1..be16a76382 100644
--- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8c:76
+++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8a:8c:76
@@ -1,4 +1,4 @@
-menuentry "Install s1-t11-sut1" {
- linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8a:8c:76 url=http://10.30.51.24:8081/ubuntu_jammy_amd64//ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:8a:8c:76/ --- console=ttyS0,115200n8 quiet
- initrd /casper/ubuntu-jammy-amd64/initrd
+menuentry "Install s50-nomad" {
+ linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1:dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_amd64/ac:1f:6b:8a:8c:76/ ---
+ initrd /casper/ubuntu-noble-amd64/initrd
}
diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:53:96 b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:53:96
index ed430b3148..d07c894c2a 100644
--- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:53:96
+++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:8b:53:96
@@ -1,4 +1,4 @@
-menuentry "Install s2-t12-sut1" {
- linux /casper/ubuntu-jammy-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:8b:53:96 url=http://10.30.51.24:8081/ubuntu_jammy_amd64//ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/ac:1f:6b:8b:53:96/ --- console=ttyS0,115200n8 quiet
- initrd /casper/ubuntu-jammy-amd64/initrd
+menuentry "Install s51-nomad" {
+ linux /casper/ubuntu-noble-amd64/vmlinuz ip=:::::eno1:dhcp url=https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_amd64/ac:1f:6b:8b:53:96/ ---
+ initrd /casper/ubuntu-noble-amd64/initrd
}
diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:aa:4c b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:aa:4c
index 632c6b96a7..474a512d4b 100644
--- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:aa:4c
+++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:e7:aa:4c
@@ -1,4 +1,4 @@
menuentry "Install s70-t13-sut1" {
- linux /casper/ubuntu-noble-arm64/vmlinuz ip=:::::eno1:dhcp url=http://10.30.51.24:8081/ubuntu_noble_arm64/ubuntu-24.01-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/d8:5e:d3:e7:aa:4c/ ---
+ linux /casper/ubuntu-noble-arm64/vmlinuz ip=:::::eno1:dhcp url=http://10.30.51.24:8081/ubuntu_noble_arm64/ubuntu-24.04-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/d8:5e:d3:e7:aa:4c/ ---
initrd /casper/ubuntu-noble-arm64/initrd
}
diff --git a/fdio.infra/pxe/docker-nginx/Dockerfile b/fdio.infra/pxe/docker-nginx/Dockerfile
index 39f47b73d6..b71d4d7771 100644
--- a/fdio.infra/pxe/docker-nginx/Dockerfile
+++ b/fdio.infra/pxe/docker-nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:24.04 as ubuntu_noble
+FROM ubuntu:24.04 AS ubuntu_noble
LABEL Description="ubuntu intermediate image"
LABEL Version="2.0"
diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8a:8c:76/user-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8a:8c:76/user-data
index c7c1e3ff44..3d15291d93 100644
--- a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8a:8c:76/user-data
+++ b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8a:8c:76/user-data
@@ -10,7 +10,7 @@ autoinstall:
- arches: [default]
uri: http://ports.ubuntu.com/ubuntu-ports
identity:
- hostname: s1-t11-sut1
+ hostname: s50-nomad
password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1
realname: localadmin
username: localadmin
@@ -117,4 +117,4 @@ autoinstall:
- device: format-0
id: mount-0
path: /boot/efi
- type: mount \ No newline at end of file
+ type: mount
diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8b:53:96/user-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8b:53:96/user-data
index 2be2225ad5..782727f1d5 100644
--- a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8b:53:96/user-data
+++ b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/ac:1f:6b:8b:53:96/user-data
@@ -10,7 +10,7 @@ autoinstall:
- arches: [default]
uri: http://ports.ubuntu.com/ubuntu-ports
identity:
- hostname: s2-t12-sut1
+ hostname: s51-nomad
password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1
realname: localadmin
username: localadmin
@@ -117,4 +117,4 @@ autoinstall:
- device: format-0
id: mount-0
path: /boot/efi
- type: mount \ No newline at end of file
+ type: mount