infra(ansible): Jammy placeholder

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I693841cadf33d23e417374b949771ba7c3dbccd2

diff --git a/fdio.infra.ansible/roles/ab/defaults/main.yaml b/fdio.infra.ansible/roles/ab/defaults/main.yaml
index 45b80be..6e9dfbc 100644 (file)
--- a/fdio.infra.ansible/roles/ab/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/ab/defaults/main.yaml
@@ -1,5 +1,5 @@
 ---
 ---

-# file: roles/wrk/defaults/main.yaml
+# file: roles/ab/defaults/main.yaml

 
 packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower][ansible_distribution_release] + packages_by_arch[ansible_machine] }}"
 
 
 packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower][ansible_distribution_release] + packages_by_arch[ansible_machine] }}"
 


@@ -8,10 +8,10 @@ packages_base:
 
 packages_by_distro:
   ubuntu:
 
 packages_by_distro:
   ubuntu:

-    bionic:
-      - "apache2-utils"

     focal:
       - "apache2-utils"
     focal:
       - "apache2-utils"

+    jammy:
+      - "apache2-utils"

 
 packages_by_arch:
   aarch64:
 
 packages_by_arch:
   aarch64:

diff --git a/fdio.infra.ansible/roles/aws/tasks/ubuntu_bionic.yaml b/fdio.infra.ansible/roles/aws/tasks/ubuntu_jammy.yaml
similarity index 55%
rename from fdio.infra.ansible/roles/aws/tasks/ubuntu_bionic.yaml
rename to fdio.infra.ansible/roles/aws/tasks/ubuntu_jammy.yaml
index 4108a98..4ee1545 100644 (file)
--- a/fdio.infra.ansible/roles/aws/tasks/ubuntu_bionic.yaml
+++ b/fdio.infra.ansible/roles/aws/tasks/ubuntu_jammy.yaml
@@ -1,9 +1,9 @@
 ---
 ---

-# file: roles/aws/tasks/ubuntu_bionic.yaml.yaml
+# file: roles/aws/tasks/ubuntu_jammy.yaml.yaml

 
 - name: Enable deb-src APT Repository
   apt_repository:
 
 - name: Enable deb-src APT Repository
   apt_repository:

-    repo: "deb-src http://archive.ubuntu.com/ubuntu bionic main"
+    repo: "deb-src http://archive.ubuntu.com/ubuntu jammy main"

     state: "present"
     update_cache: true
   tags:
     state: "present"
     update_cache: true
   tags:

diff --git a/fdio.infra.ansible/roles/calibration/defaults/main.yaml b/fdio.infra.ansible/roles/calibration/defaults/main.yaml
index 020c011..bb90462 100644 (file)
--- a/fdio.infra.ansible/roles/calibration/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/calibration/defaults/main.yaml
@@ -9,10 +9,10 @@ packages_base:
 
 packages_by_distro:
   ubuntu:
 
 packages_by_distro:
   ubuntu:

-    bionic:
+    focal:

       - "build-essential"
       - "dmidecode"
       - "build-essential"
       - "dmidecode"

-    focal:
+    jammy:

       - "build-essential"
       - "dmidecode"
 
       - "build-essential"
       - "dmidecode"
 


@@ -27,13 +27,6 @@ kernel_version: "{{ kernel_version_by_distro_by_arch[ansible_distribution | lowe
 
 kernel_version_by_distro_by_arch:
   ubuntu:
 
 kernel_version_by_distro_by_arch:
   ubuntu:

-    bionic:
-      x86_64:
-        - "4.15.0-72-generic"
-        - "5.3.0-1020-azure"
-        - "4.15.0-1057-aws"
-      aarch64:
-        - "4.15.0-54-generic"

     focal:
       x86_64:
         - "5.4.0-65-generic"
     focal:
       x86_64:
         - "5.4.0-65-generic"


@@ -41,6 +34,13 @@ kernel_version_by_distro_by_arch:
         - "5.4.0-1035-aws"
       aarch64:
         - "5.4.0-65-generic"
         - "5.4.0-1035-aws"
       aarch64:
         - "5.4.0-65-generic"

+    jammy:
+      x86_64:
+        - "5.15.0-0-generic" # Placeholder
+        - "5.3.0-1020-azure" # Placeholder
+        - "5.15.0-1000-aws" # Placeholder
+      aarch64:
+        - "5.15.0-0-generic" # Placeholder

 
 pma_directory: "/tmp/pma_tools"
 jitter_core: 7
 
 pma_directory: "/tmp/pma_tools"
 jitter_core: 7

