From 0a204a748cb6637e8b1f9287022d7cffc372da2c Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Tue, 28 Feb 2023 08:37:45 +0000 Subject: feat(csit): Cleanup obsolete jobs Signed-off-by: Peter Mikus Change-Id: Ia130910d850eb7de859c595e55c1f07523c6a9d6 --- jjb/csit/csit.yaml | 67 +----------------------------------------------------- jjb/vpp/vpp.yaml | 19 +--------------- 2 files changed, 2 insertions(+), 84 deletions(-) (limited to 'jjb') 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' @@ -40,70 +39,6 @@ - project-view 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}' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index fa3d7e072..343118673 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: @@ -330,9 +330,6 @@ - 'master': branch: 'master' branch-refspec: '' - - '2206': - branch: 'stable/2206' - branch-refspec: '' - '2210': branch: 'stable/2210' branch-refspec: '' @@ -340,21 +337,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 -- cgit 1.2.3-korg