diff options
| -rw-r--r-- | jjb/cicn/cicn.yaml | 16 | ||||
| -rw-r--r-- | jjb/csit/include-raw-csit-perf-verify.sh | 4 | ||||
| -rw-r--r-- | jjb/global-defaults.yaml | 2 | ||||
| -rw-r--r-- | jjb/nsh_sfc/nsh_sfc.yaml | 4 | ||||
| -rw-r--r-- | jjb/sweetcomb/sweetcomb.yaml | 59 | ||||
| -rw-r--r-- | jjb/vpp/include-gcc8-prefer.sh | 2 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 64 |
7 files changed, 107 insertions, 44 deletions
diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml index 7f6054910..2cff11d3c 100644 --- a/jjb/cicn/cicn.yaml +++ b/jjb/cicn/cicn.yaml @@ -449,7 +449,7 @@ name: 'cicn-longbow-docs-merge-{stream}' project-type: freestyle - node: '{os}-builder-8c-32g' + node: 'ubuntu1604-builder-8c-32g' concurrent: true build-discarder: @@ -463,8 +463,6 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - os-parameter: - os: 'ubuntu1604' - maven-exec: maven-version: 'mvn33-new' @@ -528,7 +526,7 @@ name: 'cicn-longbow-docs-verify-{stream}' project-type: freestyle - node: '{os}-builder-8c-32g' + node: 'ubuntu1604-builder-8c-32g' concurrent: true build-discarder: @@ -542,8 +540,6 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - os-parameter: - os: 'ubuntu1604' - maven-exec: maven-version: 'mvn33-new' @@ -735,7 +731,7 @@ name: 'cicn-libparc-docs-merge-{stream}' project-type: freestyle - node: '{os}-builder-8c-32g' + node: 'ubuntu1604-builder-8c-32g' concurrent: true build-discarder: @@ -749,8 +745,6 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - os-parameter: - os: 'ubuntu1604' - maven-exec: maven-version: 'mvn33-new' @@ -814,7 +808,7 @@ name: 'cicn-libparc-docs-verify-{stream}' project-type: freestyle - node: '{os}-builder-8c-32g' + node: 'ubuntu1604-builder-8c-32g' concurrent: true build-discarder: @@ -828,8 +822,6 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - os-parameter: - os: 'ubuntu1604' - maven-exec: maven-version: 'mvn33-new' diff --git a/jjb/csit/include-raw-csit-perf-verify.sh b/jjb/csit/include-raw-csit-perf-verify.sh index 67007c4e6..b5026f4cd 100644 --- a/jjb/csit/include-raw-csit-perf-verify.sh +++ b/jjb/csit/include-raw-csit-perf-verify.sh @@ -8,6 +8,10 @@ if [[ ${GERRIT_EVENT_TYPE} == 'comment-added' ]]; then else TRIGGER='' fi + +# grep to see where minion is running +grep search /etc/resolv.conf || true + # Export test tags as string. export TEST_TAG_STRING=${TRIGGER#$"perftest"} diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index ea8bd7603..68cbbf1b6 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -1,3 +1,4 @@ +--- # GLOBAL jenkins defaults - defaults: @@ -15,6 +16,7 @@ gerrit-server-name: Primary jenkins-ssh-credential: jenkins-gerrit-credentials lftools-version: <1.0.0 + archive-artifacts: '' # fd.io branch defaults branch: master diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml index 0f53c4ba3..49c8f18f5 100644 --- a/jjb/nsh_sfc/nsh_sfc.yaml +++ b/jjb/nsh_sfc/nsh_sfc.yaml @@ -384,7 +384,7 @@ name: 'nsh_sfc-verify-docs-{stream}' project-type: freestyle - node: '{os}-builder-4c-4g' + node: ubuntu1604-builder-4c-4g concurrent: true jdk: openjdk8-ubuntu1604 @@ -399,8 +399,6 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - os-parameter: - os: 'ubuntu1604' - maven-exec: maven-version: 'mvn33-new' diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml index c7df3a186..64be1fd3b 100644 --- a/jjb/sweetcomb/sweetcomb.yaml +++ b/jjb/sweetcomb/sweetcomb.yaml @@ -58,6 +58,14 @@ artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' + archive-artifacts: > + **/build-root/build-package/*.rpm + **/build-root/build-package/*.deb + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + parameters: - project-parameter: project: '{project}' @@ -69,6 +77,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: @@ -103,14 +115,6 @@ !include-raw-escape: - include-raw-sweetcomb-build.sh publishers: - - archive: - artifacts: > - **/build-root/build-package/*.rpm, - **/build-root/build-package/*.deb, - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: @@ -118,10 +122,6 @@ max-failed-builds: 1 fixed-delay: 90 - publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' - - job-template: name: 'sweetcomb-merge-{stream}-{os}' @@ -134,6 +134,14 @@ artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' + archive-artifacts: > + **/build-root/build-package/*.rpm + **/build-root/build-package/*.deb + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + parameters: - project-parameter: project: '{project}' @@ -145,6 +153,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: @@ -179,14 +191,6 @@ !include-raw-escape: - ../scripts/packagecloud_push.sh publishers: - - archive: - artifacts: > - **/build-root/build-package/*.rpm, - **/build-root/build-package/*.deb, - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: @@ -207,6 +211,12 @@ artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' + archive-artifacts: > + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + parameters: - project-parameter: project: '{project}' @@ -248,18 +258,9 @@ - include-raw-sweetcomb-build.sh - include-raw-sweetcomb-test.sh publishers: - - archive: - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 - - publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' diff --git a/jjb/vpp/include-gcc8-prefer.sh b/jjb/vpp/include-gcc8-prefer.sh new file mode 100644 index 000000000..6de4beb40 --- /dev/null +++ b/jjb/vpp/include-gcc8-prefer.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 700 --slave /usr/bin/g++ g++ /usr/bin/g++-7 && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 9a8fb0502..3f54c0461 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -85,6 +85,7 @@ name: vpp-master-only jobs: - 'vpp-beta-verify-{stream}-{os}' + - 'vpp-beta-verify-gcc8-{stream}-{os}' - 'vpp-beta-merge-{stream}-{os}' project: 'vpp' stream: @@ -208,6 +209,69 @@ fixed-delay: 90 - job-template: + name: 'vpp-beta-verify-gcc8-{stream}-{os}' + + project-type: freestyle + node: '{os}-us' + concurrent: true + triggers: + - gerrit-trigger-checkstyle-nonvoting: + name: '{project}' + branch: '{branch}' + + build-discarder: + daysToKeep: '{build-days-to-keep}' + numToKeep: 100 + 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}' + - stream-parameter: + stream: '{stream}' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '75' + + builders: + - shell: + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: + !include-raw-escape: + - include-gcc8-prefer.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' + +- job-template: name: 'vpp-beta-merge-{stream}-{os}' project-type: freestyle |