diff --git a/fdio.infra.ansible/roles/common/defaults/main.yaml b/fdio.infra.ansible/roles/common/defaults/main.yaml
index ba71297..5c94f58 100644 (file)
--- a/fdio.infra.ansible/roles/common/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/common/defaults/main.yaml
@@ -18,37 +18,37 @@ packages_base:
 
 packages_by_distro:
   ubuntu:
 
 packages_by_distro:
   ubuntu:

-    bionic:
+    focal:
+      - "bpfcc-tools"

       - "build-essential"
       - "build-essential"

+      - "libbpfcc"
+      - "libbpfcc-dev"
+      - "libclang1-9"
+      - "libllvm9"

       - "libpcap-dev"
       - "net-tools"
       - "libpcap-dev"
       - "net-tools"

-      - "python-all"
-      - "python-apt"
-      - "python-cffi"
-      - "python-cffi-backend"
-      - "python-dev"
-      - "python-pip"
-      - "python-setuptools"

       - "python3-all"
       - "python3-apt"
       - "python3-all"
       - "python3-apt"

+      - "python3-bpfcc"

       - "python3-cffi"
       - "python3-cffi-backend"
       - "python3-dev"
       - "python3-pip"
       - "python3-pyelftools"
       - "python3-setuptools"
       - "python3-cffi"
       - "python3-cffi-backend"
       - "python3-dev"
       - "python3-pip"
       - "python3-pyelftools"
       - "python3-setuptools"

-    focal:
-      - "bpfcc-tools"
+    jammy:

       - "build-essential"
       - "build-essential"

-      - "libbpfcc"
-      - "libbpfcc-dev"
-      - "libclang1-9"
-      - "libllvm9"

       - "libpcap-dev"
       - "net-tools"
       - "libpcap-dev"
       - "net-tools"

+      - "python-all"
+      - "python-apt"
+      - "python-cffi"
+      - "python-cffi-backend"
+      - "python-dev"
+      - "python-pip"
+      - "python-setuptools"

       - "python3-all"
       - "python3-apt"
       - "python3-all"
       - "python3-apt"

-      - "python3-bpfcc"

       - "python3-cffi"
       - "python3-cffi-backend"
       - "python3-dev"
       - "python3-cffi"
       - "python3-cffi-backend"
       - "python3-dev"

diff --git a/fdio.infra.ansible/roles/docker/tasks/ubuntu_bionic.yaml b/fdio.infra.ansible/roles/docker/tasks/ubuntu_jammy.yaml
similarity index 93%
rename from fdio.infra.ansible/roles/docker/tasks/ubuntu_bionic.yaml
rename to fdio.infra.ansible/roles/docker/tasks/ubuntu_jammy.yaml
index 21f28e0..51f60ee 100644 (file)
--- a/fdio.infra.ansible/roles/docker/tasks/ubuntu_bionic.yaml
+++ b/fdio.infra.ansible/roles/docker/tasks/ubuntu_jammy.yaml
@@ -1,5 +1,5 @@
 ---
 ---

-# file: roles/docker/tasks/ubuntu_bionic.yaml
+# file: roles/docker/tasks/ubuntu_jammy.yaml

 
 - name: Inst - Dependencies
   apt:
 
 - name: Inst - Dependencies
   apt:

diff --git a/fdio.infra.ansible/roles/dpdk/defaults/main.yaml b/fdio.infra.ansible/roles/dpdk/defaults/main.yaml
index 79580cb..b9602bc 100644 (file)
--- a/fdio.infra.ansible/roles/dpdk/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/dpdk/defaults/main.yaml
@@ -8,10 +8,10 @@ packages_base:
 
 packages_by_distro:
   ubuntu:
 
 packages_by_distro:
   ubuntu:

-    bionic:
+    focal:

       - "build-essential"
       - "libnuma-dev"
       - "build-essential"
       - "libnuma-dev"

-    focal:
+    jammy:

       - "build-essential"
       - "libnuma-dev"
 
       - "build-essential"
       - "libnuma-dev"
 

diff --git a/fdio.infra.ansible/roles/dpdk/meta/main.yaml b/fdio.infra.ansible/roles/dpdk/meta/main.yaml
index cc3bf5f..e52ecb8 100644 (file)
--- a/fdio.infra.ansible/roles/dpdk/meta/main.yaml
+++ b/fdio.infra.ansible/roles/dpdk/meta/main.yaml
@@ -18,7 +18,7 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
   platforms:
     - name: Ubuntu
       versions:

-        - bionic

         - focal
         - focal

+        - jammy

   galaxy_tags:
     - dpdk
   galaxy_tags:
     - dpdk

