From 64f789177f9b0e0931608d3ba92e80cb00a8e2b4 Mon Sep 17 00:00:00 2001
From: Naveen Joy <najoy@cisco.com>
Date: Wed, 12 Mar 2025 19:19:16 -0700
Subject: [PATCH] hst: Add HST jobs on ubuntu 2204 & 2404 for x86_64 & aarch64

New jobs added:
- vpp-verify-hst-debug-nonvoting-master-ubuntu2204-aarch64
- vpp-verify-hst-debug-nonvoting-master-ubuntu2404-x86_64
- vpp-verify-hst-nonvoting-master-ubuntu2204-x86_64

Change-Id: I481de9e1ce5b42d70667e74d432b112b84238125
Signed-off-by: Naveen Joy <najoy@cisco.com>
---
 jjb/vpp/vpp.yaml | 125 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 111 insertions(+), 14 deletions(-)

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index af3ae5122..191096250 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -55,19 +55,20 @@
 
 # [end] VPP-CHECKSTYLE-X86_64 PROJECT
 
+# TODO: Change job to voting once put into production
 # VPP-HST-X86_64 PROJECT
-# - project:
-#     name: vpp-verify-hst-x86_64
-#     jobs:
-#       - 'vpp-verify-hst-{stream}-{os}-{executor-arch}'
-#     project: 'vpp'
-#     os:
-#       - ubuntu2204
-#     stream:
-#       - 'master':
-#           branch: 'master'
-#           branch-refspec: ''
-#     executor-arch: 'x86_64'
+- project:
+    name: vpp-verify-hst-nonvoting-x86_64
+    jobs:
+      - 'vpp-verify-hst-nonvoting-{stream}-{os}-{executor-arch}'
+    project: 'vpp'
+    os:
+      - ubuntu2204
+    stream:
+      - 'master':
+          branch: 'master'
+          branch-refspec: ''
+    executor-arch: 'x86_64'
 
 # [end] VPP-HST-X86_64 PROJECT
 
@@ -79,6 +80,8 @@
     project: 'vpp'
     os:
       - ubuntu2204
+      # TODO: Uncomment when ubuntu2404 is put into production
+      # - ubuntu2404
     stream:
       - 'master':
           # TODO: Remove when ubuntu2404 is put into production
@@ -89,6 +92,40 @@
 
 # [end] VPP-HST-DEBUG-X86_64 PROJECT
 
+# TODO: Remove when ubuntu2404 is put into production
+# VPP-HST-DEBUG-X86_64 PROJECT
+- project:
+    name: vpp-verify-hst-debug-nonvoting-x86_64
+    jobs:
+      - 'vpp-verify-hst-debug-nonvoting-{stream}-{os}-{executor-arch}'
+    project: 'vpp'
+    os:
+      - ubuntu2404
+    stream:
+      - 'master':
+          branch: 'master'
+          branch-refspec: ''
+    executor-arch: 'x86_64'
+
+# [end] VPP-HST-DEBUG-X86_64 PROJECT
+
+# TODO: Remove nonvoting from project name & jobs when aarch64 is put into production
+# VPP-HST-DEBUG-AARCH64 PROJECT
+- project:
+    name: vpp-verify-hst-debug-nonvoting-aarch64
+    jobs:
+      - 'vpp-verify-hst-debug-nonvoting-{stream}-{os}-{executor-arch}'
+    project: 'vpp'
+    os:
+      - ubuntu2204
+    stream:
+      - 'master':
+          branch: 'master'
+          branch-refspec: ''
+    executor-arch: 'aarch64'
+
+# [end] VPP-HST-DEBUG-AARCH64 PROJECT
+
 # VPP-X86_64 PROJECT
 #
 # NOTE: The list of supported branches for each OS are maintained
@@ -567,7 +604,7 @@
 
 # VPP-VERIFY-HST JOB TEMPLATE
 - job-template:
-    name: 'vpp-verify-hst-{stream}-{os}-{executor-arch}'
+    name: 'vpp-verify-hst-nonvoting-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
     node: 'hst-{os}-prod-{executor-arch}'
@@ -601,7 +638,7 @@
           build-timeout: 120
 
     triggers:
-      - gerrit-trigger-checkstyle:
+      - gerrit-trigger-checkstyle-nonvoting:
           name: '{project}'
           branch: '{branch}'
 
@@ -681,6 +718,66 @@
       - fdio-infra-publish
 # [end] VPP-VERIFY-HST-DEBUG JOB TEMPLATE
 
+# TODO: Remove when ubuntu2404 & aarch64 is put into production
+# VPP-VERIFY-HST-DEBUG JOB TEMPLATE
+- job-template:
+    name: 'vpp-verify-hst-debug-nonvoting-{stream}-{os}-{executor-arch}'
+
+    project-type: freestyle
+    node: 'hst-{os}-prod-{executor-arch}'
+    concurrent: true
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    # Please keep parameters in alphabetical order
+    parameters:
+      - gerrit-parameter:
+          branch: '{branch}'
+      - gerrit-refspec-parameter:
+          refspec: '{branch-refspec}'
+      - os-parameter:
+          os: '{os}'
+      - project-parameter:
+          project: '{project}'
+      - stream-parameter:
+          stream: '{stream}'
+
+    scm:
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+
+    wrappers:
+      - fdio-infra-wrappers:
+          build-timeout: 120
+
+    triggers:
+      - gerrit-trigger-checkstyle-nonvoting:
+          name: '{project}'
+          branch: '{branch}'
+
+    builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ubuntu_docker_test.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_vpp_ext_deps.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/vpp/debug-hst.sh
+
+    publishers:
+      - fdio-infra-publish
+# [end] VPP-VERIFY-HST-DEBUG JOB TEMPLATE
+
+
 # VPP-VERIFY JOB TEMPLATE
 - job-template:
     name: 'vpp-verify-{stream}-{os}-{executor-arch}'
-- 
2.16.6