fix(infra): Few fixes

Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>
Change-Id: If7b85d7cf08b036f9d3676902db583c1aee7ce1c

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml
index 3993a08..382f113 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml
@@ -28,7 +28,6 @@ sysctl:
 
 inventory_ipmi_hostname: "10.30.50.56"
 cpu_microarchitecture: "sapphirerapids"
-docker_sut: true
 
 intel_800_matrix: "dpdk24.07"
 mellanox_matrix: "dpdk24.07"

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
index 072c7f5..0f8cd7a 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
@@ -28,7 +28,6 @@ sysctl:
 
 inventory_ipmi_hostname: "10.30.50.58"
 cpu_microarchitecture: "sapphirerapids"
-docker_sut: true
 
 intel_800_matrix: "dpdk24.07"
 mellanox_matrix: "dpdk24.07"

diff --git a/fdio.infra.ansible/nomad.yaml b/fdio.infra.ansible/nomad.yaml
index 57b111c..842e9e4 100644 (file)
--- a/fdio.infra.ansible/nomad.yaml
+++ b/fdio.infra.ansible/nomad.yaml
@@ -24,7 +24,5 @@
       tags: vault
     - role: prometheus_exporter
       tags: prometheus_exporter
-    - role: jenkins_job_health_exporter
-      tags: jenkins_job_health_exporter
     - role: cleanup
       tags: cleanup

diff --git a/fdio.infra.ansible/roles/common/tasks/main.yaml b/fdio.infra.ansible/roles/common/tasks/main.yaml
index 7f03f2c..ec27dfe 100644 (file)
--- a/fdio.infra.ansible/roles/common/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/common/tasks/main.yaml
@@ -1,16 +1,6 @@
 ---
 # file: tasks/main.yaml
 
-- name: Add permanent proxy settings
-  ansible.builtin.lineinfile:
-    path: "/etc/environment"
-    state: "present"
-    line: "{{ item.key }}={{ item.value }}"
-  with_dict: "{{ proxy_env }}"
-  when: proxy_env is defined
-  tags:
-    - common-conf-proxy
-
 - name: Update Repositories Cache
   ansible.builtin.apt:
     update_cache: true

diff --git a/fdio.infra.ansible/roles/intel/defaults/main.yaml b/fdio.infra.ansible/roles/intel/defaults/main.yaml
index 87cac1a..1bfc0b6 100644 (file)
--- a/fdio.infra.ansible/roles/intel/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/intel/defaults/main.yaml
@@ -34,7 +34,6 @@ packages_by_distro:
     - "patchutils"
     - "libboost-dev"
     - "libboost-regex-dev"
-    #- "libudev-dev" #http://security.ubuntu.com/ubuntu/pool/main/s/systemd/
     - "yasm"
 
 packages_by_arch:
@@ -66,7 +65,7 @@ intel_dsa_compatibility_matrix:
   dsa: "4.0"
 
 intel_qat_compatibility_matrix:
-  qat2: "1.0.20-00008"
+  qat2: "1.1.50-00003"
   qat1: "4.27.0-00006"
 
 intel_i40e_url:
@@ -85,6 +84,5 @@ intel_dsa_url:
   "4.0": "https://github.com/intel/idxd-config/archive/refs/tags/accel-config-v4.0.tar.gz"
 
 intel_qat_url:
-  "1.0.20-00008": "777529/QAT20.L.1.0.20-00008.tar.gz"
-  "4.22.0-00001": "780675/QAT.L.4.22.0-00001.tar.gz"
+  "1.1.50-00003": "822703/QAT20.L.1.1.50-00003.tar.gz"
   "4.27.0-00006": "838409/QAT.L.4.27.0-00006.tar.gz"
\ No newline at end of file