diff --git a/fdio.infra.ansible/roles/iperf/defaults/main.yaml b/fdio.infra.ansible/roles/iperf/defaults/main.yaml
index 07af60b..f014d83 100644 (file)
--- a/fdio.infra.ansible/roles/iperf/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/iperf/defaults/main.yaml
@@ -8,10 +8,10 @@ packages_base:
 
 packages_by_distro:
   ubuntu:
 
 packages_by_distro:
   ubuntu:

-    bionic:
+    focal:

       - "build-essential"
       - "lib32z1"
       - "build-essential"
       - "lib32z1"

-    focal:
+    jammy:

       - "build-essential"
       - "lib32z1"
 
       - "build-essential"
       - "lib32z1"
 

diff --git a/fdio.infra.ansible/roles/kernel/defaults/main.yaml b/fdio.infra.ansible/roles/kernel/defaults/main.yaml
index 92dc30f..60fa91e 100644 (file)
--- a/fdio.infra.ansible/roles/kernel/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/kernel/defaults/main.yaml
@@ -6,22 +6,22 @@ kernel_version: "{{ kernel_version_by_distro[ansible_distribution|lower][ansible
 
 kernel_version_by_distro:
   ubuntu:
 
 kernel_version_by_distro:
   ubuntu:

-    bionic:
-      - "4.15.0-72"

     focal:
       - "5.4.0-65"
     focal:
       - "5.4.0-65"

+    jammy:
+      - "4.15.0-72"

 
 kernel_packages: "{{ kernel_packages_by_distro[ansible_distribution|lower][ansible_distribution_release] | flatten(levels=1) }}"
 
 kernel_packages_by_distro:
   ubuntu:
 
 kernel_packages: "{{ kernel_packages_by_distro[ansible_distribution|lower][ansible_distribution_release] | flatten(levels=1) }}"
 
 kernel_packages_by_distro:
   ubuntu:

-    bionic:
+    focal:

       - "linux-image"
       - "linux-headers"
       - "linux-modules"
       - "linux-modules-extra"
       - "linux-tools"
       - "linux-image"
       - "linux-headers"
       - "linux-modules"
       - "linux-modules-extra"
       - "linux-tools"

-    focal:
+    jammy:

       - "linux-image"
       - "linux-headers"
       - "linux-modules"
       - "linux-image"
       - "linux-headers"
       - "linux-modules"


@@ -33,11 +33,11 @@ absent_packages: "{{ absent_packages_by_distro[ansible_distribution|lower][ansib
 
 absent_packages_by_distro:
   ubuntu:
 
 absent_packages_by_distro:
   ubuntu:

-    bionic:
+    focal:

       - "amd64-microcode"
       - "intel-microcode"
       - "iucode-tool"
       - "amd64-microcode"
       - "intel-microcode"
       - "iucode-tool"

-    focal:
+    jammy:

       - "amd64-microcode"
       - "intel-microcode"
       - "iucode-tool"
       - "amd64-microcode"
       - "intel-microcode"
       - "iucode-tool"

diff --git a/fdio.infra.ansible/roles/kernel/tasks/ubuntu_bionic.yaml b/fdio.infra.ansible/roles/kernel/tasks/ubuntu_jammy.yaml
similarity index 96%
rename from fdio.infra.ansible/roles/kernel/tasks/ubuntu_bionic.yaml
rename to fdio.infra.ansible/roles/kernel/tasks/ubuntu_jammy.yaml
index 871cc9e..15ce221 100644 (file)
--- a/fdio.infra.ansible/roles/kernel/tasks/ubuntu_bionic.yaml
+++ b/fdio.infra.ansible/roles/kernel/tasks/ubuntu_jammy.yaml
@@ -1,5 +1,5 @@
 ---
 ---

-# file: roles/kernel/tasks/ubuntu_bionic.yaml
+# file: roles/kernel/tasks/ubuntu_jammy.yaml

 
 - name: Get Available Kernel Versions
   command: "apt-cache showpkg linux-headers-*"
 
 - name: Get Available Kernel Versions
   command: "apt-cache showpkg linux-headers-*"

diff --git a/fdio.infra.ansible/roles/kubernetes/tasks/ubuntu_bionic.yaml b/fdio.infra.ansible/roles/kubernetes/tasks/ubuntu_jammy.yaml
similarity index 95%
rename from fdio.infra.ansible/roles/kubernetes/tasks/ubuntu_bionic.yaml
rename to fdio.infra.ansible/roles/kubernetes/tasks/ubuntu_jammy.yaml
index e2f2b86..5e15525 100644 (file)
--- a/fdio.infra.ansible/roles/kubernetes/tasks/ubuntu_bionic.yaml
+++ b/fdio.infra.ansible/roles/kubernetes/tasks/ubuntu_jammy.yaml
@@ -1,5 +1,5 @@
 ---
 ---

