From 9c3382a03a0cb15aadce0d185e18a11b6516350b Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 7 Apr 2020 12:22:46 +0200 Subject: [PATCH] ci/labs: Add baremetal1 PDF/IDF config files ubuntu1804-dev-96c-256g-1 is a jumpserver for a ThunderX-based POD, our first baremetal POD to be added to CI/CD. While at it, update jenkins slave names for the other virtual PODs. JIRA: IEC-39 Change-Id: Ibb73baf9dacd7da57d263df035be6fb51f8735a8 Signed-off-by: Ciprian Barbu Signed-off-by: Alexandru Avadanii --- ci/labs/arm/baremetal1.yaml | 205 ++++++++++++++++++++++++++++++++++++++++ ci/labs/arm/idf-baremetal1.yaml | 113 ++++++++++++++++++++++ ci/labs/arm/idf-virtual1.yaml | 2 +- ci/labs/arm/idf-virtual2.yaml | 2 +- ci/labs/arm/virtual1.yaml | 4 +- ci/labs/arm/virtual2.yaml | 4 +- 6 files changed, 324 insertions(+), 6 deletions(-) create mode 100644 ci/labs/arm/baremetal1.yaml create mode 100644 ci/labs/arm/idf-baremetal1.yaml diff --git a/ci/labs/arm/baremetal1.yaml b/ci/labs/arm/baremetal1.yaml new file mode 100644 index 0000000..dec5726 --- /dev/null +++ b/ci/labs/arm/baremetal1.yaml @@ -0,0 +1,205 @@ +############################################################################## +# Copyright (c) 2020 Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +### ubuntu1804-dev-96c-256g-1 pod descriptor file ### + +version: 1.0 +details: + pod_owner: Arm IEC team + contact: blueprints@lists.akraino.org # use hashtag iec + lab: ENEA lab + location: Stockholm, Sweden + type: production + link: https://wiki.akraino.org/display/AK/IEC+Internal+Verification+and+Validation+Lab+Setup +############################################################################## +jumphost: + name: ubuntu1804-dev-96c-256g-1 + node: + type: baremetal + vendor: Cavium + model: ThunderX + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 + cores: 96 + memory: 256G + disks: + ## /dev/sdb + - name: disk1 + disk_capacity: 2T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + ## /dev/sdc + - name: disk2 + disk_capacity: 240G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + os: ubuntu-18.04 + remote_params: &remote_params + type: ipmi + versions: + - 2.0 + user: ADMIN + pass: ADMIN + remote_management: + <<: *remote_params + address: 10.0.23.105 + mac_address: "1C:1B:0D:02:F3:93" + interfaces: + - mac_address: "68:05:CA:46:8C:C2" + speed: 1gb + features: '' + name: 'nic1' + - mac_address: "1C:1B:0D:02:F3:8C" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "1C:1B:0D:02:F3:8D" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "1C:1B:0D:02:F3:8E" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "1C:1B:0D:02:F3:8F" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "1C:1B:0D:02:F3:90" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' + - mac_address: "1C:1B:0D:02:F3:91" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic7' + - mac_address: "1C:1B:0D:02:F3:92" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic8' +############################################################################## +nodes: + - name: cn8890-16 + node: &nodeparams + type: baremetal + vendor: Cavium + model: ThunderX + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 + cores: 48 + memory: 128G + disks: &disks + - name: disk1 + disk_capacity: 240G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + - name: disk2 + disk_capacity: 2T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + remote_management: + <<: *remote_params + address: 10.0.23.101 + mac_address: "40:8D:5C:E5:BF:CA" + interfaces: + - mac_address: "68:05:CA:46:8B:64" + speed: 1gb + features: '' + name: 'nic1' + - mac_address: "40:8D:5C:E5:BF:C5" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "40:8D:5C:E5:BF:C6" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "40:8D:5C:E5:BF:C7" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "40:8D:5C:E5:BF:C8" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "40:8D:5C:E5:BF:C9" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' + ############################################################################ + - name: cn8890-17 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 10.0.23.102 + mac_address: "40:8D:5C:E5:BF:FB" + interfaces: + - mac_address: "68:05:CA:46:8C:45" + speed: 1gb + features: '' + name: 'nic1' + - mac_address: "40:8D:5C:E5:BF:F6" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "40:8D:5C:E5:BF:F7" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "40:8D:5C:E5:BF:F8" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "40:8D:5C:E5:BF:F9" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "40:8D:5C:E5:BF:FA" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' + ############################################################################ + - name: cn8890-18 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 10.0.23.103 + mac_address: "40:8D:5C:E5:BF:DF" + interfaces: + - mac_address: "68:05:CA:46:8C:D4" + speed: 1gb + features: '' + name: 'nic1' + - mac_address: "40:8D:5C:E5:BF:DA" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "40:8D:5C:E5:BF:DB" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "40:8D:5C:E5:BF:DC" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "40:8D:5C:E5:BF:DD" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "40:8D:5C:E5:BF:DE" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' diff --git a/ci/labs/arm/idf-baremetal1.yaml b/ci/labs/arm/idf-baremetal1.yaml new file mode 100644 index 0000000..1895a70 --- /dev/null +++ b/ci/labs/arm/idf-baremetal1.yaml @@ -0,0 +1,113 @@ +############################################################################## +# Copyright (c) 2020 Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +### ubuntu1804-dev-96c-256g-1 installer descriptor file ### + +idf: + version: 0.1 + installer: ['fuel'] + net_config: + oob: + ip-range: 10.0.23.2-10.0.23.7 + vlan: native + mask: 24 + admin: + interface: 0 + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 + vlan: 2503 + network: 172.16.10.0 + ip-range: 172.16.10.10-172.16.10.254 # Some IPs are in use by lab infra + mask: 24 + storage: + interface: 1 + vlan: 2504 + network: 10.2.0.0 + mask: 24 + private: + interface: 2 + vlan: 2505-2520 + network: 10.1.0.0 + mask: 24 + public: + interface: 1 + vlan: native + network: 10.0.23.0 + ip-range: 10.0.23.100-10.0.23.253 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.0.23.254 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: 'admin22_br0' + mgmt: 'mgmt22_br0' + private: ~ + public: 'public22_br0' + maas: + # MaaS timeouts (in minutes) + timeout_comissioning: 15 + timeout_deploying: 25 + network: + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: &interfaces + # Ordered-list, index should be in sync with interface index in PDF + - 'enP5p144s0' + - 'enP2p1s0f1' + - 'enP2p1s0f2' + - 'enP2p1s0f3' + - 'enP2p1s0f4' + - 'enP2p1s0f5' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0005:90:00.0' + - '0002:01:00.1' + - '0002:01:00.2' + - '0002:01:00.3' + - '0002:01:00.4' + - '0002:01:00.5' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + reclass: + node: + - compute_params: &compute_params + common: + nova_cpu_pinning: &nova_cpu_pinning_common "8-47" + compute_hugepages_size: 2M + compute_hugepages_count: 8192 + compute_hugepages_mount: /mnt/hugepages_2M + compute_kernel_isolcpu: *nova_cpu_pinning_common + dpdk: + nova_cpu_pinning: "12-47" + compute_hugepages_size: 1G + compute_hugepages_count: 16 + compute_hugepages_mount: /mnt/hugepages_1G + compute_kernel_isolcpu: *nova_cpu_pinning_common + compute_dpdk_driver: vfio + compute_ovs_pmd_cpu_mask: "0x300" + compute_ovs_dpdk_socket_mem: "2048" + compute_ovs_dpdk_lcore_mask: "0xC00" + compute_ovs_memory_channels: "2" + dpdk0_driver: vfio-pci + dpdk0_n_rxq: 2 + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params diff --git a/ci/labs/arm/idf-virtual1.yaml b/ci/labs/arm/idf-virtual1.yaml index 665018c..087efb9 100644 --- a/ci/labs/arm/idf-virtual1.yaml +++ b/ci/labs/arm/idf-virtual1.yaml @@ -6,7 +6,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- -### ubuntu1604-dev-48c-256g-1 installer descriptor file ### +### ubuntu1804-dev-48c-256g-1 installer descriptor file ### idf: version: 0.1 diff --git a/ci/labs/arm/idf-virtual2.yaml b/ci/labs/arm/idf-virtual2.yaml index ef9590a..a5a93bf 100644 --- a/ci/labs/arm/idf-virtual2.yaml +++ b/ci/labs/arm/idf-virtual2.yaml @@ -6,7 +6,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- -### ubuntu1604-dev-48c-256g-2 installer descriptor file ### +### ubuntu1804-dev-48c-256g-2 installer descriptor file ### idf: version: 0.1 diff --git a/ci/labs/arm/virtual1.yaml b/ci/labs/arm/virtual1.yaml index be600bd..17763fb 100644 --- a/ci/labs/arm/virtual1.yaml +++ b/ci/labs/arm/virtual1.yaml @@ -6,7 +6,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- -### ubuntu1604-dev-48c-256g-1 pod descriptor file ### +### ubuntu1804-dev-48c-256g-1 pod descriptor file ### version: 1.0 details: @@ -18,7 +18,7 @@ details: link: https://wiki.akraino.org/display/AK/IEC+Internal+Verification+and+Validation+Lab+Setup ############################################################################## jumphost: - name: ubuntu1604-dev-48c-256g-1 + name: ubuntu1804-dev-48c-256g-1 node: type: baremetal vendor: Cavium diff --git a/ci/labs/arm/virtual2.yaml b/ci/labs/arm/virtual2.yaml index d1f210d..d2f2530 100644 --- a/ci/labs/arm/virtual2.yaml +++ b/ci/labs/arm/virtual2.yaml @@ -6,7 +6,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- -### ubuntu1604-dev-48c-256g-2 pod descriptor file ### +### ubuntu1804-dev-48c-256g-2 pod descriptor file ### version: 1.0 details: @@ -18,7 +18,7 @@ details: link: https://wiki.akraino.org/display/AK/IEC+Internal+Verification+and+Validation+Lab+Setup ############################################################################## jumphost: - name: ubuntu1604-dev-48c-256g-2 + name: ubuntu1804-dev-48c-256g-2 node: type: baremetal vendor: Cavium -- 2.16.6