From f2a30f5d20e0faa1b7b61e179c196ebcdb08993d Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 25 Mar 2019 15:08:47 +0100 Subject: [PATCH] [ci] Add PDF/IDF config files for 2 virtual PODs Add POD Descriptor File and Installer Descriptor File configuration for the two IEC CI virtual PODs currently available in Jenkins [1, 2]. The configuration adheres to OPNFV standards [3, 4] and should be compatible with all supported OPNFV installers (e.g. Compass4NFV, Fuel). These configuration files will be leveraged by IEC CI jobs for daily deployments / testing. [1] https://jenkins.akraino.org/computer/prd-ubuntu1604-dev-48c-256g-1/ [2] https://jenkins.akraino.org/computer/prd-ubuntu1604-dev-48c-256g-2/ [3] https://opnfv-pharos.rtfd.org/en/latest/release/release-notes/lab-description/pdf.html [4] https://opnfv-fuel.rtfd.io/en/latest/release/installation/\ installation.instruction.html#opnfv-software-configuration-xdf Change-Id: Ie57423cca65bf3f5c66ad9833f02d1a33d159734 Signed-off-by: Alexandru Avadanii --- ci/labs/arm/idf-virtual1.yaml | 80 ++++++++++++++++++++++++++++ ci/labs/arm/idf-virtual2.yaml | 80 ++++++++++++++++++++++++++++ ci/labs/arm/virtual1.yaml | 120 ++++++++++++++++++++++++++++++++++++++++++ ci/labs/arm/virtual2.yaml | 120 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 400 insertions(+) create mode 100644 ci/labs/arm/idf-virtual1.yaml create mode 100644 ci/labs/arm/idf-virtual2.yaml create mode 100644 ci/labs/arm/virtual1.yaml create mode 100644 ci/labs/arm/virtual2.yaml diff --git a/ci/labs/arm/idf-virtual1.yaml b/ci/labs/arm/idf-virtual1.yaml new file mode 100644 index 0000000..665018c --- /dev/null +++ b/ci/labs/arm/idf-virtual1.yaml @@ -0,0 +1,80 @@ +############################################################################## +# Copyright (c) 2019 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 +############################################################################## +--- +### ubuntu1604-dev-48c-256g-1 installer descriptor file ### + +idf: + version: 0.1 + net_config: + oob: + interface: 0 + ip-range: ~ + vlan: native + mask: 24 + # All networks (except OOB) are virtual networks managed by `libvirt` + # Interface indexes are based on Fuel installer defaults + admin: + interface: 0 # when used, should be first vnet interface, untagged + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 # when used, should be second vnet interface, untagged + vlan: native + 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: 4 + vlan: native + network: 192.168.20.0 + mask: 24 + private: + interface: 2 + vlan: native + network: 10.1.0.0 + mask: 24 + public: + interface: 3 + vlan: native + network: 10.0.19.0 + ip-range: 10.0.19.120-10.0.19.129 + mask: 24 + gateway: 10.0.19.254 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: ~ + mgmt: ~ + private: ~ + public: 'public' + network: + interface_mtu: 9000 + ntp_strata_host1: 1.se.pool.ntp.org + ntp_strata_host2: 0.se.pool.ntp.org + 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 + - 'enp1s0' + - 'enp2s0' + - 'enp3s0' + - 'enp4s0' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:01:00.0' + - '0000:02:00.0' + - '0000:03:00.0' + - '0000:04:00.0' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr diff --git a/ci/labs/arm/idf-virtual2.yaml b/ci/labs/arm/idf-virtual2.yaml new file mode 100644 index 0000000..ef9590a --- /dev/null +++ b/ci/labs/arm/idf-virtual2.yaml @@ -0,0 +1,80 @@ +############################################################################## +# Copyright (c) 2019 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 +############################################################################## +--- +### ubuntu1604-dev-48c-256g-2 installer descriptor file ### + +idf: + version: 0.1 + net_config: + oob: + interface: 0 + ip-range: ~ + vlan: native + mask: 24 + # All networks (except OOB) are virtual networks managed by `libvirt` + # Interface indexes are based on Fuel installer defaults + admin: + interface: 0 # when used, should be first vnet interface, untagged + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 # when used, should be second vnet interface, untagged + vlan: native + 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: 4 + vlan: native + network: 192.168.20.0 + mask: 24 + private: + interface: 2 + vlan: native + network: 10.1.0.0 + mask: 24 + public: + interface: 3 + vlan: native + network: 10.0.19.0 + ip-range: 10.0.19.130-10.0.19.139 + mask: 24 + gateway: 10.0.19.254 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: ~ + mgmt: ~ + private: ~ + public: 'public' + network: + interface_mtu: 9000 + ntp_strata_host1: 1.se.pool.ntp.org + ntp_strata_host2: 0.se.pool.ntp.org + 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 + - 'enp1s0' + - 'enp2s0' + - 'enp3s0' + - 'enp4s0' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:01:00.0' + - '0000:02:00.0' + - '0000:03:00.0' + - '0000:04:00.0' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr diff --git a/ci/labs/arm/virtual1.yaml b/ci/labs/arm/virtual1.yaml new file mode 100644 index 0000000..3a4a681 --- /dev/null +++ b/ci/labs/arm/virtual1.yaml @@ -0,0 +1,120 @@ +############################################################################## +# Copyright (c) 2019 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 +############################################################################## +--- +### ubuntu1604-dev-48c-256g-1 pod descriptor file ### + +version: 1.0 +details: + pod_owner: ENEA AB + contact: armband@enea.com + lab: ENEA lab + location: Stockholm, Sweden + type: production + link: https://wiki.akraino.org/display/AK/IEC+Internal+Verification+and+Validation+Lab+Setup +############################################################################## +jumphost: + name: ubuntu1604-dev-48c-256g-1 + node: + 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: + - name: disk1 + disk_capacity: 500G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + - name: disk2 + disk_capacity: 2T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + os: ubuntu-16.04 + remote_params: &remote_params + type: ipmi + versions: + - 2.0 + user: ADMIN + pass: ADMIN + remote_management: + <<: *remote_params + address: 10.0.19.6 + mac_address: "00:00:00:00:00:00" + interfaces: + # Connected, used only for admin/PXE, enP5p144s0 + - mac_address: "00:00:00:00:00:00" + speed: 1gb + features: 'dpdk|sriov' + name: 'nic1' + # Connected, used for public VLAN, enP2p1s0f1 + - mac_address: "00:00:00:00:00:00" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' +############################################################################## +nodes: + - name: node-1 + node: &nodeparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + type: virtual + vendor: libvirt + model: virt + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 cpuid + cores: 8 + memory: 6G + disks: &disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: 7200 + remote_management: &remotemgmt + type: libvirt + user: changeme + pass: changeme + address: 'qemu:///system' + interfaces: &interfaces + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + ############################################################################ + - name: node-2 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-3 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces diff --git a/ci/labs/arm/virtual2.yaml b/ci/labs/arm/virtual2.yaml new file mode 100644 index 0000000..6486af8 --- /dev/null +++ b/ci/labs/arm/virtual2.yaml @@ -0,0 +1,120 @@ +############################################################################## +# Copyright (c) 2019 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 +############################################################################## +--- +### ubuntu1604-dev-48c-256g-2 pod descriptor file ### + +version: 1.0 +details: + pod_owner: ENEA AB + contact: armband@enea.com + lab: ENEA lab + location: Stockholm, Sweden + type: production + link: https://wiki.akraino.org/display/AK/IEC+Internal+Verification+and+Validation+Lab+Setup +############################################################################## +jumphost: + name: ubuntu1604-dev-48c-256g-2 + node: + 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: + - name: disk1 + disk_capacity: 500G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + - name: disk2 + disk_capacity: 2T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + os: ubuntu-16.04 + remote_params: &remote_params + type: ipmi + versions: + - 2.0 + user: ADMIN + pass: ADMIN + remote_management: + <<: *remote_params + address: 10.0.19.6 + mac_address: "00:00:00:00:00:00" + interfaces: + # Connected, used only for admin/PXE, enP5p144s0 + - mac_address: "00:00:00:00:00:00" + speed: 1gb + features: 'dpdk|sriov' + name: 'nic1' + # Connected, used for public VLAN, enP2p1s0f1 + - mac_address: "00:00:00:00:00:00" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' +############################################################################## +nodes: + - name: node-1 + node: &nodeparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + type: virtual + vendor: libvirt + model: virt + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 cpuid + cores: 8 + memory: 6G + disks: &disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: 7200 + remote_management: &remotemgmt + type: libvirt + user: changeme + pass: changeme + address: 'qemu:///system' + interfaces: &interfaces + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + ############################################################################ + - name: node-2 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-3 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces -- 2.16.6