-# file: roles/kubernetes/tasks/ubuntu_bionic.yaml
+# file: roles/kubernetes/tasks/ubuntu_jammy.yaml

 
 - name: Kubernetes repository - Dependencies
   apt:
 
 - name: Kubernetes repository - Dependencies
   apt:

diff --git a/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml b/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml
index 128be49..d07a75d 100644 (file)
--- a/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml
@@ -8,10 +8,10 @@ packages_base:
 
 packages_by_distro:
   ubuntu:
 
 packages_by_distro:
   ubuntu:

-    bionic:
-      - []

     focal:
       - []
     focal:
       - []

+    jammy:
+      - []

 
 packages_by_arch:
   aarch64:
 
 packages_by_arch:
   aarch64:

diff --git a/fdio.infra.ansible/roles/python_env/defaults/main.yaml b/fdio.infra.ansible/roles/python_env/defaults/main.yaml
index 36e599a..89e85d6 100644 (file)
--- a/fdio.infra.ansible/roles/python_env/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/python_env/defaults/main.yaml
@@ -8,14 +8,7 @@ packages_base:
 
 packages_by_distro:
   ubuntu:
 
 packages_by_distro:
   ubuntu:

-    bionic:
-      - "python-all"
-      - "python-apt"
-      - "python-cffi"
-      - "python-cffi-backend"
-      - "python-dev"
-      - "python-pip"
-      - "python-setuptools"
+    focal:

       - "python3-all"
       - "python3-apt"
       - "python3-cffi"
       - "python3-all"
       - "python3-apt"
       - "python3-cffi"


@@ -24,7 +17,7 @@ packages_by_distro:
       - "python3-pip"
       - "python3-pyelftools"
       - "python3-setuptools"
       - "python3-pip"
       - "python3-pyelftools"
       - "python3-setuptools"

-    focal:
+    jammy:

       - "python3-all"
       - "python3-apt"
       - "python3-cffi"
       - "python3-all"
       - "python3-apt"
       - "python3-cffi"

diff --git a/fdio.infra.ansible/roles/trex/defaults/main.yaml b/fdio.infra.ansible/roles/trex/defaults/main.yaml
index 181cb9d..180d635 100644 (file)
--- a/fdio.infra.ansible/roles/trex/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/trex/defaults/main.yaml
@@ -8,7 +8,7 @@ packages_base:
 
 packages_by_distro:
   ubuntu:
 
 packages_by_distro:
   ubuntu:

-    bionic:
+    focal:

       - "build-essential"
       - "libmnl-dev"
       - "libnuma-dev"
       - "build-essential"
       - "libmnl-dev"
       - "libnuma-dev"


@@ -19,7 +19,7 @@ packages_by_distro:
       - "pciutils"
       - "python3-pip"
       - "zlib1g-dev"
       - "pciutils"
       - "python3-pip"
       - "zlib1g-dev"

-    focal:
+    jammy:

       - "build-essential"
       - "libmnl-dev"
       - "libnuma-dev"
       - "build-essential"
       - "libmnl-dev"
       - "libnuma-dev"

diff --git a/fdio.infra.ansible/roles/vpp/defaults/main.yaml b/fdio.infra.ansible/roles/vpp/defaults/main.yaml
index 7fac499..55051b8 100644 (file)
--- a/fdio.infra.ansible/roles/vpp/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/vpp/defaults/main.yaml
@@ -12,19 +12,19 @@ packages_base:
 
 packages_by_distro:
   ubuntu:
 
 packages_by_distro:
   ubuntu:

-    bionic:
+    focal:

       - "build-essential"
       - "libglib2.0-dev"
       - "build-essential"
       - "libglib2.0-dev"

-      - "libmbedcrypto1"
-      - "libmbedtls10"
+      - "libmbedcrypto3"
+      - "libmbedtls12"

       - "libmbedx509-0"
       - "libnuma-dev"
       - "libpixman-1-dev"
       - "libmbedx509-0"
       - "libnuma-dev"
       - "libpixman-1-dev"

-    focal:
+    jammy:

       - "build-essential"
       - "libglib2.0-dev"
       - "build-essential"
       - "libglib2.0-dev"

-      - "libmbedcrypto3"
-      - "libmbedtls12"
+      - "libmbedcrypto1"
+      - "libmbedtls10"

       - "libmbedx509-0"
       - "libnuma-dev"
       - "libpixman-1-dev"
       - "libmbedx509-0"
       - "libnuma-dev"
       - "libpixman-1-dev"