17 files changed, 9 insertions, 19 deletions
diff --git a/fdio.infra.pxe/docker-nginx/Dockerfile b/fdio.infra.pxe/docker-nginx/Dockerfile
index 45151ae83d..22e7632bd0 100644
--- a/fdio.infra.pxe/docker-nginx/Dockerfile
+++ b/fdio.infra.pxe/docker-nginx/Dockerfile
@@ -6,16 +6,12 @@ LABEL Version="2.0"
 RUN apt update \
  && apt install -y wget
 
-ENV ISO_FOCAL_AMD64 https://releases.ubuntu.com/20.04.4/ubuntu-20.04.4-live-server-amd64.iso
-ENV ISO_FOCAL_ARM64 https://cdimage.ubuntu.com/releases/20.04/release/ubuntu-20.04.4-live-server-arm64.iso
-ENV ISO_JAMMY_AMD64 https://releases.ubuntu.com/22.04/ubuntu-22.04-live-server-amd64.iso
-ENV ISO_JAMMY_ARM64 https://cdimage.ubuntu.com/releases/22.04/release/ubuntu-22.04-live-server-arm64.iso
+ENV ISO_JAMMY_AMD64 https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso
+ENV ISO_JAMMY_ARM64 https://cdimage.ubuntu.com/releases/22.04/release/ubuntu-22.04.1-live-server-arm64.iso
 
 RUN echo "Preparing ISO Pre-cache" \
- && wget $ISO_FOCAL_AMD64 -O /ubuntu-20.04.4-live-server-amd64.iso \
- && wget $ISO_FOCAL_ARM64 -O /ubuntu-20.04.4-live-server-arm64.iso \
- && wget $ISO_JAMMY_AMD64 -O /ubuntu-22.04-live-server-amd64.iso \
- && wget $ISO_JAMMY_ARM64 -O /ubuntu-22.04-live-server-arm64.iso
+ && wget $ISO_JAMMY_AMD64 -O /ubuntu-22.04.1-live-server-amd64.iso \
+ && wget $ISO_JAMMY_ARM64 -O /ubuntu-22.04.1-live-server-arm64.iso
 
 
 FROM nginx:stable-alpine
@@ -23,19 +19,13 @@ FROM nginx:stable-alpine
 LABEL Description="nginx service image"
 LABEL Version="2.0"
 
-ENV NGINX_FOCAL_AMD64 /usr/share/nginx/html/ubuntu_focal_amd64/
-ENV NGINX_FOCAL_ARM64 /usr/share/nginx/html/ubuntu_focal_arm64/
 ENV NGINX_JAMMY_AMD64 /usr/share/nginx/html/ubuntu_jammy_amd64/
 ENV NGINX_JAMMY_ARM64 /usr/share/nginx/html/ubuntu_jammy_arm64/
 
-RUN mkdir -p $NGINX_FOCAL_AMD64 \
- && mkdir -p $NGINX_FOCAL_ARM64 \
- && mkdir -p $NGINX_JAMMY_AMD64 \
+RUN mkdir -p $NGINX_JAMMY_AMD64 \
  && mkdir -p $NGINX_JAMMY_ARM64
 
-COPY --from=ubuntu_jammy /ubuntu-20.04.4-live-server-amd64.iso $NGINX_FOCAL_AMD64/ubuntu-20.04.4-live-server-amd64.iso
-COPY --from=ubuntu_jammy /ubuntu-20.04.4-live-server-arm64.iso $NGINX_FOCAL_ARM64/ubuntu-20.04.4-live-server-arm64.iso
-COPY --from=ubuntu_jammy /ubuntu-22.04-live-server-amd64.iso $NGINX_JAMMY_AMD64/ubuntu-22.04-live-server-amd64.iso
-COPY --from=ubuntu_jammy /ubuntu-22.04-live-server-arm64.iso $NGINX_JAMMY_ARM64/ubuntu-22.04-live-server-arm64.iso
+COPY --from=ubuntu_jammy /ubuntu-22.04.1-live-server-amd64.iso $NGINX_JAMMY_AMD64/ubuntu-22.04.1-live-server-amd64.iso
+COPY --from=ubuntu_jammy /ubuntu-22.04.1-live-server-arm64.iso $NGINX_JAMMY_ARM64/ubuntu-22.04.1-live-server-arm64.iso
 
 COPY html/ /usr/share/nginx/html/
 \ No newline at end of file
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/3c:ec:ef:43:a3:ba/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/3c:ec:ef:43:a3:ba/meta-data
index e69de29bb2..e69de29bb2 100644
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/3c:ec:ef:43:a3:ba/meta-data
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/3c:ec:ef:43:a3:ba/meta-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/3c:ec:ef:43:a3:ba/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/3c:ec:ef:43:a3:ba/user-data
index abc84c418a..abc84c418a 100644
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/3c:ec:ef:43:a3:ba/user-data
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/3c:ec:ef:43:a3:ba/user-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/3c:ec:ef:46:34:e8/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/3c:ec:ef:46:34:e8/meta-data
index e69de29bb2..e69de29bb2 100644
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/3c:ec:ef:46:34:e8/meta-data
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/3c:ec:ef:46:34:e8/meta-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/3c:ec:ef:46:34:e8/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/3c:ec:ef:46:34:e8/user-data
index b2a733efd0..b2a733efd0 100644
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/3c:ec:ef:46:34:e8/user-data
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/3c:ec:ef:46:34:e8/user-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:56/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:56/meta-data
index e69de29bb2..e69de29bb2 100644
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:56/meta-data
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:56/meta-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:56/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:56/user-data
index 7dda8a91a9..7dda8a91a9 100644
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:56/user-data
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:56/user-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:76/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:76/meta-data
index e69de29bb2..e69de29bb2 100644
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:76/meta-data
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:76/meta-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:76/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:76/user-data
index c516b55e22..c516b55e22 100644
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:76/user-data
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:76/user-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:8c/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:8c/meta-data
index e69de29bb2..e69de29bb2 100644
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:8c/meta-data
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:8c/meta-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:8c/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:8c/user-data
index b8fb31684e..b8fb31684e 100644
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:8c/user-data
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:8c/user-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:ba/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:ba/meta-data
index e69de29bb2..e69de29bb2 100644
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:ba/meta-data
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:ba/meta-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:ba/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:ba/user-data
index 0af7b187b3..0af7b187b3 100644
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:ba/user-data
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:ba/user-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:c0/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:c0/meta-data
index e69de29bb2..e69de29bb2 100644
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:c0/meta-data
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:c0/meta-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:c0/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:c0/user-data
index c773483892..4af71c7ec8 100644
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:c0/user-data
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:c0/user-data
@@ -10,7 +10,7 @@ autoinstall:
     - arches: [default]
       uri: http://ports.ubuntu.com/ubuntu-ports
   identity:
-    hostname: s28-t26t35-tg1
+    hostname: s35-t28-sut1
     password: $6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0
     realname: testuser
     username: testuser
@@ -22,7 +22,7 @@ autoinstall:
   network:
     ethernets:
       eno1:
-        addresses: [ 10.32.8.10/24 ]
+        addresses: [ 10.32.8.20/24 ]
         dhcp4: false
         gateway4: 10.32.8.1
         nameservers:
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:d6/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:d6/meta-data
index e69de29bb2..e69de29bb2 100644
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:d6/meta-data
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:d6/meta-data
diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:d6/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:d6/user-data
index 4e6022b9ca..4e6022b9ca 100644
--- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:ac:d7:d6/user-data
+++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_amd64/ac:1f:6b:ac:d7:d6/user-data