From 19d5ed63e66867da22d146c1cf6b62fda5670f72 Mon Sep 17 00:00:00 2001 From: Ed Kern Date: Sat, 24 Mar 2018 13:18:07 -0700 Subject: [PATCH] VPP: Remove unused cpoc and promote jobs Promote has never been used and cpoc line is now the main line. os set of jobs to cover the old build framework remains Change-Id: I2d6b116742bc44f89c623ee83b4c15da648a7064 Signed-off-by: Ed Kern --- jjb/vpp/vpp.yaml | 134 ------------------------------------------------------- 1 file changed, 134 deletions(-) diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 2fd3e7697..54418622b 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -10,8 +10,6 @@ - 'vpp-docs-verify-{stream}' - 'vpp-make-test-docs-merge-{stream}' - 'vpp-make-test-docs-verify-{stream}' - - 'vpp-promote-{stream}-{os}' - - 'vpp-cpoc-verify-{stream}-{os}' project: 'vpp' os: @@ -1083,136 +1081,4 @@ max-failed-builds: 1 fixed-delay: 10 -- job-template: - name: 'vpp-promote-{stream}-{os}' - - project-type: freestyle - node: '{os}-basebuild-8c-32g' - - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - os-parameter: - os: '{os}' - - stream-parameter: - stream: '{stream}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.{repo-os-part}' - - 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-manually-triggered: - name: '{project}' - branch: '{branch}' - comment-trigger-value: 'test-pkgcloud' - - builders: - - config-file-provider: - files: - - file-id: '.packagecloud' - target: '/home/jenkins' - - config-file-provider: - files: - - file-id: 'packagecloud_api' - target: '/home/jenkins' - - shell: - !include-raw-escape: include-raw-vpp-checkstyle.sh - - shell: - !include-raw-escape: include-raw-vpp-test-checkstyle.sh - - shell: - !include-raw-escape: - - ../scripts/setup_vpp_ubuntu_docker_test.sh - - shell: - !include-raw-escape: - - ../scripts/setup_vpp_dpdk_dev_env.sh - - include-raw-vpp-build.sh - - shell: - !include-raw-escape: - - ../scripts/packagecloud_promote.sh - - publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' - -- job-template: - name: 'vpp-cpoc-verify-{stream}-{os}' - - project-type: freestyle - node: '{os}-us' - concurrent: true - - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - os-parameter: - os: '{os}' - - repo-name-parameter: - repo-name: '{repo-stream-part}.{repo-os-part}' - - 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-manually-triggered: - name: '{project}' - branch: '{branch}' - comment-trigger-value: 'test-cpoc' - - builders: - - shell: - !include-raw-escape: include-raw-vpp-checkstyle.sh - - shell: - !include-raw-escape: include-raw-vpp-test-checkstyle.sh - - shell: - !include-raw-escape: - - ../scripts/setup_vpp_ubuntu_docker_test.sh - - ../scripts/setup_vpp_dpdk_dev_env.sh - - include-raw-vpp-build.sh - publishers: - - archive: - artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb' - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' - archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - - naginator: - rerun-unstable-builds: true - max-failed-builds: 1 - fixed-delay: 10 - -- 2.16.6