From: Ed Warnicke Date: Mon, 17 Oct 2016 17:57:30 +0000 (+0000) Subject: Merge "Remove unnecessary ssh-credentials defaults" X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=2d286c0bfff820a47ba091d3952c6f3c6c7daa9d;hp=-c;p=ci-management.git Merge "Remove unnecessary ssh-credentials defaults" --- 2d286c0bfff820a47ba091d3952c6f3c6c7daa9d diff --combined jjb/honeycomb/honeycomb.yaml index 25cef96fd,7247ce2b9..bf037d58f --- a/jjb/honeycomb/honeycomb.yaml +++ b/jjb/honeycomb/honeycomb.yaml @@@ -10,9 -10,6 +10,9 @@@ - ubuntu1404: repo-os-part: 'ubuntu.trusty.main' skip-site: 'false' + - ubuntu1604: + repo-os-part: 'ubuntu.xenial.main' + skip-site: 'true' - centos7: repo-os-part: 'centos7' skip-site: 'true' @@@ -29,7 -26,6 +29,7 @@@ project-type: maven node: verify-{os} concurrent: true + jdk: openjdk8-{os} logrotate: daysToKeep: '{build-days-to-keep}' @@@ -47,14 -43,14 +47,14 @@@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@@ -85,7 -81,6 +85,7 @@@ project-type: maven node: 'verify-image-{os}' concurrent: true + jdk: openjdk8-{os} logrotate: daysToKeep: '{build-days-to-keep}' @@@ -103,14 -98,14 +103,14 @@@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@@ -173,14 -168,14 +173,14 @@@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' wrappers: - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@@ -214,7 -209,6 +214,7 @@@ name: 'honeycomb-integration-{stream}-{os}' project-type: maven node: merge-{os} + jdk: openjdk8-{os} logrotate: daysToKeep: '{build-days-to-keep}' @@@ -234,14 -228,14 +234,14 @@@ scm: - git-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' branch: '{branch}' wrappers: - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' diff --combined jjb/vpp/vpp.yaml index 546246554,587b68543..3310efb93 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@@ -37,7 -37,6 +37,7 @@@ jobs: - 'vpp-csit-verify-virl-{stream}' - 'vpp-csit-verify-hw-perf-{stream}-{type}' + - 'vpp-csit-verify-virl-1604-test-{stream}' project: 'vpp' stream: - master: @@@ -82,7 -81,7 +82,7 @@@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' @@@ -90,7 -89,7 +90,7 @@@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@@ -104,72 -103,6 +104,72 @@@ !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: !include-raw-escape: include-raw-vpp-build.sh + publishers: + - archive: + artifacts: 'build-root/*.rpm,build-root/*.deb' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + +- job-template: + name: 'vpp-csit-verify-virl-1604-test-{stream}' + + project-type: freestyle + node: 'verify-ubuntu1404' + 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: 'ubuntu1404' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - timestamps + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'virl-1604-test' + 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: include-raw-vpp-checkstyle.sh + - shell: + !include-raw-escape: include-raw-vpp-build.sh publishers: - archive: artifacts: 'build-root/*.rpm,build-root/*.deb' @@@ -201,7 -134,7 +201,7 @@@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' @@@ -209,7 -142,7 +209,7 @@@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@@ -263,7 -196,7 +263,7 @@@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' @@@ -271,7 -204,7 +271,7 @@@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@@ -330,7 -263,7 +330,7 @@@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' @@@ -338,7 -271,7 +338,7 @@@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@@ -388,7 -321,7 +388,7 @@@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' @@@ -396,7 -329,7 +396,7 @@@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@@ -452,7 -385,7 +452,7 @@@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' @@@ -460,7 -393,7 +460,7 @@@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@@ -513,7 -446,7 +513,7 @@@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' @@@ -521,7 -454,7 +521,7 @@@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}'