diff --git a/fdio.infra.ansible/roles/intel/tasks/qat2.yaml b/fdio.infra.ansible/roles/intel/tasks/qat2.yaml
index 51c19c3..20478c4 100644 (file)
--- a/fdio.infra.ansible/roles/intel/tasks/qat2.yaml
+++ b/fdio.infra.ansible/roles/intel/tasks/qat2.yaml
@@ -37,7 +37,7 @@
   with_items:
     - "wget http://security.ubuntu.com/ubuntu/pool/main/s/systemd/libudev-dev_255.4-1ubuntu8.4_amd64.deb"
     - "dpkg -i ./libudev-dev_255.4-1ubuntu8.4_amd64.deb"
-    - "apt install libudev-dev nasm libnl-genl-3-dev"
+    - "apt install -y libudev-dev nasm libnl-genl-3-dev"
     - "./configure --enable-icp-sriov=host"
     - "make"
     - "make install"

diff --git a/fdio.infra.ansible/roles/jenkins_job_health_exporter/defaults/main.yaml b/fdio.infra.ansible/roles/jenkins_job_health_exporter/defaults/main.yaml
deleted file mode 100644 (file)
index ab54aac..0000000
--- a/fdio.infra.ansible/roles/jenkins_job_health_exporter/defaults/main.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-# file: roles/jenkins_job_health_exporter/defaults/main.yaml
-
-# Conf - Jenkins Job Health Exporter.
-jenkins_host: "jenkins.fd.io"
-poll_interval_sec: 1800
-req_timeout_sec: 30
-bind_to: "0.0.0.0:9186"
-last_builds: 10
-jobs:
-  - "vpp-csit-verify-api-crc-master-ubuntu2204-x86_64"
-  - "vpp-gcc-verify-master-ubuntu2204-x86_64"
-  - "vpp-verify-master-ubuntu2204-aarch64"
-  - "vpp-verify-master-ubuntu2204-x86_64"
-  - "vpp-debug-verify-master-ubuntu2204-x86_64"
-  - "vpp-checkstyle-verify-master-ubuntu2204-x86_64"
-  - "vpp-docs-verify-master-ubuntu2204-x86_64"
-  - "vpp-csit-verify-device-master-ubuntu2204-x86_64-1n-skx"
-  - "vpp-csit-verify-device-master-ubuntu2204-aarch64-1n-tx2"
-
-# Conf - Service.
-jenkins_job_health_exporter_restart_handler_state: "restarted"
-
-# Inst - System paths.
-jenkins_job_health_exporter_target_dir: "/usr/bin"
-jenkins_job_health_exporter_conf_dir: "/etc"
-jenkins_job_health_exporter_url: "https://github.com/ayourtch/jenkins-job-health-exporter/releases/download"
-jenkins_job_health_exporter_version: "v0.0.3"

diff --git a/fdio.infra.ansible/roles/jenkins_job_health_exporter/handlers/main.yaml b/fdio.infra.ansible/roles/jenkins_job_health_exporter/handlers/main.yaml
deleted file mode 100644 (file)
index 01849fd..0000000
--- a/fdio.infra.ansible/roles/jenkins_job_health_exporter/handlers/main.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-# file roles/jenkins_job_health_exporter/handlers/main.yaml
-
-- name: Restart Jenkins Job Health Exporter
-  ansible.builtin.systemd:
-    daemon_reload: true
-    enabled: true
-    name: "jenkins-job-health-exporter"
-    state: "{{ jenkins_job_health_exporter_restart_handler_state }}"

