diff options
21 files changed, 12 insertions, 420 deletions
diff --git a/VPP_DEVICE_IMAGE_UBUNTU b/VPP_DEVICE_IMAGE_UBUNTU deleted file mode 100644 index e5b17e99b1..0000000000 --- a/VPP_DEVICE_IMAGE_UBUNTU +++ /dev/null @@ -1 +0,0 @@ -csit_sut-ubuntu2004:local
\ No newline at end of file diff --git a/VPP_DEVICE_IMAGE_UBUNTU_ARM b/VPP_DEVICE_IMAGE_UBUNTU_ARM deleted file mode 100644 index 4dabdacb85..0000000000 --- a/VPP_DEVICE_IMAGE_UBUNTU_ARM +++ /dev/null @@ -1 +0,0 @@ -csit_sut-ubuntu2004:local diff --git a/VPP_STABLE_VER_UBUNTU_FOCAL b/VPP_STABLE_VER_UBUNTU_FOCAL deleted file mode 100644 index e5dab2c888..0000000000 --- a/VPP_STABLE_VER_UBUNTU_FOCAL +++ /dev/null @@ -1 +0,0 @@ -23.02-rc0~200-g227660b99
\ No newline at end of file diff --git a/docs/report/introduction/methodology.rst b/docs/report/introduction/methodology.rst index 28187710fe..4491fde781 100644 --- a/docs/report/introduction/methodology.rst +++ b/docs/report/introduction/methodology.rst @@ -29,6 +29,5 @@ Test Methodology methodology_nfv_service_density methodology_vpp_device_functional methodology_autogen - methodology_aws/index methodology_rca/index methodology_trending/index
\ No newline at end of file diff --git a/docs/report/introduction/methodology_aws/aws_ami.rst b/docs/report/introduction/methodology_aws/aws_ami.rst deleted file mode 100644 index ac56bb8bec..0000000000 --- a/docs/report/introduction/methodology_aws/aws_ami.rst +++ /dev/null @@ -1,45 +0,0 @@ -.. _csit_ami: - -CSIT Amazon Machine Images --------------------------- - -An Amazon Machine Image (AMI) provides the information required to -launch an instance. CSIT is using Amazon Elastic Block Store (EBS) where -the root device for an instance launched from the AMI is a volume -created from an Amazon EBS snapshot. - -As the TG and SUT instances have slightly different software -requirements, we are defining two AMIs for TG and SUT separately. AMI -details examples: - -- TG: - - - AMI Name: csit_c5n_ubuntu_focal_tg - - Platform details: Linux/UNIX - - Architecture: x86_64 - - Usage operation: RunInstances - - Image Type: machine - - Virtualization type: hvm - - Description: CSIT TG image based on Ubuntu Focal - - Root Device Name: /dev/sda1 - - Root Device Type: ebs - -- SUT: - - - AMI Name: csit_c5n_ubuntu_focal_sut - - Platform details: Linux/UNIX - - Architecture: x86_64 - - Usage operation: RunInstances - - Image Type: machine - - Virtualization type: hvm - - Description: CSIT SUT image based on Ubuntu Focal - - Root Device Name: /dev/sda1 - - Root Device Type: ebs - -Both TG and SUT AMIs are created manually before launching topology and are not -part of automated scripts. - -Building AMIs requires Hashicorp Packer with Amazon plugin installed. - -For more information, see -`Amazon Machine Images <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AMIs.html>`_. diff --git a/docs/report/introduction/methodology_aws/aws_instances.rst b/docs/report/introduction/methodology_aws/aws_instances.rst deleted file mode 100644 index 18ae659de3..0000000000 --- a/docs/report/introduction/methodology_aws/aws_instances.rst +++ /dev/null @@ -1,77 +0,0 @@ -AWS Performance Testbeds ------------------------- - -CSIT implements two virtual machine topology types running in AWS EC2: - -- **2-Node Topology**: Consists of one EC2 instance as a System Under - Test (SUT) and one EC2 instance acting as a Traffic Generator - (TG), with both instances connected into a ring topology. Used for - executing tests that require frame encapsulations supported by TG. - -- **3-Node Topology**: Consists of two EC2 instances acting as a Systems - Under Test (SUTs) and one EC2 instance acting as a Traffic Generator - (TG), with all instances connected into a ring topology. Used for - executing tests that require frame encapsulations not supported by TG - e.g. certain overlay tunnel encapsulations and IPsec. - -AWS EC2 Instances ------------------ - -CSIT is using AWS EC2 C5n instances as System Under Test and TG virtual -machines. C5n instances got selected to take advantage of high network -throughput and packet rate performance. C5n instances offer up to 100 -Gbps network bandwidth and increased memory over comparable C5 -instances. For more information, see -`Instance types <https://aws.amazon.com/ec2/instance-types/>`_. - -C5n features: - -- 3.0 GHz Intel Xeon Platinum (Skylake) processors with Intel AVX-512 - instructions. -- Sustained all core Turbo frequency of up to 3.4GHz, and single core - turbo frequency of up to 3.5 GHz. -- Requires HVM AMIs (Amazon Machine Images) that include drivers for ENA - and NVMe. See :ref:`csit_ami` for more information. -- Network bandwidth to up to 100 Gbps. -- Powered by the AWS Nitro System, a combination of dedicated hardware - and lightweight hypervisor. - -+-------------+------+--------------+------------------------+-----------------------------+----------------------+ -| Model | vCPU | Memory (GiB) | Instance Storage (GiB) | Network Bandwidth (Gbps)*** | EBS Bandwidth (Mbps) | -+=============+======+==============+========================+=============================+======================+ -|c5n.large | 2 | 5.25 | EBS-Only | Up to 25 | Up to 4,750 | -+-------------+------+--------------+------------------------+-----------------------------+----------------------+ -|c5n.xlarge | 4 | 10.5 | EBS-Only | Up to 25 | Up to 4,750 | -+-------------+------+--------------+------------------------+-----------------------------+----------------------+ -|c5n.2xlarge | 8 | 21 | EBS-Only | Up to 25 | Up to 4,750 | -+-------------+------+--------------+------------------------+-----------------------------+----------------------+ -|c5n.4xlarge | 16 | 42 | EBS-Only | Up to 25 | 4,750 | -+-------------+------+--------------+------------------------+-----------------------------+----------------------+ -|c5n.9xlarge | 36 | 96 | EBS-Only | 50 | 9,500 | -+-------------+------+--------------+------------------------+-----------------------------+----------------------+ -|c5n.18xlarge | 72 | 192 | EBS-Only | 100 | 19,000 | -+-------------+------+--------------+------------------------+-----------------------------+----------------------+ -|c5n.metal | 72 | 192 | EBS-Only | 100 | 19,000 | -+-------------+------+--------------+------------------------+-----------------------------+----------------------+ - -CSIT is configured by default to use `c5n.4xlarge` in `eu-central-1` AWS -region due to allocation stability issues with `c5n.9xlarge` in -`eu-central-1` region. - - -AWS EC2 Networking ------------------- - -CSIT EC2 instances are equipped with AWS Elastic Network Adapter -(ENA) supporting AWS enhanced networking. Enhanced networking uses -single root I/O virtualization (SR-IOV) to provide high-performance -networking capabilities. For more information, see -`Elastic Network Adapter <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html>`_. - -For more information about the current advertised AWS ENA performance -limits, see -`Computed optimized instances <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/compute-optimized-instances.html>`_. - -CSIT DUTs make use of AWS ENA DPDK driver supplied by AWS and specified -in -`amzn drivers dpdk <https://github.com/amzn/amzn-drivers/tree/master/userspace/dpdk>`_. diff --git a/docs/report/introduction/methodology_aws/aws_terraform.rst b/docs/report/introduction/methodology_aws/aws_terraform.rst deleted file mode 100644 index 4d47b1e6d8..0000000000 --- a/docs/report/introduction/methodology_aws/aws_terraform.rst +++ /dev/null @@ -1,117 +0,0 @@ -AWS Deployments ---------------- - -CSIT performance testbed deployments in AWS rely on -Infrastructure-as-a-C (IaaC) Terraform AWS providers. Terraform -providers specified in CSIT interact with resources provided by AWS to -orchestrate virtual environment for running CSIT performance tests. - -Compatibility -~~~~~~~~~~~~~ - -+-----------+----------------+ -| Software | OSS Version | -+===========+================+ -| Terraform | 1.0.3 or newer | -+-----------+----------------+ -| Vault | 1.8.4 or newer | -+-----------+----------------+ - -Requirements -~~~~~~~~~~~~ - -- Required Modules and Providers - - - `Terraform Registry aws <https://registry.terraform.io/providers/hashicorp/aws/latest>`_. - - `Terraform Registry null <https://registry.terraform.io/providers/hashicorp/null/latest>`_. - - `Terraform Registry tls <https://registry.terraform.io/providers/hashicorp/tls>`_. - - `Terraform Registry vault <https://registry.terraform.io/providers/hashicorp/vault>`_. - -- Required software - - - `Vault <https://releases.hashicorp.com/vault/>`_ service available - on specified ip/port. - -Deployment Example -~~~~~~~~~~~~~~~~~~ - -Following is an example of a -`Terraform deploy module <https://git.fd.io/csit/tree/fdio.infra.terraform/2n_aws_c5n/main.tf>`_ -for a CSIT 2-Node testbed topology with AWS variables set to default -values. A number of variables is also defined in a -`separate Terraform variable file <https://git.fd.io/csit/tree/fdio.infra.terraform/2n_aws_c5n/variables.tf>`_. - -:: - - module "deploy" { - source = "./deploy" - - # Parameters starting with var. can be set using "TF_VAR_*" environment - # variables or -var parameter when running "terraform apply", for default - # values see ./variables.tf - testbed_name = var.testbed_name - topology_name = var.topology_name - environment_name = var.environment_name - resources_name_prefix = var.resources_name_prefix - - # AWS general - region = var.region - avail_zone = var.avail_zone - instance_type = var.instance_type - ami_image_tg = var.ami_image_tg - ami_image_sut = var.ami_image_sut - - # AWS Network - vpc_cidr_mgmt = "192.168.0.0/24" - vpc_cidr_b = "192.168.10.0/24" - vpc_cidr_c = "200.0.0.0/24" - vpc_cidr_d = "192.168.20.0/24" - - tg_mgmt_ip = "192.168.0.10" - dut1_mgmt_ip = "192.168.0.11" - - tg_if1_ip = "192.168.10.254" - tg_if2_ip = "192.168.20.254" - dut1_if1_ip = "192.168.10.11" - dut1_if2_ip = "192.168.20.11" - - trex_dummy_cidr_port_0 = "10.0.0.0/24" - trex_dummy_cidr_port_1 = "20.0.0.0/24" - - # Ansible - ansible_python_executable = "/usr/bin/python3" - ansible_file_path = "../../fdio.infra.ansible/site.yaml" - ansible_topology_path = "../../fdio.infra.ansible/cloud_topology.yaml" - ansible_provision_pwd = "Csit1234" - - # First run - first_run_commands = [ - "sudo sed -i 's/^PasswordAuthentication/#PasswordAuthentication/' /etc/ssh/sshd_config", - "sudo systemctl restart sshd", - "sudo useradd --create-home -s /bin/bash provisionuser", - "echo 'provisionuser:Csit1234' | sudo chpasswd", - "echo 'provisionuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers", - "sudo useradd --create-home -s /bin/bash testuser", - "echo 'testuser:Csit1234' | sudo chpasswd", - "echo 'testuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers" - ] - } - -Secrets & Credentials -~~~~~~~~~~~~~~~~~~~~~ - -Set credentials manually -^^^^^^^^^^^^^^^^^^^^^^^^ - -To set the credentials manually you first need to tell the module to not -fetch credentials from Vault. To do that, set `provider "aws"` -`access_key` and `secret_key` to custom value or use credentials file -as a source. - -:: - - provider "aws" { - region = var.region - access_key = data.vault_aws_access_credentials.creds.access_key - secret_key = data.vault_aws_access_credentials.creds.secret_key - } diff --git a/docs/report/introduction/methodology_aws/index.rst b/docs/report/introduction/methodology_aws/index.rst deleted file mode 100644 index 3e247dc6ce..0000000000 --- a/docs/report/introduction/methodology_aws/index.rst +++ /dev/null @@ -1,8 +0,0 @@ -Testing in AWS EC2 -================== - -.. toctree:: - - aws_instances - aws_ami - aws_terraform diff --git a/fdio.infra.ansible/roles/ab/defaults/main.yaml b/fdio.infra.ansible/roles/ab/defaults/main.yaml index 6e9dfbcfce..adabf1464c 100644 --- a/fdio.infra.ansible/roles/ab/defaults/main.yaml +++ b/fdio.infra.ansible/roles/ab/defaults/main.yaml @@ -8,8 +8,6 @@ packages_base: packages_by_distro: ubuntu: - focal: - - "apache2-utils" jammy: - "apache2-utils" diff --git a/fdio.infra.ansible/roles/calibration/defaults/main.yaml b/fdio.infra.ansible/roles/calibration/defaults/main.yaml index da34e97b9d..5dc3330e08 100644 --- a/fdio.infra.ansible/roles/calibration/defaults/main.yaml +++ b/fdio.infra.ansible/roles/calibration/defaults/main.yaml @@ -9,9 +9,6 @@ packages_base: packages_by_distro: ubuntu: - focal: - - "build-essential" - - "dmidecode" jammy: - "build-essential" - "dmidecode" @@ -27,12 +24,6 @@ kernel_version: "{{ kernel_version_by_distro_by_arch[ansible_distribution | lowe kernel_version_by_distro_by_arch: ubuntu: - focal: - x86_64: - - "5.4.0-65-generic" - - "5.4.0-1035-aws" - aarch64: - - "5.4.0-65-generic" jammy: x86_64: - "5.15.0-46-generic" # Placeholder diff --git a/fdio.infra.ansible/roles/consul/meta/main.yaml b/fdio.infra.ansible/roles/consul/meta/main.yaml index bc6d6a1c57..e41a0258fc 100644 --- a/fdio.infra.ansible/roles/consul/meta/main.yaml +++ b/fdio.infra.ansible/roles/consul/meta/main.yaml @@ -12,7 +12,6 @@ galaxy_info: platforms: - name: Ubuntu versions: - - focal - jammy galaxy_tags: - consul diff --git a/fdio.infra.ansible/roles/docker/meta/main.yaml b/fdio.infra.ansible/roles/docker/meta/main.yaml index ac6c0a9980..7bef656eb5 100644 --- a/fdio.infra.ansible/roles/docker/meta/main.yaml +++ b/fdio.infra.ansible/roles/docker/meta/main.yaml @@ -13,7 +13,6 @@ galaxy_info: platforms: - name: Ubuntu versions: - - focal - jammy galaxy_tags: - docker diff --git a/fdio.infra.ansible/roles/dpdk/defaults/main.yaml b/fdio.infra.ansible/roles/dpdk/defaults/main.yaml index 8f1142dfb1..01a3240a6a 100644 --- a/fdio.infra.ansible/roles/dpdk/defaults/main.yaml +++ b/fdio.infra.ansible/roles/dpdk/defaults/main.yaml @@ -8,9 +8,6 @@ packages_base: packages_by_distro: ubuntu: - focal: - - "build-essential" - - "libnuma-dev" jammy: - "build-essential" - "libnuma-dev" diff --git a/fdio.infra.ansible/roles/iperf/defaults/main.yaml b/fdio.infra.ansible/roles/iperf/defaults/main.yaml index f014d83eed..72a3604d1d 100644 --- a/fdio.infra.ansible/roles/iperf/defaults/main.yaml +++ b/fdio.infra.ansible/roles/iperf/defaults/main.yaml @@ -8,9 +8,6 @@ packages_base: packages_by_distro: ubuntu: - focal: - - "build-essential" - - "lib32z1" jammy: - "build-essential" - "lib32z1" diff --git a/fdio.infra.ansible/roles/nomad/meta/main.yaml b/fdio.infra.ansible/roles/nomad/meta/main.yaml index f7b25fe8eb..03396ae6e6 100644 --- a/fdio.infra.ansible/roles/nomad/meta/main.yaml +++ b/fdio.infra.ansible/roles/nomad/meta/main.yaml @@ -13,7 +13,6 @@ galaxy_info: platforms: - name: Ubuntu versions: - - focal - jammy galaxy_tags: - nomad diff --git a/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml b/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml index d07a75d446..5a732e5539 100644 --- a/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml +++ b/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml @@ -8,8 +8,6 @@ packages_base: packages_by_distro: ubuntu: - focal: - - [] jammy: - [] diff --git a/fdio.infra.ansible/roles/prometheus_exporter/meta/main.yaml b/fdio.infra.ansible/roles/prometheus_exporter/meta/main.yaml index 0ee6c2c224..7d8b861882 100644 --- a/fdio.infra.ansible/roles/prometheus_exporter/meta/main.yaml +++ b/fdio.infra.ansible/roles/prometheus_exporter/meta/main.yaml @@ -13,7 +13,6 @@ galaxy_info: platforms: - name: Ubuntu versions: - - focal - jammy galaxy_tags: - prometheus diff --git a/fdio.infra.ansible/roles/vault/meta/main.yaml b/fdio.infra.ansible/roles/vault/meta/main.yaml index 882dcc3a7b..22a62dd438 100644 --- a/fdio.infra.ansible/roles/vault/meta/main.yaml +++ b/fdio.infra.ansible/roles/vault/meta/main.yaml @@ -13,7 +13,6 @@ galaxy_info: platforms: - name: Ubuntu versions: - - focal - jammy galaxy_tags: - vault diff --git a/fdio.infra.packer/aws_c5n/ubuntu_focal.pkr.hcl b/fdio.infra.packer/aws_c5n/ubuntu_focal.pkr.hcl deleted file mode 100644 index 06d849abb3..0000000000 --- a/fdio.infra.packer/aws_c5n/ubuntu_focal.pkr.hcl +++ /dev/null @@ -1,128 +0,0 @@ -packer { - required_plugins { - amazon = { - version = ">= 1.0.1" - source = "github.com/hashicorp/amazon" - } - } -} - -variable "first_run_commands" { - description = "Commands to run before deployment via remote-exec" - type = list(string) - default = [ - "" - ] -} - -variable "last_run_commands" { - description = "Commands to run after deployment via remote-exec" - type = list(string) - default = [ - "sudo sed -i 's/Unattended-Upgrade \"1\"/Unattended-Upgrade \"0\"/g' /etc/apt/apt.conf.d/20auto-upgrades" - ] -} - -variable "ansible_file_path" { - description = "Path to Ansible playbook" - type = string - default = "../../fdio.infra.ansible/site.yaml" -} - -variable "ansible_python_executable" { - description = "Path to Python interpreter" - type = string - default = "/usr/bin/python3" -} - -variable "ansible_topology_path" { - description = "Path to Ansible playbook which creates a topology file" - type = string - default = "../../fdio.infra.ansible/cloud_topology.yaml" -} - -variable "ansible_provision_pwd" { - description = "Password used for ansible provisioning (ansible_ssh_pass)" - type = string - default = "Csit1234" -} - -source "amazon-ebs" "csit_c5n_ubuntu_focal_sut" { - ami_name = "csit_c5n_ubuntu_focal_sut" - ami_description = "CSIT SUT image based on Ubuntu Focal" - ena_support = true - instance_type = "c5n.4xlarge" - launch_block_device_mappings { - device_name = "/dev/sda1" - volume_size = 40 - volume_type = "gp2" - } - force_deregister = true - region = "eu-central-1" - skip_create_ami = false - source_ami = "ami-0a875db8a031a9efb" - ssh_username = "ubuntu" -} - -source "amazon-ebs" "csit_c5n_ubuntu_focal_tg" { - ami_name = "csit_c5n_ubuntu_focal_tg" - ami_description = "CSIT TG image based on Ubuntu Focal" - ena_support = true - instance_type = "c5n.4xlarge" - launch_block_device_mappings { - device_name = "/dev/sda1" - volume_size = 40 - volume_type = "gp2" - } - force_deregister = true - region = "eu-central-1" - skip_create_ami = false - source_ami = "ami-0a875db8a031a9efb" - ssh_username = "ubuntu" -} - -build { - name = "csit_c5n_ubuntu_focal_sut-packer" - sources = [ - "source.amazon-ebs.csit_c5n_ubuntu_focal_sut" - ] - provisioner "shell" { - inline = var.first_run_commands - } - provisioner "ansible" { - playbook_file = var.ansible_file_path - user = "ubuntu" - groups = ["sut_aws"] - extra_arguments = [ - "--extra-vars", "ansible_ssh_pass=${var.ansible_provision_pwd}", - "--extra-vars", "ansible_python_interpreter=${var.ansible_python_executable}", - "--extra-vars", "aws=true" - ] - } - provisioner "shell" { - inline = var.last_run_commands - } -} - -build { - name = "csit_c5n_ubuntu_focal_tg-packer" - sources = [ - "source.amazon-ebs.csit_c5n_ubuntu_focal_tg" - ] - provisioner "shell" { - inline = var.first_run_commands - } - provisioner "ansible" { - playbook_file = var.ansible_file_path - user = "ubuntu" - groups = ["tg_aws"] - extra_arguments = [ - "--extra-vars", "ansible_ssh_pass=${var.ansible_provision_pwd}", - "--extra-vars", "ansible_python_interpreter=${var.ansible_python_executable}", - "--extra-vars", "aws=true" - ] - } - provisioner "shell" { - inline = var.last_run_commands - } -} diff --git a/fdio.infra.packer/aws_c6gn/ubuntu_focal.pkr.hcl b/fdio.infra.packer/aws_c6gn/ubuntu_jammy.pkr.hcl index 42cbb39443..db2ce0c6e6 100644 --- a/fdio.infra.packer/aws_c6gn/ubuntu_focal.pkr.hcl +++ b/fdio.infra.packer/aws_c6gn/ubuntu_jammy.pkr.hcl @@ -41,9 +41,9 @@ variable "ansible_provision_pwd" { type = string default = "Csit1234" } -source "amazon-ebs" "csit_c6gn_ubuntu_focal_sut" { - ami_name = "csit_c6gn_ubuntu_focal_sut" - ami_description = "CSIT SUT image based on Ubuntu Focal" +source "amazon-ebs" "csit_c6gn_ubuntu_jammy_sut" { + ami_name = "csit_c6gn_ubuntu_jammy_sut" + ami_description = "CSIT SUT image based on Ubuntu jammy" ena_support = true instance_type = "c6gn.4xlarge" launch_block_device_mappings { @@ -57,9 +57,9 @@ source "amazon-ebs" "csit_c6gn_ubuntu_focal_sut" { source_ami = "ami-0a875db8a031a9efb" ssh_username = "ubuntu" } -source "amazon-ebs" "csit_c6gn_ubuntu_focal_tg" { - ami_name = "csit_c6gn_ubuntu_focal_tg" - ami_description = "CSIT TG image based on Ubuntu Focal" +source "amazon-ebs" "csit_c6gn_ubuntu_jammy_tg" { + ami_name = "csit_c6gn_ubuntu_jammy_tg" + ami_description = "CSIT TG image based on Ubuntu jammy" ena_support = true instance_type = "c6gn.4xlarge" launch_block_device_mappings { @@ -74,9 +74,9 @@ source "amazon-ebs" "csit_c6gn_ubuntu_focal_tg" { ssh_username = "ubuntu" } build { - name = "csit_c6gn_ubuntu_focal_sut-packer" + name = "csit_c6gn_ubuntu_jammy_sut-packer" sources = [ - "source.amazon-ebs.csit_c6gn_ubuntu_focal_sut" + "source.amazon-ebs.csit_c6gn_ubuntu_jammy_sut" ] provisioner "shell" { inline = var.first_run_commands @@ -96,9 +96,9 @@ build { } } build { - name = "csit_c6gn_ubuntu_focal_tg-packer" + name = "csit_c6gn_ubuntu_jammy_tg-packer" sources = [ - "source.amazon-ebs.csit_c6gn_ubuntu_focal_tg" + "source.amazon-ebs.csit_c6gn_ubuntu_jammy_tg" ] provisioner "shell" { inline = var.first_run_commands diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index a383063c82..65f5be0388 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -1,5 +1,5 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. -# Copyright (c) 2022 PANTHEON.tech and/or its affiliates. +# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2023 PANTHEON.tech and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -775,11 +775,6 @@ function select_arch_os () { case "${ID}" in "ubuntu"*) case "${VERSION}" in - *"LTS (Focal Fossa)"*) - IMAGE_VER_FILE="VPP_DEVICE_IMAGE_UBUNTU" - VPP_VER_FILE="VPP_STABLE_VER_UBUNTU_FOCAL" - PKG_SUFFIX="deb" - ;; *"LTS (Jammy Jellyfish)"*) IMAGE_VER_FILE="VPP_DEVICE_IMAGE_UBUNTU_JAMMY" VPP_VER_FILE="VPP_STABLE_VER_UBUNTU_JAMMY" |