X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit-vpp-device.yaml;h=45085cd03959aa5114cbbde799b1c6a9d44f8ff5;hb=b197d74fec14fda0851655bec298d445520f0aeb;hp=9a4b47da228f1c47d8afbd048e07c1597f95dbce;hpb=9f905ba9685c033b0630a004e273645cfd1c95b0;p=ci-management.git
diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 9a4b47da2..45085cd03 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2023 Cisco 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:
@@ -15,124 +15,116 @@
- project:
name: csit-vpp-device
description: 'CSIT jenkins jobs.'
- os:
- - 'ubuntu1804'
- node-arch:
- - '1n-skx'
- - '1n-tx2':
- executor: 'vpp-csit-arm-ubuntu18'
- skip-vote: 'true'
jobs:
- - 'csit-vpp-device-{stream}-{os}-{node-arch}'
- - 'csit-vpp-device-{stream}-{os}-{node-arch}-semiweekly':
+ - 'csit-vpp-device-{stream}-{os}-{executor-arch}-{node-arch}'
+ - 'csit-vpp-device-{stream}-{os}-{executor-arch}-{node-arch}-semiweekly'
+ - 'csit-vpp-device-{stream}-{os}-{executor-arch}-{node-arch}-weekly'
+ - 'csit-vpp-device-report-coverage-{stream}-{node-arch}':
stream:
- - master:
- branch: 'master'
- branch-id: 'oper'
- - '2009_lts':
- branch: 'rls2009_lts'
- branch-id: 'oper-rls2009_lts'
- - '2101':
- branch: 'rls2101'
- branch-id: 'oper-rls2101'
- - 'csit-vpp-device-{stream}-{os}-{node-arch}-weekly':
- stream:
- - master:
- branch: 'master'
- branch-id: 'oper'
- - '2009_lts':
- branch: 'rls2009_lts'
- branch-id: 'oper-rls2009_lts'
- - '2101':
- branch: 'rls2101'
- branch-id: 'oper-rls2101'
-
+ - '2302':
+ branch: 'rls2302'
+ branch-id: 'oper-rls2302'
+ node-arch:
+ - '1n-skx':
+ os: 'ubuntu2204'
+ executor-arch: 'x86_64'
+ make-parallel-jobs: '32'
+ skip-vote: 'false'
+ - '1n-tx2':
+ os: 'ubuntu2204'
+ executor-arch: 'aarch64'
+ make-parallel-jobs: '32'
+ skip-vote: 'false'
project: 'csit'
- executor: 'vpp-csit-device'
branch: 'master'
branch-id: 'oper'
stream:
- master:
branch: 'master'
branch-id: 'oper'
- - '2005':
- branch: 'rls2005'
- branch-id: 'oper-rls2005'
- - '2009':
- branch: 'rls2009'
- branch-id: 'oper-rls2009'
- - '2009_lts':
- branch: 'rls2009_lts'
- branch-id: 'oper-rls2009_lts'
- - '2101':
- branch: 'rls2101'
- branch-id: 'oper-rls2101'
- exclude:
- - stream: '2005'
- node-arch: '1n-tx2'
+ - '2302':
+ branch: 'rls2302'
+ branch-id: 'oper-rls2302'
+
+- job-template:
+ name: 'csit-vpp-device-report-coverage-{stream}-{node-arch}'
+
+ project-type: freestyle
+ node: 'csit-builder-{os}-prod-{executor-arch}'
+ concurrent: true
+ latest-only: false
+
+ properties:
+ - lf-infra-properties:
+ build-days-to-keep: "{build-days-to-keep}"
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
+ - make-parallel-jobs-parameter:
+ make-parallel-jobs: '{make-parallel-jobs}'
+ - os-parameter:
+ os: '{os}'
+ - gerrit-refspec-parameter
+ - gerrit-event-type-parameter
+ - gerrit-event-comment-text-parameter
+ - csit-fail-on-crc-mismatch-parameter:
+ fail-on-crc-mismatch: 'True'
+
+ scm:
+ - gerrit-trigger-scm:
+ credentials-id: 'jenkins-gerrit-credentials'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+
+ wrappers:
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ - gerrit-trigger-csit-perftest:
+ project: '{project}'
+ branch: '{branch}'
+ trigger-word: 'csit-vpp-report-dev-{node-arch}'
+ skip-vote: false
+
+ builders:
+ - shell:
+ !include-raw-escape:
+ - ../scripts/setup_executor_env.sh
+ - shell:
+ !include-raw-escape:
+ - ../scripts/csit/device-verify.sh
+
+ publishers:
+ - fdio-infra-publish
- job-template:
- name: 'csit-vpp-device-{stream}-{os}-{node-arch}'
- description: |
-
- - objective
-
- - vpp-device verify - per csit gerrit patch
-
- - job
-
- - name: csit-vpp-device-{stream}-{os}-{node-arch}
-
- trigger: keyword in comment to csit patch:
- csit-devicetest tag_list
-
- - executor
-
-
- test-cases selection
-
- - test-cases selected using trigger keyword followed by tags
-
- all test-cases are labelled with CSIT RF topic tags
- defined in csit/docs/tag_documentation.rst
-
- - default tags for vpp-device test type
-
-
- results
-
- - jjb verify: PASS/FAIL
-
- present: no
-
- analyse: no
-
-
+ name: 'csit-vpp-device-{stream}-{os}-{executor-arch}-{node-arch}'
project-type: freestyle
- node: '{executor}'
+ node: 'csit-builder-{os}-prod-{executor-arch}'
concurrent: true
- archive-artifacts: 'archive/*.*'
latest-only: false
- build-discarder:
- daysToKeep: '{build-days-to-keep}'
- numToKeep: '{build-num-to-keep}'
- artifactDaysToKeep: '{build-artifact-days-to-keep}'
- artifactNumToKeep: '{build-artifact-num-to-keep}'
+ properties:
+ - lf-infra-properties:
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
+ - make-parallel-jobs-parameter:
+ make-parallel-jobs: '{make-parallel-jobs}'
- os-parameter:
os: '{os}'
- gerrit-refspec-parameter
- gerrit-event-type-parameter
- gerrit-event-comment-text-parameter
- - string:
- name: ARCHIVE_ARTIFACTS
- default: '{archive-artifacts}'
- description: Artifacts to archive to the logs server.
# This is an automatic verify job, part of API coverage.
# CRC checking is needed to ensure vpp crc job breaks only when intended.
# Unlikely to be removed, as this job is primary source of API coverage.
@@ -164,68 +156,29 @@
- ../scripts/csit/device-verify.sh
publishers:
- - robot:
- output-path: 'archives'
- other-files:
- - '*.*'
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ - fdio-infra-publish
- job-template:
- name: 'csit-vpp-device-{stream}-{os}-{node-arch}-semiweekly'
- description: |
-
- - objective
-
- - Validate latest vpp build from corresponding branch stored
- in nexus against verified CSIT codebase of corresponding
- branch.
-
- - executor
-
-
- test-cases selection
-
- - pre-selected test-cases
-
- all test-cases are labelled with CSIT RF topic tags
- defined in csit/docs/tag_documentation.rst
-
- - default tags for vpp-device test type
-
-
- results
-
- - jjb verify: PASS/FAIL
-
- present: no
-
- analyse: no
-
-
+ name: 'csit-vpp-device-{stream}-{os}-{executor-arch}-{node-arch}-semiweekly'
project-type: freestyle
- node: '{executor}'
+ node: 'csit-builder-{os}-prod-{executor-arch}'
concurrent: false
- archive-artifacts: 'csit/archive/*.*'
latest-only: false
- build-discarder:
- daysToKeep: '{build-days-to-keep}'
- numToKeep: '{build-num-to-keep}'
- artifactDaysToKeep: '{build-artifact-days-to-keep}'
- artifactNumToKeep: '{build-artifact-num-to-keep}'
+ properties:
+ - lf-infra-properties:
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
+ - make-parallel-jobs-parameter:
+ make-parallel-jobs: '{make-parallel-jobs}'
- os-parameter:
os: '{os}'
- - string:
- name: ARCHIVE_ARTIFACTS
- default: '{archive-artifacts}'
- description: Artifacts to archive to the logs server.
wrappers:
- fdio-infra-wrappers-non-activity-timeout:
@@ -251,67 +204,29 @@
- ../scripts/csit/device-semiweekly.sh
publishers:
- - robot:
- output-path: 'archives'
- other-files:
- - '*.*'
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ - fdio-infra-publish
- job-template:
- name: 'csit-vpp-device-{stream}-{os}-{node-arch}-weekly'
- description: |
-
- - objective
-
- - Validate CSIT code of corresponding branch against
- verified vpp build from corresponding branch.
-
- - executor
-
-
- test-cases selection
-
- - pre-selected test-cases
-
- all test-cases are labelled with CSIT RF topic tags
- defined in csit/docs/tag_documentation.rst
-
- - default tags for vpp-device test type
-
-
- results
-
- - jjb verify: PASS/FAIL
-
- present: no
-
- analyse: no
-
-
+ name: 'csit-vpp-device-{stream}-{os}-{executor-arch}-{node-arch}-weekly'
project-type: freestyle
- node: '{executor}'
+ node: 'csit-builder-{os}-prod-{executor-arch}'
concurrent: false
- archive-artifacts: 'archive/*.*'
latest-only: false
- build-discarder:
- daysToKeep: '{build-days-to-keep}'
- numToKeep: '{build-num-to-keep}'
- artifactDaysToKeep: '{build-artifact-days-to-keep}'
- artifactNumToKeep: '{build-artifact-num-to-keep}'
+ properties:
+ - lf-infra-properties:
+ build-days-to-keep: "{build-days-to-keep}"
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
+ - make-parallel-jobs-parameter:
+ make-parallel-jobs: '{make-parallel-jobs}'
- os-parameter:
os: '{os}'
- - string:
- name: ARCHIVE_ARTIFACTS
- default: '{archive-artifacts}'
- description: Artifacts to archive to the logs server.
scm:
- git-scm:
@@ -339,9 +254,4 @@
- ../scripts/csit/device-verify.sh
publishers:
- - robot:
- output-path: 'archives'
- other-files:
- - '*.*'
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ - fdio-infra-publish