diff --git a/fdio.infra.ansible/roles/jenkins_job_health_exporter/tasks/main.yaml b/fdio.infra.ansible/roles/jenkins_job_health_exporter/tasks/main.yaml
deleted file mode 100644 (file)
index efdc26a..0000000
--- a/fdio.infra.ansible/roles/jenkins_job_health_exporter/tasks/main.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-# file: roles/jenkins_job_health_exporter/tasks/main.yaml
-
-- name: Conf - Jenkins Job Health Exporter Config
-  ansible.builtin.template:
-    src: "templates/jenkins-job-health-exporter.j2"
-    dest: "/etc/jenkins-job-health-exporter.json"
-    owner: "root"
-    group: "root"
-    mode: "0644"
-  when:
-    - ansible_hostname == "s22-nomad"
-  tags:
-    - conf-jenkins-job-json
-
-- name: Inst - Jenkins Job Health Exporter Binary
-  ansible.builtin.get_url:
-    url: "{{ jenkins_job_health_exporter_url }}/{{ jenkins_job_health_exporter_version }}/jenkins-job-health-exporter"
-    dest: "{{ jenkins_job_health_exporter_target_dir }}/jenkins-job-health-exporter"
-    mode: "0755"
-  when:
-    - ansible_hostname == "s22-nomad"
-  tags:
-    - inst-jenkins-job-binary
-
-- name: Inst - Jenkins Job Health Exporter Service
-  ansible.builtin.template:
-    src: "templates/jenkins-job-health-exporter.service.j2"
-    dest: "/lib/systemd/system/jenkins-job-health-exporter.service"
-    owner: "root"
-    group: "root"
-    mode: "0644"
-  when:
-    - ansible_hostname == "s22-nomad"
-  notify:
-    - "Restart Jenkins Job Health Exporter"
-  tags:
-    - inst-jenkins-job-service

diff --git a/fdio.infra.ansible/roles/jenkins_job_health_exporter/templates/jenkins-job-health-exporter.j2 b/fdio.infra.ansible/roles/jenkins_job_health_exporter/templates/jenkins-job-health-exporter.j2
deleted file mode 100644 (file)
index 5942b78..0000000
--- a/fdio.infra.ansible/roles/jenkins_job_health_exporter/templates/jenkins-job-health-exporter.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "jenkins_host": "{{ jenkins_host }}",
-  "poll_interval_sec": {{ poll_interval_sec }},
-  "req_timeout_sec": {{ req_timeout_sec }},
-  "bind_to": "{{ bind_to }}",
-  "last_builds": {{ last_builds }},
-  "jobs": [
-{% for item in jobs %}
-    "{{ item }}"
-{%- if not loop.last %},
-{% endif %}
-{% endfor %}
-
-  ],
-  "verbose": 3
-}
\ No newline at end of file

diff --git a/fdio.infra.ansible/roles/jenkins_job_health_exporter/templates/jenkins-job-health-exporter.service.j2 b/fdio.infra.ansible/roles/jenkins_job_health_exporter/templates/jenkins-job-health-exporter.service.j2
deleted file mode 100644 (file)
index 38073d0..0000000
--- a/fdio.infra.ansible/roles/jenkins_job_health_exporter/templates/jenkins-job-health-exporter.service.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Jenkins Job Health Exporter
-Documentation=https://github.com/ayourtch/jenkins-job-health-exporter
-
-[Service]
-Restart=always
-ExecStart={{ jenkins_job_health_exporter_target_dir }}/jenkins-job-health-exporter {{ jenkins_job_health_exporter_conf_dir }}/jenkins-job-health-exporter.json
-ExecReload=/bin/kill -HUP $MAINPID
-TimeoutStopSec=20s
-SendSIGKILL=no
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file

diff --git a/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl b/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl
index 625a3a1..3a2c1ff 100644 (file)
--- a/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl
+++ b/fdio.infra/packer-aws-sut/ubuntu_jammy_x86.pkr.hcl
@@ -47,9 +47,9 @@ variable "ansible_provision_pwd" {
   default     = "Csit1234"
 }
 
