Code Review / csit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 2ff03f4)
feat(infra): 3n-icxd 42/39842/3
authorpmikus <peter.mikus@protonmail.ch>
Mon, 6 Nov 2023 13:17:11 +0000 (13:17 +0000)
committerPeter Mikus <peter.mikus@protonmail.ch>
Tue, 7 Nov 2023 20:17:47 +0000 (20:17 +0000)
Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>
Change-Id: If817f4ad6380bfa1b91d7c67a7ef843641a75dc5

docs/content/infrastructure/fdio_dc_testbed_specifications.md patch | blob | history
docs/content/infrastructure/fdio_dc_vexxhost_inventory.md patch | blob | history
fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf patch | blob | history
fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:85:8a [new file with mode: 0644] patch | blob
fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_amd64/3c:ec:ef:bc:85:8a/meta-data [new file with mode: 0644] patch | blob
fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_amd64/3c:ec:ef:bc:85:8a/user-data [new file with mode: 0644] patch | blob

diff --git a/docs/content/infrastructure/fdio_dc_testbed_specifications.md b/docs/content/infrastructure/fdio_dc_testbed_specifications.md
index c90e01f..63a1d7c 100644 (file)
--- a/docs/content/infrastructure/fdio_dc_testbed_specifications.md
+++ b/docs/content/infrastructure/fdio_dc_testbed_specifications.md
@@ -1591,14 +1591,14 @@ FD.io CSIT lab contains following server types:
         - s33-t31-sut2-c1/p2 - 25GE-port2 e822cq-2p25GE.
 - ServerF3 [Server-Type-F5]:
     - testbedname: testbed31.
-    - hostname: s89-t31t32-tg1.
-    - IPMI IP: 10.30.50.89
-    - Host IP: 10.30.51.89
+    - hostname: s90-t31t32-tg1.
+    - IPMI IP: 10.30.50.90
+    - Host IP: 10.30.51.90
     - portnames:
-        - s89-t31t32-tg1-c4/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
-        - s89-t31t32-tg1-c4/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
-        - s89-t31t32-tg1-c4/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
-        - s89-t31t32-tg1-c4/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
+        - s90-t31t32-tg1-c4/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s90-t31t32-tg1-c4/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s90-t31t32-tg1-c4/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - s90-t31t32-tg1-c4/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
 - ServerI1 [Server-Type-I1]:
     - testbedname: testbed32.
     - hostname: s34-t32-sut1.
@@ -1617,14 +1617,14 @@ FD.io CSIT lab contains following server types:
         - s35-t32-sut2-c1/p2 - 25GE-port2 e822cq-2p25GE.
 - ServerF3 [Server-Type-F5]:
     - testbedname: testbed32.
-    - hostname: s89-t31t32-tg1.
-    - IPMI IP: 10.30.50.89
-    - Host IP: 10.30.51.89
+    - hostname: s90-t31t32-tg1.
+    - IPMI IP: 10.30.50.90
+    - Host IP: 10.30.51.90
     - portnames:
-        - s89-t31t32-tg1-c6/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
-        - s89-t31t32-tg1-c6/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
-        - s89-t31t32-tg1-c6/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
-        - s89-t31t32-tg1-c6/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
+        - s90-t31t32-tg1-c6/p1 - 25GE-port1 e810-XXVDA4-4p25GE.
+        - s90-t31t32-tg1-c6/p2 - 25GE-port2 e810-XXVDA4-4p25GE.
+        - s90-t31t32-tg1-c6/p3 - 25GE-port3 e810-XXVDA4-4p25GE.
+        - s90-t31t32-tg1-c6/p4 - 25GE-port4 e810-XXVDA4-4p25GE.
 ```
 
 ## Testbed Wiring
@@ -2032,13 +2032,13 @@ To be completed.
 ```
 - testbed31:
     - ring1 25GE-ports e822cq-2p25GE:
-        - s89-t31t32-tg1-c4/p1 to s32-t31-sut1-c1/p1.
+        - s90-t31t32-tg1-c4/p1 to s32-t31-sut1-c1/p1.
         - s32-t31-sut1-c1/p2 to s33-t31-sut2-c1/p2.
-        - s33-t31-sut2-c1/p1 to s89-t31t32-tg1-c4/p2.
+        - s33-t31-sut2-c1/p1 to s90-t31t32-tg1-c4/p2.
 - testbed32:
     - ring1 25GE-ports e822cq-2p25GE:
-        - s89-t31t32-tg1-c6/p1 to s34-t32-sut1-c1/p1.
+        - s90-t31t32-tg1-c6/p1 to s34-t32-sut1-c1/p1.
         - s34-t32-sut1-c1/p2 to s35-t32-sut2-c1/p2.
-        - s35-t32-sut2-c1/p1 to s89-t31t32-tg1-c6/p2.
+        - s35-t32-sut2-c1/p1 to s90-t31t32-tg1-c6/p2.
 ```
 
diff --git a/docs/content/infrastructure/fdio_dc_vexxhost_inventory.md b/docs/content/infrastructure/fdio_dc_vexxhost_inventory.md
index 0a4e27f..74970e1 100644 (file)
--- a/docs/content/infrastructure/fdio_dc_vexxhost_inventory.md
+++ b/docs/content/infrastructure/fdio_dc_vexxhost_inventory.md
@@ -76,7 +76,7 @@ Captured inventory data:
  s33-t31-sut2    | 3n-icxd       | SYS-110D-20C-FRDN8TP| ???             | 10.30.51.33  | 10.30.50.33  | 3016.10    | u20
  s34-t32-sut1    | 3n-icxd       | SYS-110D-20C-FRDN8TP| ???             | 10.30.51.34  | 10.30.50.34  | 3016.10    | u19
  s35-t32-sut2    | 3n-icxd       | SYS-110D-20C-FRDN8TP| ???             | 10.30.51.35  | 10.30.50.35  | 3016.10    | u18
- s79-t31t32-tg1  | 3n-icxd       | SYS-740GP-TNRT      | ???             | 10.30.51.79  | 10.30.50.79  | 3016.10    | u14-u17
+ s90-t31t32-tg1  | 3n-icxd       | SYS-740GP-TNRT      | C7470KL03P50184 | 10.30.51.90  | 10.30.50.90  | 3016.10    | u14-u17
  s93-t39-sut1    | 3n-snr        | ?                   | ?               | 10.30.51.93  | 10.30.50.93  | 3016.10    | u10-u13
  s94-t39-sut2    | 3n-snr        | ?                   | ?               | 10.30.51.94  | 10.30.50.94  | 3016.10    | u6-u9
  s89-t39t310-tg1 | 3n-snr        | ?                   | ?               | 10.30.51.89  | 10.30.50.89  | 3016.10    | u2-u5
diff --git a/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf b/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf
index eae5a07..d054a6c 100755 (executable)
--- a/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf
+++ b/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf
@@ -82,6 +82,7 @@ dhcp-host=3c:ec:ef:bc:92:e4,10.30.51.86,s86-t214-tg1,infinite # eno1
 dhcp-host=3c:ec:ef:bc:92:e8,10.30.51.87,s87-t215-sut1,infinite # eno1
 dhcp-host=3c:ec:ef:bc:a1:ac,10.30.51.88,s88-t215-tg1,infinite # eno1
 dhcp-host=3c:ec:ef:b9:cc:44,10.30.51.89,s89-t39t310-tg1,infinite # eno1
+dhcp-host=3c:ec:ef:bc:85:8a,10.30.51.90,s90-t31t32-tg1,infinite #eno1
 dhcp-host=d8:5e:d3:02:b1:bb,10.30.51.91,s91-nomad,infinite #eno1
 dhcp-host=d8:5e:d3:02:b1:9f,10.30.51.92,s92-nomad,infinite #eno1
 dhcp-host=a4:bf:01:55:ac:39,10.30.51.93,s93-t39-sut1,infinite # enp4s0
diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:85:8a b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:85:8a
new file mode 100644 (file)
index 0000000..05771bc
--- /dev/null
+++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-3c:ec:ef:bc:85:8a
@@ -0,0 +1,4 @@
+menuentry "Install s90-t31t32-tg1" {
+    linux    /casper/ubuntu-jammy-amd64/vmlinuz ip=:::::eno1:dhcp url=https://old-releases.ubuntu.com/releases/jammy/ubuntu-22.04.1-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_jammy_amd64/3c:ec:ef:bc:85:8a/ ---
+    initrd   /casper/ubuntu-jammy-amd64/initrd
+}
diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_amd64/3c:ec:ef:bc:85:8a/meta-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_amd64/3c:ec:ef:bc:85:8a/meta-data
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_amd64/3c:ec:ef:bc:85:8a/user-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_amd64/3c:ec:ef:bc:85:8a/user-data
new file mode 100644 (file)
index 0000000..de23c5c
--- /dev/null
+++ b/fdio.infra/pxe/docker-nginx/html/ubuntu_jammy_amd64/3c:ec:ef:bc:85:8a/user-data
@@ -0,0 +1,83 @@
+#cloud-config
+autoinstall:
+  version: 1
+  apt:
+    geoip: true
+    preserve_sources_list: false
+    primary:
+    - arches: [amd64, i386]
+      uri: http://ca.archive.ubuntu.com/ubuntu
+    - arches: [default]
+      uri: http://ports.ubuntu.com/ubuntu-ports
+  identity:
+    hostname: s90-t31t32-tg1
+    password: $6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0
+    realname: testuser
+    username: testuser
+  keyboard:
+    layout: us
+    toggle: null
+    variant: ''
+  locale: en_US.UTF-8
+  network:
+    ethernets:
+      eno1:
+        addresses: [ 10.30.51.90/24 ]
+        dhcp4: false
+        gateway4: 10.30.51.1
+        nameservers:
+          addresses: [ 1.1.1.1, 8.8.8.8 ]
+    version: 2
+  packages:
+    - python3
+  refresh-installer:
+    update: no
+  ssh:
+    allow-pw: true
+    authorized-keys: []
+    install-server: true
+  storage:
+    config:
+    - grub_device: false
+      id: disk-sda
+      path: /dev/sda
+      ptable: gpt
+      preserve: false
+      type: disk
+      wipe: superblock-recursive
+    - device: disk-sda
+      grub_device: true
+      id: partition-0
+      flag: boot
+      number: 1
+      preserve: false
+      size: 536870912
+      type: partition
+      wipe: superblock
+    - id: format-0
+      fstype: fat32
+      preserve: false
+      type: format
+      volume: partition-0
+    - device: disk-sda
+      flag: ''
+      grub_device: false
+      id: partition-1
+      number: 2
+      preserve: false
+      size: -1
+      type: partition
+      wipe: superblock
+    - fstype: ext4
+      id: format-1
+      preserve: false
+      type: format
+      volume: partition-1
+    - device: format-1
+      id: mount-1
+      path: /
+      type: mount
+    - device: format-0
+      id: mount-0
+      path: /boot/efi
+      type: mount
Integration tests