VPP: drop openstack builder and 1710 branch

Neither set of jobs has been used in months so
cleaning them out. Either is trivial to reinstate if
needed

Change-Id: Ie8aa3a2d2258cae31676ce1af0aab0d8d8f9008e
Signed-off-by: Ed Kern <ejk@cisco.com>

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 750e9a9..c527268 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -4,8 +4,6 @@
     jobs:
         - 'vpp-verify-{stream}-{os}'
         - 'vpp-merge-{stream}-{os}'
-        - 'vpp-verify-os-{stream}-{os}'
-        - 'vpp-merge-os-{stream}-{os}'
         - 'vpp-docs-merge-{stream}'
         - 'vpp-docs-verify-{stream}'
         - 'vpp-make-test-docs-merge-{stream}'
@@ -24,9 +22,6 @@
         - master:
             branch: 'master'
             repo-stream-part: 'master'
-        - '1710':
-            branch: 'stable/1710'
-            repo-stream-part: 'stable.1710'
         - '1801':
             branch: 'stable/1801'
             repo-stream-part: 'stable.1801'
@@ -60,7 +55,6 @@
     name: vpp-misc
     jobs:
         - 'vpp-csit-verify-virl-{stream}'
-        - 'vpp-csit-verify-os-virl-{stream}'
         - 'vpp-csit-verify-hw-perf-{stream}'
         - 'vpp-checkstyle-verify-{stream}'
     project: 'vpp'
@@ -68,9 +62,6 @@
         - master:
             branch: 'master'
             repo-stream-part: 'master'
-        - '1710':
-            branch: 'stable/1710'
-            repo-stream-part: 'stable.1710'
         - '1801':
             branch: 'stable/1801'
             repo-stream-part: 'stable.1801'
@@ -528,67 +519,6 @@
             max-failed-builds: 1
             fixed-delay: 90
 
-- job-template:
-    name: 'vpp-verify-os-{stream}-{os}'
-
-    project-type: freestyle
-    node: '{os}-basebuild-8c-32g'
-    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-os-trivial-patch-submitted:
-            name: '{project}'
-            branch: '{branch}'
-
-    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
-        - shell:
-            !include-raw-escape:
-                - ../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'
-
 - job-template:
     name: 'vpp-merge-{stream}-{os}'
 
@@ -681,95 +611,6 @@
             max-failed-builds: 1
             fixed-delay: 90
 
-- job-template:
-    name: 'vpp-merge-os-{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}'
-        - maven-project-parameter:
-            maven: 'mvn33-new'
-        - maven-exec:
-            maven-version: 'mvn33-new'
-        - 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: ''
-            choosing-strategy: 'default'
-
-    wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit-trigger-os-patch-merged:
-            name: '{project}'
-            branch: '{branch}'
-
-    builders:
-        - config-file-provider:
-            files:
-              - file-id: '.packagecloud'
-                target: '/root'
-        - config-file-provider:
-            files:
-              - file-id: 'packagecloud_api'
-                target: '/root'
-        - maven-target:
-            maven-version: 'mvn33-new'
-            goals: '--version'
-            settings: 'vpp-settings'
-            settings-type: cfp
-            global-settings: 'global-settings'
-            global-settings-type: cfp
-        - shell:
-            !include-raw-escape: include-raw-vpp-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
-        - provide-maven-settings:
-            settings-file: 'vpp-settings'
-            global-settings-file: 'global-settings'
-        - shell:
-            !include-raw-escape:
-                - ../scripts/maven_push_functions.sh
-                - include-raw-vpp-maven-push.sh
-        - shell:
-            !include-raw-escape:
-                - ../scripts/packagecloud_push.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'
-
 - job-template:
     name: 'vpp-csit-verify-virl-{stream}'
 
@@ -845,77 +686,6 @@
             max-failed-builds: 1
             fixed-delay: 90
 
-
-- job-template:
-    name: 'vpp-csit-verify-os-virl-{stream}'
-
-    project-type: freestyle
-    node: '{os}-basebuild-8c-32g'
-    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}.ubuntu.xenial.main'
-        - is-csit-vpp-job-parameter:
-            is-csit-vpp-job: 'True'
-        - string:
-            name: CSIT_REF
-            description: "Also testing CSIT_REF"
-
-    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-os-trivial-patch-submitted:
-            name: '{project}'
-            branch: '{branch}'
-
-    builders:
-        - shell: 'echo "VPP_BRANCH={branch}" > $WORKSPACE/variables.prop'
-        - inject:
-            properties-file: variables.prop
-        - shell:
-            !include-raw-escape:
-                - include-raw-vpp-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
-        - shell:
-            !include-raw-escape:
-                - include-raw-vpp-csit-functional.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'csit/report.html, csit/log.html, csit/output.xml'
-            latest-only: false
-
-        - robot-report:
-            output-path: 'csit'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
 - job-template:
     name: 'vpp-csit-verify-hw-perf-{stream}'