-source "amazon-ebs" "csit_ubuntu_jammy_x86_sut" {
-  ami_name        = "csit_ubuntu_jammy_x86_sut"
-  ami_description = "CSIT SUT image based on Ubuntu Jammy"
+source "amazon-ebs" "csit_ubuntu_noble_x86_sut" {
+  ami_name        = "csit_ubuntu_noble_x86_sut"
+  ami_description = "CSIT SUT image based on Ubuntu noble"
   ena_support     = true
   instance_type   = "c6in.4xlarge"
   launch_block_device_mappings {
@@ -64,9 +64,9 @@ source "amazon-ebs" "csit_ubuntu_jammy_x86_sut" {
   ssh_username     = "ubuntu"
 }
 
-source "amazon-ebs" "csit_ubuntu_jammy_x86_tg" {
-  ami_name        = "csit_ubuntu_jammy_x86_tg"
-  ami_description = "CSIT TG image based on Ubuntu Jammy"
+source "amazon-ebs" "csit_ubuntu_noble_x86_tg" {
+  ami_name        = "csit_ubuntu_noble_x86_tg"
+  ami_description = "CSIT TG image based on Ubuntu noble"
   ena_support     = true
   instance_type   = "c6in.4xlarge"
   launch_block_device_mappings {
@@ -82,9 +82,9 @@ source "amazon-ebs" "csit_ubuntu_jammy_x86_tg" {
 }
 
 build {
-  name = "csit_ubuntu_jammy_x86_sut-packer"
+  name = "csit_ubuntu_noble_x86_sut-packer"
   sources = [
-    "source.amazon-ebs.csit_ubuntu_jammy_x86_sut"
+    "source.amazon-ebs.csit_ubuntu_noble_x86_sut"
   ]
   provisioner "shell" {
     inline = var.first_run_commands
@@ -105,9 +105,9 @@ build {
 }
 
 build {
-  name = "csit_ubuntu_jammy_x86_tg-packer"
+  name = "csit_ubuntu_noble_x86_tg-packer"
   sources = [
-    "source.amazon-ebs.csit_ubuntu_jammy_x86_tg"
+    "source.amazon-ebs.csit_ubuntu_noble_x86_tg"
   ]
   provisioner "shell" {
     inline = var.first_run_commands

diff --git a/fdio.infra/packer-aws-sut/ubuntu_jammy_arm.pkr.hcl b/fdio.infra/packer-aws-sut/ubuntu_noble_arm.pkr.hcl
similarity index 89%
rename from fdio.infra/packer-aws-sut/ubuntu_jammy_arm.pkr.hcl
rename to fdio.infra/packer-aws-sut/ubuntu_noble_arm.pkr.hcl
index f97bd5d..58507ff 100644 (file)
--- a/fdio.infra/packer-aws-sut/ubuntu_jammy_arm.pkr.hcl
+++ b/fdio.infra/packer-aws-sut/ubuntu_noble_arm.pkr.hcl
@@ -47,9 +47,9 @@ variable "ansible_provision_pwd" {
   default     = "Csit1234"
 }
 
-source "amazon-ebs" "csit_ubuntu_jammy_arm_sut" {
-  ami_name        = "csit_ubuntu_jammy_arm_sut"
-  ami_description = "CSIT SUT image based on Ubuntu jammy"
+source "amazon-ebs" "csit_ubuntu_noble_arm_sut" {
+  ami_name        = "csit_ubuntu_noble_arm_sut"
+  ami_description = "CSIT SUT image based on Ubuntu noble"
   ena_support     = true
   instance_type   = "c7gn.4xlarge"
   launch_block_device_mappings {
@@ -65,9 +65,9 @@ source "amazon-ebs" "csit_ubuntu_jammy_arm_sut" {
 }
 
 build {
-  name = "csit_ubuntu_jammy_arm_sut-packer"
+  name = "csit_ubuntu_noble_arm_sut-packer"
   sources = [
-    "source.amazon-ebs.csit_ubuntu_jammy_arm_sut"
+    "source.amazon-ebs.csit_ubuntu_noble_arm_sut"
   ]
   provisioner "shell" {
     inline = var.first_run_commands

diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/7c:c2:55:25:3b:2e/user-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/7c:c2:55:25:3b:2e/user-data
index 51d3a17..2e8f6b1 100644 (file)
--- a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/7c:c2:55:25:3b:2e/user-data
+++ b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_amd64/7c:c2:55:25:3b:2e/user-data
@@ -84,6 +84,7 @@ autoinstall:
     layout: us
     toggle: null
     variant: ''
+  late-commands:
     - curtin in-target --target=/target -- systemctl enable docker
   locale: en_US.UTF-8
   network: