diff options
| -rw-r--r-- | jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml | 1 | ||||
| -rw-r--r-- | jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml | 1 | ||||
| -rw-r--r-- | jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml | 1 | ||||
| -rw-r--r-- | jenkins-config/clouds/nomad/FDIONOMAD/main.yaml | 2 | ||||
| -rw-r--r-- | jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml | 2 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 17 | ||||
| -rw-r--r-- | jjb/hicn/hicn.yaml | 10 | ||||
| -rwxr-xr-x | jjb/scripts/post_build_deploy_archives.sh | 38 | ||||
| -rw-r--r-- | jjb/vpp/docs.yaml | 1 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 28 |
10 files changed, 54 insertions, 47 deletions
diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml index 7d4c78d9..cdb22abf 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-prod-aarch64.yaml @@ -4,3 +4,4 @@ templates: labels: "builder-ubuntu2004-prod-aarch64" prefix: "builder-ubuntu2004-prod-aarch64" hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache" + memory: 16000 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml index bfc87f2b..11f7c388 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-sandbox-aarch64.yaml @@ -4,3 +4,4 @@ templates: labels: "builder-ubuntu2004-sandbox-aarch64" prefix: "builder-ubuntu2004-sandbox-aarch64" hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache" + memory: 16000 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml index a277684d..a07af004 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/builder-ubuntu2004-test-aarch64.yaml @@ -4,3 +4,4 @@ templates: labels: "builder-ubuntu2004-test-aarch64" prefix: "builder-ubuntu2004-test-aarch64" hostVolumes: "/tmp/ccache.ubuntu2004:/scratch/ccache" + memory: 16000 diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/main.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/main.yaml index ca90d314..a099532b 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/main.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/main.yaml @@ -4,7 +4,7 @@ jenkins: - nomad: jenkinsUrl: "https://jenkins.fd.io/" name: "FDIONOMAD" - nomadUrl: "http://10.30.51.32:4646" + nomadUrl: "http://10.30.51.30:4646" jenkinsTunnel: "" prune: false nomadACLCredentialsId: "" diff --git a/jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml b/jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml index 45dd5e0f..61bafb9c 100644 --- a/jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml +++ b/jenkins-config/clouds/nomad/FDIONOMAD/sandbox.yaml @@ -4,7 +4,7 @@ jenkins: - nomad: jenkinsUrl: "https://jenkins.fd.io/sandbox" name: "FDIONOMAD" - nomadUrl: "http://10.30.51.32:4646" + nomadUrl: "http://10.30.51.30:4646" jenkinsTunnel: "" prune: false nomadACLCredentialsId: "" diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index dfcb815c..7cdf5556 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -203,14 +203,6 @@ name: TOPO default: '{topo}' description: "Topology parameter" - -- parameter: - name: workspace-archive-artifacts-parameter - parameters: - - string: - name: WS_ARCHIVE_ARTIFACTS - default: '{artifacts}' - description: "Artifacts to archive in $WORKSPACE/archives." # [end] Keep 'parameter' entries ordered alphabetically, please. #### SCMS @@ -710,6 +702,15 @@ max-failed-builds: 1 - publisher: + name: retry-build-on-git-clone-error + publishers: + - naginator: + max-failed-builds: 6 + progressive-delay-increment: 5 + progressive-delay-maximum: 180 + regular-expression: '.*Error cloning remote repo.*' + +- publisher: name: robot-report publishers: - robot: diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml index c3bc9107..93d3b9de 100644 --- a/jjb/hicn/hicn.yaml +++ b/jjb/hicn/hicn.yaml @@ -230,7 +230,7 @@ os: "{os}" - repo-name-parameter: repo-name: "{repo-stream-part}.ubuntu.bionic.main" - - workspace-archive-artifacts-parameter: + - archive-artifacts-parameter: artifacts: '{archive-artifacts}' scm: @@ -321,7 +321,7 @@ repo-name: "{repo-stream-part}.{repo-os-part}" - stream-parameter: stream: "{stream}" - - workspace-archive-artifacts-parameter: + - archive-artifacts-parameter: artifacts: '{archive-artifacts}' scm: @@ -379,7 +379,7 @@ stream: "{repository-name}" - repo-name-parameter: repo-name: "{repo-stream-part}.{repo-os-part}" - - workspace-archive-artifacts-parameter: + - archive-artifacts-parameter: artifacts: '{archive-artifacts}' scm: @@ -473,7 +473,7 @@ repo-name: "{repo-stream-part}.{repo-os-part}" - stream-parameter: stream: "{stream}" - - workspace-archive-artifacts-parameter: + - archive-artifacts-parameter: artifacts: '{archive-artifacts}' scm: @@ -539,7 +539,7 @@ stream: "hicn" - repo-name-parameter: repo-name: "{repo-stream-part}.{repo-os-part}" - - workspace-archive-artifacts-parameter: + - archive-artifacts-parameter: artifacts: '{archive-artifacts}' scm: diff --git a/jjb/scripts/post_build_deploy_archives.sh b/jjb/scripts/post_build_deploy_archives.sh index 79fa05a1..355d6fd4 100755 --- a/jjb/scripts/post_build_deploy_archives.sh +++ b/jjb/scripts/post_build_deploy_archives.sh @@ -48,6 +48,9 @@ STACKTRACE="" # Returns stacktrace filename in STACKTRACE generate_vpp_stacktrace_and_delete_core() { local corefile="$1" + echo "Uncompressing core file $file" + gunzip "$corefile" + corefile="${corefile::(-3)}" if grep -qe 'debug' <<< "$WORKSPACE" ; then local binfile="$WORKSPACE/build-root/install-vpp_debug-native/vpp/bin/vpp" else @@ -61,8 +64,9 @@ generate_vpp_stacktrace_and_delete_core() { echo "Removing core file: $corefile" rm -f "$corefile" # Dump stacktrace to console log - if [ -f $STACKTRACE ] ; then + if [ -f "$STACKTRACE" ] ; then echo -e "\n=====[ $STACKTRACE ]=====\n$(cat $STACKTRACE)\n=====[ $STACKTRACE ]=====\n" + gzip "$STACKTRACE" else echo "Stacktrace file not generated!" STACKTRACE="" @@ -77,30 +81,12 @@ env > $BUILD_ENV_LOG echo "ARCHIVE_ARTIFACTS = '$ARCHIVE_ARTIFACTS'" if [ -n "${ARCHIVE_ARTIFACTS:-}" ] ; then - pushd $WORKSPACE + pushd "$WORKSPACE" shopt -s globstar # Enable globstar to copy archives for file in $ARCHIVE_ARTIFACTS ; do if [ -f "$file" ] ; then - fname="$(basename $file)" - # Decompress core.gz file - if grep -qe '^core.*\.gz$' <<<"$fname" ; then - echo "Uncompressing core file $file" - gunzip "$file" - file="${file::(-3)}" - fi - # Convert core file to stacktrace - if [ "${fname::4}" = "core" ] ; then - generate_vpp_stacktrace_and_delete_core $file - [ -z "$STACKTRACE" ] && continue - file=$STACKTRACE - fi - # Set destination filename - if [ "${file::26}" = "/tmp/vpp-failed-unittests/" ] ; then - destfile=$WS_ARCHIVES_DIR${file:25} - else - destfile=$WS_ARCHIVE_DIR$file - fi echo "Archiving '$file' to '$destfile'" + destfile="$WS_ARCHIVE_DIR$file" destdir="$(dirname $destfile)" mkdir -p $destdir mv -f $file $destfile @@ -122,5 +108,15 @@ find $WS_ARCHIVES_DIR -type f -print0 \ | cut -d: -f1 \ | xargs -d'\n' -r gzip +# generate stack trace for VPP core files for upload instead of core file. +if [ -d "$WORKSPACE/build-root" ] ; then + for file in $(find $WS_ARCHIVES_DIR -type f -name 'core*.gz') ; do + generate_vpp_stacktrace_and_delete_core $file + done +fi + +# Remove any socket files in archive +find $WS_ARCHIVES_DIR -type s -exec rm -rf {} \; + echo "Workspace archived artifacts:" ls -alR $WS_ARCHIVES_DIR diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index eac0bc46..f58ee2a4 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -517,4 +517,5 @@ - ../scripts/vpp/make-test-docs.sh publishers: + - retry-build-on-git-clone-error - fdio-infra-publish diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 2f015d4b..a49a6324 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -70,7 +70,6 @@ project: 'vpp' make-parallel-jobs: '4' make-test-os: 'ubuntu-20.04' - archive-artifacts: '/tmp/vpp-failed-unittests/*/*' stream: - master: branch: 'master' @@ -127,7 +126,6 @@ project: 'vpp' make-parallel-jobs: '4' make-test-os: 'ubuntu-20.04' - archive-artifacts: '/tmp/vpp-failed-unittests/*/*' comment-trigger-value: 'debug-verify' stream: - master: @@ -191,7 +189,6 @@ project: 'vpp' make-parallel-jobs: '16' make-test-os: 'ubuntu-20.04' - archive-artifacts: '/tmp/vpp-failed-unittests/*/*' stream: - master: branch: 'master' @@ -388,6 +385,8 @@ # Please keep parameters in alphabetical order parameters: + - archive-artifacts-parameter: + artifacts: '{archive-artifacts}' - gerrit-parameter: branch: '{branch}' - gerrit-refspec-parameter: @@ -398,8 +397,6 @@ project: '{project}' - repo-name-parameter: repo-name: '{repo-stream-part}.ubuntu.bionic.main' - - workspace-archive-artifacts-parameter: - artifacts: '{archive-artifacts}' scm: - gerrit-trigger-scm: @@ -485,6 +482,7 @@ - ../scripts/vpp/commitmsg.sh publishers: + - retry-build-on-git-clone-error - fdio-infra-publish # [end] VPP-CHECKSTYLE-VERIFY JOB TEMPLATE @@ -505,6 +503,8 @@ # Please keep parameters in alphabetical order parameters: + - archive-artifacts-parameter: + artifacts: '{archive-artifacts}' - gerrit-parameter: branch: '{branch}' - gerrit-refspec-parameter: @@ -521,8 +521,6 @@ repo-name: '{repo-stream-part}.{repo-os-part}' - stream-parameter: stream: '{stream}' - - workspace-archive-artifacts-parameter: - artifacts: '{archive-artifacts}' scm: - gerrit-trigger-scm: @@ -554,6 +552,7 @@ - ../scripts/vpp/build.sh publishers: + - retry-build-on-git-clone-error - fdio-infra-publish # [end] VPP-VERIFY JOB TEMPLATE @@ -573,6 +572,8 @@ # Please keep parameters in alphabetical order parameters: + - archive-artifacts-parameter: + artifacts: '{archive-artifacts}' - gerrit-parameter: branch: '{branch}' - gerrit-refspec-parameter: @@ -589,8 +590,6 @@ repo-name: '{repo-stream-part}.ubuntu.bionic.main' - stream-parameter: stream: '{stream}' - - workspace-archive-artifacts-parameter: - artifacts: '{archive-artifacts}' scm: - gerrit-trigger-scm: @@ -624,6 +623,7 @@ - ../scripts/vpp/debug-build.sh publishers: + - retry-build-on-git-clone-error - fdio-infra-publish # [end] VPP-DEBUG-VERIFY-PERIODIC JOB TEMPLATE @@ -656,7 +656,7 @@ repo-name: '{repo-stream-part}.{repo-os-part}' - stream-parameter: stream: '{stream}' - - workspace-archive-artifacts-parameter: + - archive-artifacts-parameter: artifacts: '{archive-artifacts}' scm: @@ -704,6 +704,7 @@ - ../scripts/packagecloud_push.sh publishers: + - retry-build-on-git-clone-error - fdio-infra-publish # [end] VPP-MERGE JOB TEMPLATE @@ -737,7 +738,7 @@ repo-name: '{repo-stream-part}.{repo-os-part}' - stream-parameter: stream: '{stream}' - - workspace-archive-artifacts-parameter: + - archive-artifacts-parameter: artifacts: '{archive-artifacts}' scm: @@ -770,6 +771,7 @@ - ../scripts/vpp/gcc-build.sh publishers: + - retry-build-on-git-clone-error - fdio-infra-publish # [end] VPP-GCC-VERIFY JOB TEMPLATE @@ -858,6 +860,7 @@ - robot-report: output-path: 'archives' + - retry-build-on-git-clone-error - fdio-infra-publish # [end] VPP-CSIT-VERIFY-DEVICE-PERIODIC JOB TEMPLATE @@ -945,6 +948,7 @@ - robot-report: output-path: 'archives' + - retry-build-on-git-clone-error - fdio-infra-publish # [end] VPP-CSIT-VERIFY-DEVICE-PERPATCH JOB TEMPLATE @@ -1042,6 +1046,7 @@ - robot-report: output-path: 'csit_current/0/' + - retry-build-on-git-clone-error - fdio-infra-publish # [end] VPP-CSIT-VERIFY-PERF JOB TEMPLATE @@ -1106,6 +1111,7 @@ # TODO: Add sending e-mail notifications to vpp-api-dev@lists.fd.io publishers: + - retry-build-on-git-clone-error - fdio-infra-publish # [end] VPP-CSIT-VERIFY-API-CRC JOB TEMPLATE # [end] JOB TEMPLATE DEFINITIONS |