From: Juraj Linkeš Date: Tue, 22 Mar 2022 11:55:18 +0000 (+0100) Subject: WIP update 3n-alt X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=refs%2Fchanges%2F36%2F35736%2F2;hp=deead5d2a1a551d5525efde15ad33f7bbf14ac02 WIP update 3n-alt Change-Id: Ib7d42c8709d51ed4691addb28579e441bc01b8c7 Signed-off-by: Juraj Linkeš --- diff --git a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf index 6862d72c98..1d36ad78bd 100755 --- a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf +++ b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf @@ -73,8 +73,8 @@ dhcp-host=1c:1b:0d:01:d8:dc,10.30.51.68,s50-nomad,infinite # enP2p1s0v0 dhcp-host=e0:d5:5e:ae:70:26,10.30.51.69,s27-t211-sut1,infinite # eno1 dhcp-host=b4:2e:99:ab:1d:e8,10.30.51.70,s55-t13-sut1,infinite # enp8s0f0 dhcp-host=b4:2e:99:ab:1d:dc,10.30.51.71,s56-t14-sut1,infinite # enp8s0f0 -dhcp-host=70:e2:84:8f:e3:48,10.30.51.72,s62-t34-sut1,infinite # eno1 -dhcp-host=70:e2:84:8f:5d:0b,10.30.51.73,s63-t34-sut2,infinite # eno1 +dhcp-host=90:e2:ba:55:be:32,10.30.51.72,s62-t34-sut1,infinite # enp1s0f0 +dhcp-host=90:e2:ba:49:db:b4,10.30.51.73,s63-t34-sut2,infinite # enp1s0f0 dhcp-host=3c:ec:ef:b9:cc:56,10.30.51.74,s64-t34-tg1,infinite # eno1 dhcp-host=3c:ec:ef:b9:a6:ba,10.30.51.75,s65-t37-sut1,infinite # eno1 dhcp-host=3c:ec:ef:b9:a6:80,10.30.51.76,s66-t37-sut2,infinite # eno1 diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-70:e2:84:8f:5d:0b b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4 similarity index 55% rename from fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-70:e2:84:8f:5d:0b rename to fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4 index c810a3cacd..4ce09c3648 100644 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-70:e2:84:8f:5d:0b +++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4 @@ -1,4 +1,4 @@ menuentry "Install s63-t34-sut2" { - linux /casper/ubuntu-focal-arm64/vmlinuz ip=dhcp interface=70:e2:84:8f:5d:0b url=http://10.30.51.28:8081/ubuntu_focal_arm64/ubuntu-20.04.4-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_arm64/70:e2:84:8f:5d:0b/ --- console=ttyAMA0,115200n8 quiet + linux /casper/ubuntu-focal-arm64/vmlinuz ip=dhcp interface=90:e2:ba:49:db:b4 url=http://10.30.51.28:8081/ubuntu_focal_arm64/ubuntu-20.04.4-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_arm64/90:e2:ba:49:db:b4/ --- console=ttyAMA0,115200n8 quiet initrd /casper/ubuntu-focal-arm64/initrd } \ No newline at end of file diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-70:e2:84:8f:e3:48 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32 similarity index 55% rename from fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-70:e2:84:8f:e3:48 rename to fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32 index ea6d5e4162..77d879887d 100644 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-70:e2:84:8f:e3:48 +++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32 @@ -1,4 +1,4 @@ menuentry "Install s62-t34-sut1" { - linux /casper/ubuntu-focal-arm64/vmlinuz ip=dhcp interface=70:e2:84:8f:e3:48 url=http://10.30.51.28:8081/ubuntu_focal_arm64/ubuntu-20.04.4-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_arm64/70:e2:84:8f:e3:48/ --- console=ttyAMA0,115200n8 quiet + linux /casper/ubuntu-focal-arm64/vmlinuz ip=dhcp interface=90:e2:ba:55:be:32 url=http://10.30.51.28:8081/ubuntu_focal_arm64/ubuntu-20.04.4-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.28:8081/ubuntu_focal_arm64/90:e2:ba:55:be:32/ --- console=ttyAMA0,115200n8 quiet initrd /casper/ubuntu-focal-arm64/initrd } \ No newline at end of file diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/70:e2:84:8f:5d:0b/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/90:e2:ba:49:db:b4/meta-data similarity index 100% rename from fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/70:e2:84:8f:5d:0b/meta-data rename to fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/90:e2:ba:49:db:b4/meta-data diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/70:e2:84:8f:5d:0b/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/90:e2:ba:49:db:b4/user-data similarity index 100% rename from fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/70:e2:84:8f:5d:0b/user-data rename to fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/90:e2:ba:49:db:b4/user-data diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/70:e2:84:8f:e3:48/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/90:e2:ba:55:be:32/meta-data similarity index 100% rename from fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/70:e2:84:8f:e3:48/meta-data rename to fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/90:e2:ba:55:be:32/meta-data diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/70:e2:84:8f:e3:48/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/90:e2:ba:55:be:32/user-data similarity index 100% rename from fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/70:e2:84:8f:e3:48/user-data rename to fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/90:e2:ba:55:be:32/user-data