diff options
| -rw-r--r-- | jjb/csit/csit.yaml | 41 | ||||
| -rw-r--r-- | jjb/hc2vpp/hc2vpp-csit.yaml | 51 | ||||
| -rw-r--r-- | jjb/jvpp/jvpp.yaml | 43 | ||||
| -rw-r--r-- | jjb/nsh_sfc/nsh_sfc.yaml | 37 | ||||
| -rw-r--r-- | jjb/opflexvpp/opflexvpp.yaml | 6 | ||||
| -rw-r--r-- | jjb/vpp/include-raw-vpp-commitmsg.sh | 8 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 2 |
7 files changed, 103 insertions, 85 deletions
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 41979aeab..da8c30f0a 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -26,6 +26,7 @@ arch: - 'skx' - 'hsw' + - 'dnv' - 'arm' jobs: @@ -872,9 +873,7 @@ build-timeout: '{build-timeout}' triggers: - - reverse: - jobs: 'csit-vpp-perf-mrr-daily-master' - result: 'failure' + - timed: '0 2,14 * * *' builders: - maven-target: @@ -1121,7 +1120,7 @@ project-type: freestyle node: '{perf-executor}' - concurrent: true + concurrent: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -1159,10 +1158,6 @@ other-files: - '*.*' - - trigger: - project: 'csit-trending-daily-master' - threshold: 'FAILURE' - - fdio-infra-shiplogs: maven-version: 'mvn33-new' @@ -1189,7 +1184,7 @@ project-type: freestyle node: '{perf-executor}' - concurrent: true + concurrent: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -1227,10 +1222,6 @@ other-files: - '*.*' - - trigger: - project: 'csit-trending-daily-master' - threshold: 'FAILURE' - - fdio-infra-shiplogs: maven-version: 'mvn33-new' @@ -1257,7 +1248,7 @@ project-type: freestyle node: '{perf-executor}' - concurrent: true + concurrent: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -1295,10 +1286,6 @@ other-files: - '*.*' - - trigger: - project: 'csit-trending-daily-master' - threshold: 'FAILURE' - - fdio-infra-shiplogs: maven-version: 'mvn33-new' @@ -1325,7 +1312,7 @@ project-type: freestyle node: '{perf-executor}' - concurrent: true + concurrent: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -1363,10 +1350,6 @@ other-files: - '*.*' - - trigger: - project: 'csit-trending-daily-master' - threshold: 'FAILURE' - - fdio-infra-shiplogs: maven-version: 'mvn33-new' @@ -1431,10 +1414,6 @@ other-files: - '*.*' - - trigger: - project: 'csit-trending-daily-master' - threshold: 'FAILURE' - - fdio-infra-shiplogs: maven-version: 'mvn33-new' @@ -1499,10 +1478,6 @@ other-files: - '*.*' - - trigger: - project: 'csit-trending-daily-master' - threshold: 'FAILURE' - - fdio-infra-shiplogs: maven-version: 'mvn33-new' @@ -1567,10 +1542,6 @@ other-files: - '*.*' - - trigger: - project: 'csit-trending-daily-master' - threshold: 'FAILURE' - - fdio-infra-shiplogs: maven-version: 'mvn33-new' diff --git a/jjb/hc2vpp/hc2vpp-csit.yaml b/jjb/hc2vpp/hc2vpp-csit.yaml index b06b5b5bd..a1f84820e 100644 --- a/jjb/hc2vpp/hc2vpp-csit.yaml +++ b/jjb/hc2vpp/hc2vpp-csit.yaml @@ -57,6 +57,9 @@ project-type: freestyle node: '{os}-builder-4c-4g' concurrent: true + archive-artifacts: '**/csit/archive/*.*' + latest-only: false + build-discarder: daysToKeep: '{build-days-to-keep}' @@ -71,6 +74,10 @@ os: '{os}' - stream-parameter: stream: '{stream}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - git-scm: @@ -91,9 +98,6 @@ !include-raw-escape: include-raw-hc2vpp-csit-integration.sh publishers: - - archive-artifacts: - artifacts: 'csit/archive/*.*' - latest-only: false - email-notification: email-prefix: '[hc2vpp]' @@ -110,6 +114,8 @@ node: '{os}-builder-4c-4g' jdk: openjdk8-{os} concurrent: true + archive-artifacts: '**/csit/archive/*.*' + latest-only: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -132,6 +138,10 @@ stream: '{stream}' - odl-parameter: odl: '{odl}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -184,9 +194,6 @@ !include-raw-escape: include-raw-hc2vpp-csit-verify.sh publishers: - - archive-artifacts: - artifacts: 'csit/archive/*.*' - latest-only: false - email-notification: email-prefix: '[hc2vpp]' @@ -202,6 +209,9 @@ project-type: freestyle node: '{os}-builder-4c-4g' concurrent: true + archive-artifacts: '**/csit/archive/*.*' + latest-only: false + build-discarder: daysToKeep: '{build-days-to-keep}' @@ -218,6 +228,10 @@ stream: '{stream}' - odl-parameter: odl: '{odl}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - git-scm: @@ -238,9 +252,6 @@ !include-raw-escape: include-raw-hc2vpp-csit-integration-odl.sh publishers: - - archive-artifacts: - artifacts: 'csit/archive/*.*' - latest-only: false - email-notification: email-prefix: '[hc2vpp]' @@ -257,13 +268,14 @@ node: '{os}-builder-4c-4g' jdk: openjdk8-{os} concurrent: true + archive-artifacts: '**/csit/archive/*.*' + latest-only: false build-discarder: 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}' @@ -279,6 +291,10 @@ stream: '{stream}' - odl-parameter: odl: '{odl}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -331,9 +347,6 @@ !include-raw-escape: include-raw-hc2vpp-csit-verify-odl.sh publishers: - - archive-artifacts: - artifacts: 'csit/archive/*.*' - latest-only: false - email-notification: email-prefix: '[hc2vpp]' @@ -349,6 +362,9 @@ project-type: freestyle node: '{os}-builder-4c-4g' concurrent: false + archive-artifacts: '**/csit/archive/*.*' + latest-only: false + build-discarder: daysToKeep: '{build-days-to-keep}' @@ -365,7 +381,10 @@ stream: '{stream}' - odl-parameter: odl: '{odl}' - + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: credentials-id: 'jenkins-gerrit-credentials' @@ -402,10 +421,6 @@ !include-raw-escape: include-raw-hc2vpp-csit-perf.sh publishers: - - archive-artifacts: - artifacts: 'csit/archive/*.*' - latest-only: false - - robot-report: output-path: 'csit/archive' diff --git a/jjb/jvpp/jvpp.yaml b/jjb/jvpp/jvpp.yaml index 259b27b4a..5bc6fc361 100644 --- a/jjb/jvpp/jvpp.yaml +++ b/jjb/jvpp/jvpp.yaml @@ -41,6 +41,15 @@ project-type: freestyle node: '{os}-us' concurrent: true + archive-artifacts: > + **/build-root/packages/*.rpm + **/build-root/packages/*.deb + **/tmp/jvpp-failed-unittests/*/* **/core + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + build-discarder: daysToKeep: '{build-days-to-keep}' @@ -59,6 +68,10 @@ repo-name: '{repo-stream-part}.{repo-os-part}' - stream-parameter: stream: '{stream}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -84,18 +97,8 @@ - include-raw-jvpp-build.sh publishers: - - archive: - artifacts: > - **/build-root/packages/*.rpm, - **/build-root/packages/*.deb - - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn36' - archive-artifacts: '/tmp/jvpp-failed-unittests/*/* **/core' - naginator: rerun-unstable-builds: false max-failed-builds: 2 @@ -108,6 +111,14 @@ project-type: freestyle node: '{os}-us' + archive-artifacts: > + **/build-root/packages/*.rpm + **/build-root/packages/*.deb + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + build-discarder: daysToKeep: '{build-days-to-keep}' @@ -130,6 +141,10 @@ stream: '{stream}' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -183,14 +198,6 @@ - include-raw-jvpp-maven-push.sh publishers: - - archive: - artifacts: > - **/build-root/packages/*.rpm, - **/build-root/packages/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn36' - naginator: diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml index 49c8f18f5..a62234a71 100644 --- a/jjb/nsh_sfc/nsh_sfc.yaml +++ b/jjb/nsh_sfc/nsh_sfc.yaml @@ -442,6 +442,11 @@ node: '{os}-builder-4c-4g' concurrent: true jdk: openjdk8-{os} + archive-artifacts: '**/build-root/docs/html/*' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -458,6 +463,10 @@ os: 'ubuntu1604' - maven-exec: maven-version: 'mvn33-new' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -505,12 +514,6 @@ !include-raw-escape: include-raw-nsh_sfc-docs.sh publishers: - - archive: - artifacts: 'build-root/docs/html/*' - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' @@ -520,6 +523,9 @@ project-type: freestyle node: '{os}-builder-4c-4g' concurrent: true + archive-artifacts: '**/csit/archive/*.*' + latest-only: false + build-discarder: daysToKeep: '{build-days-to-keep}' @@ -536,6 +542,10 @@ os: '{os}' - repo-name-parameter: repo-name: '{repo-stream-part}.ubuntu.xenial.main' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -558,10 +568,6 @@ !include-raw-escape: include-raw-nsh_sfc-csit-perf-hw.sh pulishers: - - archive-artifacts: - artifacts: 'csit/archive/*.*' - latest-only: false - - robot-report: output-path: 'csit/archive' @@ -574,6 +580,9 @@ project-type: freestyle node: '{os}-builder-4c-4g' concurrent: true + archive-artifacts: '**/csit/archive/*.*' + latest-only: false + build-discarder: daysToKeep: '{build-days-to-keep}' @@ -590,6 +599,10 @@ os: '{os}' - repo-name-parameter: repo-name: '{repo-stream-part}.ubuntu.xenial.main' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -612,10 +625,6 @@ !include-raw-escape: include-raw-nsh_sfc-csit-functional-virl.sh publishers: - - archive-artifacts: - artifacts: 'csit/archive/*.*' - latest-only: false - - robot-report: output-path: 'csit/archive' diff --git a/jjb/opflexvpp/opflexvpp.yaml b/jjb/opflexvpp/opflexvpp.yaml new file mode 100644 index 000000000..0fbb6d98c --- /dev/null +++ b/jjb/opflexvpp/opflexvpp.yaml @@ -0,0 +1,6 @@ +--- +- project: + name: opflexvpp-project-view + project-name: opflexvpp + views: + - project-view diff --git a/jjb/vpp/include-raw-vpp-commitmsg.sh b/jjb/vpp/include-raw-vpp-commitmsg.sh new file mode 100644 index 000000000..d926ff5dd --- /dev/null +++ b/jjb/vpp/include-raw-vpp-commitmsg.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +if [ -f extras/scripts/check_commit_msg.sh ];then + echo "Running extras/scripts/check_commit_msg.sh" + extras/scripts/check_commit_msg.sh +else + echo "Cannot find cat extras/scripts/check_commit_msg.sh - skipping commit message check" +fi diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 3f54c0461..5ac0534f8 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -756,6 +756,8 @@ !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: !include-raw-escape: include-raw-vpp-test-checkstyle.sh + - shell: + !include-raw-escape: include-raw-vpp-commitmsg.sh publishers: - fdio-infra-shiplogs: |