diff options
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/csit/csit-perf.yaml | 20 | ||||
-rw-r--r-- | jjb/csit/csit.yaml | 67 | ||||
-rw-r--r-- | jjb/vpp/docs.yaml | 5 | ||||
-rw-r--r-- | jjb/vpp/vpp.yaml | 50 |
4 files changed, 13 insertions, 129 deletions
diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml index 36288cdc3..70187015e 100644 --- a/jjb/csit/csit-perf.yaml +++ b/jjb/csit/csit-perf.yaml @@ -120,45 +120,45 @@ - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 2n-clx: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 2n-zn2: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 2n-tx2: os: 'ubuntu2204' executor-arch: 'aarch64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-tsh: os: 'ubuntu2204' executor-arch: 'aarch64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-alt: os: 'ubuntu2204' executor-arch: 'aarch64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-snr: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 'csit-vpp-perf-hoststack-daily-master-{node-arch}': node-arch: - 2n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 3n-icx: os: 'ubuntu2204' executor-arch: 'x86_64' - periodicity: '30 22 * * 1,4' + periodicity: '30 22 * * 0-4' - 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}': node-arch: - 2n-icx: diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 77dbb14e6..c8bd30c47 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2022 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: @@ -17,7 +17,6 @@ description: 'CSIT Jenkins jobs.' jobs: - - 'csit-docs-merge-{stream}-{os}-{executor-arch}' - 'csit-report-merge-{stream}-{os}-{executor-arch}' project: 'csit' @@ -41,70 +40,6 @@ project-name: csit - job-template: - name: 'csit-docs-merge-{stream}-{os}-{executor-arch}' - - project-type: freestyle - node: 'builder-{os}-prod-{executor-arch}' - concurrent: true - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - - properties: - - lf-infra-properties: - build-days-to-keep: "{build-days-to-keep}" - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '' - choosing-strategy: 'default' - - wrappers: - - fdio-infra-wrappers-non-activity-timeout: - build-timeout: '{build-timeout}' - - triggers: - - reverse: - jobs: 'csit-vpp-device-{stream}-{os}-{executor-arch}-1n-skx-weekly' - result: 'success' - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'run-docs' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - - builders: - - shell: - !include-raw-escape: - - ../scripts/setup_executor_env.sh - - shell: - !include-raw-escape: - - ../scripts/csit/docs.sh - - publishers: - - fdio-infra-publish-docs - - fdio-infra-publish - -- job-template: name: 'csit-report-merge-{stream}-{os}-{executor-arch}' project-type: freestyle diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index d9eb205b6..9776217bb 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -14,9 +14,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2206': - branch: 'stable/2206' - branch-refspec: '' - '2210': branch: 'stable/2210' branch-refspec: '' @@ -34,8 +31,6 @@ - stream: 'master' os: 'ubuntu2004' # os added in 22.10 - - stream: '2206' - os: 'ubuntu2204' - job-template: name: 'vpp-docs-verify-{stream}-{os}-{executor-arch}' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index fa3d7e072..ade616235 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2022 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: @@ -40,9 +40,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2206': - branch: 'stable/2206' - branch-refspec: '' - '2210': branch: 'stable/2210' branch-refspec: '' @@ -60,9 +57,7 @@ # os deprecated in master - stream: 'master' os: 'ubuntu2004' - # os added in 22.10 - - stream: '2206' - os: 'ubuntu2204' + # [end] VPP-CHECKSTYLE-X86_64 PROJECT # VPP-X86_64 PROJECT @@ -87,11 +82,6 @@ branch-refspec: '' make-test-os: 'ubuntu-20.04 ubuntu-22.04' make-test-multiworker-os: 'debian-11' - - '2206': - branch: 'stable/2206' - branch-refspec: '' - make-test-os: 'ubuntu-20.04' - make-test-multiworker-os: 'debian-11' - '2210': branch: 'stable/2210' branch-refspec: '' @@ -107,10 +97,6 @@ - ubuntu2004 - ubuntu2204 executor-arch: 'x86_64' - exclude: - # os added in 22.10 - - stream: '2206' - os: 'ubuntu2204' # [end] VPP-X86_64 PROJECT # VPP-DEBUG-X86_64 PROJECT @@ -175,9 +161,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2206': - branch: 'stable/2206' - branch-refspec: '' - '2210': branch: 'stable/2210' branch-refspec: '' @@ -194,9 +177,6 @@ # os deprecated in master - stream: 'master' os: 'ubuntu2004' - # os added in 22.10 - - stream: '2206' - os: 'ubuntu2204' # [end] VPP-GCC-X86_64 PROJECT # VPP-AARCH64 PROJECT @@ -221,11 +201,6 @@ branch-refspec: '' make-test-os: 'ubuntu-20.04 ubuntu-22.04' make-test-multiworker-os: '' - - '2206': - branch: 'stable/2206' - branch-refspec: '' - make-test-os: 'ubuntu-20.04' - make-test-multiworker-os: '' - '2210': branch: 'stable/2210' branch-refspec: '' @@ -240,10 +215,6 @@ - ubuntu2004 - ubuntu2204 executor-arch: 'aarch64' - exclude: - # os added in 22.10 - - stream: '2206' - os: 'ubuntu2204' # [end] VPP-AARCH64 PROJECT # VPP-CSIT-VERIFY-DEVICE PROJECT @@ -330,9 +301,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2206': - branch: 'stable/2206' - branch-refspec: '' - '2210': branch: 'stable/2210' branch-refspec: '' @@ -340,21 +308,7 @@ branch: 'stable/2302' branch-refspec: '' os: - - 'ubuntu2004' - 'ubuntu2204' - exclude: - # os deprecated in 23.02 - - stream: '2302' - os: 'ubuntu2004' - # os deprecated in 22.10 - - stream: '2210' - os: 'ubuntu2004' - # os deprecated in master - - stream: 'master' - os: 'ubuntu2004' - # os added in 22.10 - - stream: '2206' - os: 'ubuntu2204' # [end] VPP-CSIT-API-CRC PROJECT # LF RELENG VPP PROJECTS |