diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/global-macros.yaml | 31 | ||||
| -rw-r--r-- | jjb/hicn/hicn-docs.yaml | 2 | ||||
| -rw-r--r-- | jjb/hicn/hicn.yaml | 14 | ||||
| -rw-r--r-- | jjb/scripts/vpp/build.sh | 3 | ||||
| -rw-r--r-- | jjb/scripts/vpp/debug-build.sh | 3 | ||||
| -rw-r--r-- | jjb/scripts/vpp/dpdk-rdma-version-mismatch.sh | 33 | ||||
| -rw-r--r-- | jjb/scripts/vpp/gcc-build.sh | 3 | ||||
| -rwxr-xr-x | jjb/tldk/include-raw-build.sh | 4 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 84 |
9 files changed, 157 insertions, 20 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index ad10825b3..c2c24ca13 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -703,6 +703,37 @@ success: true - publisher: + name: vpp-dpdk-rdma-version-mismatch + publishers: + - email-ext: + # NOTE: noreply@jenkins.fd.io must be a member of vpp-build@lists.fd.io + # for the email to be distributed to the group members. + # yamllint disable-line rule:line-length + recipients: 'vpp-build@lists.fd.io' + reply-to: '' + content-type: 'text' + subject: '{branch}: vpp-dpdk-rdma-version-mismatch job failed!' + # yamllint disable-line rule:line-length + body: | + Build $BUILD_NUMBER of $JOB_NAME failed. + Check $BUILD_URL + console log to see if the job failed due to a package version mismatch or + a CI infra issue. If the failure was due to a CI infra issue, then + there is nothing else to be done. + + However, if there was a package version mismatch, then the MLX driver + is NOT being built in the VPP DPDK library. Please push a gerrit change + with the updated package version(s) in the version matrix file, resolve + any build issues, and merge the change to re-enable the building of the + MLX DPDK driver in the VPP DPDK library. + + Thanks, + The VPP Build Maintainers + + failure: true + success: false + +- publisher: name: email-notification publishers: - email-ext: diff --git a/jjb/hicn/hicn-docs.yaml b/jjb/hicn/hicn-docs.yaml index 4423af867..89fb9fcc7 100644 --- a/jjb/hicn/hicn-docs.yaml +++ b/jjb/hicn/hicn-docs.yaml @@ -54,7 +54,7 @@ build-timeout: "{build-timeout}" triggers: - - gerrit-trigger-checkstyle: + - gerrit-trigger-checkstyle-nonvoting: name: "{project}" branch: "{branch}" diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml index 000e9e57d..ab41a8a34 100644 --- a/jjb/hicn/hicn.yaml +++ b/jjb/hicn/hicn.yaml @@ -279,9 +279,6 @@ branches: - branch-compare-type: "ANT" branch-pattern: "**/{branch}" - override-votes: true - gerrit-build-notbuilt-verified-value: 0 - gerrit-build-successful-verified-value: 1 # yamllint disable-line rule:line-length notbuilt-message: "Automatic retry of failed jobs may be in process. A proper vote should be set when retry completes." # yamllint disable-line rule:line-length @@ -289,9 +286,14 @@ successful-message: "build_success-{stream}-{os}-{executor-arch}" skip-vote: successful: true - failed: false - unstable: false - notbuilt: false + failed: true + unstable: true + notbuilt: true + override-votes: true + gerrit-build-successful-verified-value: 1 + gerrit-build-failed-verified-value: 1 + gerrit-build-unstable-verified-value: 1 + gerrit-build-notbuilt-verified-value: 1 builders: - shell: !include-raw-escape: diff --git a/jjb/scripts/vpp/build.sh b/jjb/scripts/vpp/build.sh index 3ee4748da..34d16d494 100644 --- a/jjb/scripts/vpp/build.sh +++ b/jjb/scripts/vpp/build.sh @@ -40,9 +40,6 @@ BUILD_RESULT="SUCCESSFULLY COMPLETED" BUILD_ERROR="" RETVAL="0" -echo "sha1sum of this script: ${0}" -sha1sum $0 - if [ -n "${MAKE_PARALLEL_FLAGS}" ] ; then echo "Building VPP. Number of cores for build set with" \ "MAKE_PARALLEL_FLAGS='${MAKE_PARALLEL_FLAGS}'." diff --git a/jjb/scripts/vpp/debug-build.sh b/jjb/scripts/vpp/debug-build.sh index ea742fb24..6d9fabcb9 100644 --- a/jjb/scripts/vpp/debug-build.sh +++ b/jjb/scripts/vpp/debug-build.sh @@ -27,9 +27,6 @@ BUILD_RESULT="SUCCESSFULLY COMPLETED" BUILD_ERROR="" RETVAL="0" -echo "sha1sum of this script: ${0}" -sha1sum $0 - # run with ASAN on # disable ASAN for now in the debug build - it's broken with PAPI # in make test transitioning to unix sockets diff --git a/jjb/scripts/vpp/dpdk-rdma-version-mismatch.sh b/jjb/scripts/vpp/dpdk-rdma-version-mismatch.sh new file mode 100644 index 000000000..b2248064b --- /dev/null +++ b/jjb/scripts/vpp/dpdk-rdma-version-mismatch.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +# Copyright (c) 2022 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +echo "---> jjb/scripts/vpp/dpdk-rdma-version-mismatch.sh" + +set -euxo pipefail + +line="*************************************************************************" +EXTERNAL_BUILD_DIR="$WORKSPACE/build/external" +RETVAL="0" +MISMATCH_RESULT="INCLUDED IN" + +make -C "$EXTERNAL_BUILD_DIR" build-deb +source "$EXTERNAL_BUILD_DIR/dpdk_mlx_default.sh" || true + +if [ "${DPDK_MLX_DEFAULT-}" = "n" ] ; then + MISMATCH_RESULT="MISSING FROM" + RETVAL="1" +fi +echo -e "\n$line\n* MLX DPDK DRIVER $MISMATCH_RESULT VPP-EXT-DEPS PACKAGE\n$line\n" +exit $RETVAL diff --git a/jjb/scripts/vpp/gcc-build.sh b/jjb/scripts/vpp/gcc-build.sh index 48877457b..1d8160047 100644 --- a/jjb/scripts/vpp/gcc-build.sh +++ b/jjb/scripts/vpp/gcc-build.sh @@ -25,9 +25,6 @@ DRYRUN="${DRYRUN:-}" BUILD_RESULT="SUCCESSFULLY COMPLETED" BUILD_ERROR="" RETVAL="0" - -echo "sha1sum of this script: ${0}" -sha1sum $0 export CC=gcc make_build_release_build_test_gcov_sanity() { diff --git a/jjb/tldk/include-raw-build.sh b/jjb/tldk/include-raw-build.sh index d2baf0cf4..287e707cc 100755 --- a/jjb/tldk/include-raw-build.sh +++ b/jjb/tldk/include-raw-build.sh @@ -25,9 +25,6 @@ else echo "Cannot find /etc/bootstrap-functions.sha" fi -echo "sha1sum of this script: ${0}" -sha1sum $0 - # Make TLDK make @@ -55,4 +52,3 @@ then echo "* TLDK OFO/LOST SEGMENT TESTS SUCCESSFUL" echo "*****************************************************************" fi - diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 7cd11361a..cdda5bc07 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -153,6 +153,29 @@ # [end] VPP-DEBUG-X86_64 PROJECT +# VPP-DPDK-RDMA-VERSION-MISMATCH-X86_64 PROJECT +# +# Currently a periodic job due to intermittent failures. +# Limiting branches to master, since other branches +# may not get fixes for the intermittent failures. +# +- project: + name: vpp-dpdk-rdma-version-mismatch-x86_64 + jobs: + - 'vpp-dpdk-rdma-version-mismatch-{stream}-{os}-{executor-arch}' + project: 'vpp' + make-test-os: 'ubuntu-22.04' + comment-trigger-value: 'dpdk-rdma-version-mismatch' + stream: + - 'master': + branch: 'master' + # Once per day at 00:15 + periodicity: '15 0 * * 0-6' + os: 'ubuntu2204' + executor-arch: 'x86_64' + +# [end] VPP-DPDK-RDMA-VERSION-MISMATCH-X86_64 PROJECT + # VPP-GCC-X86_64 PROJECT - project: name: vpp-gcc-x86_64 @@ -617,6 +640,67 @@ - fdio-infra-publish # [end] VPP-DEBUG-VERIFY-PERIODIC JOB TEMPLATE +# VPP-DPDK-RDMA-VERSION-MISMATCH PERIODIC JOB TEMPLATE +- job-template: + name: 'vpp-dpdk-rdma-version-mismatch-{stream}-{os}-{executor-arch}' + + project-type: freestyle + node: 'builder-{os}-prod-{executor-arch}' + concurrent: true + + properties: + - lf-infra-properties: + build-days-to-keep: "{build-days-to-keep}" + + # Please keep parameters in alphabetical order + parameters: + - gerrit-parameter: + branch: '{branch}' + - make-parallel-jobs-parameter: + make-parallel-jobs: '{make-parallel-jobs}' + - make-test-os-parameter: + make-test-os: '{make-test-os}' + - os-parameter: + os: '{os}' + - project-parameter: + project: '{project}' + - stream-parameter: + stream: '{stream}' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '' + choosing-strategy: 'default' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - timed: '{periodicity}' + - gerrit-trigger-manually-triggered: + comment-trigger-value: '{comment-trigger-value}' + name: '{project}' + branch: '{branch}' + + builders: + - shell: + !include-raw-escape: + - ../scripts/setup_executor_env.sh + - shell: + !include-raw-escape: + - ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: + !include-raw-escape: + - ../scripts/vpp/dpdk-rdma-version-mismatch.sh + + publishers: + - vpp-dpdk-rdma-version-mismatch: + branch: '{branch}' + - fdio-infra-publish +# [end] VPP-DPDK-RDMA-VERSION-MISMATCH PERIODIC JOB TEMPLATE + # VPP-MERGE JOB TEMPLATE - job-template: name: 'vpp-merge-{stream}-{os}-{executor-arch}' |