summaryrefslogtreecommitdiffstats
path: root/jjb/vpp
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/vpp')
-rw-r--r--jjb/vpp/docs.yaml78
-rw-r--r--jjb/vpp/include-raw-vpp-arm-build.sh1
-rw-r--r--jjb/vpp/include-raw-vpp-clang-build.sh2
-rw-r--r--jjb/vpp/include-raw-vpp-coverity.sh32
-rw-r--r--jjb/vpp/include-raw-vpp-docs.sh1
-rw-r--r--jjb/vpp/include-raw-vpp-make-test-docs.sh1
-rw-r--r--jjb/vpp/include-raw-vpp-sphinx-docs.sh1
-rw-r--r--jjb/vpp/vpp.yaml180
8 files changed, 181 insertions, 115 deletions
diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 74f293041..72a064788 100644
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -9,8 +9,8 @@
project: 'vpp'
os:
- - ubuntu1604:
- repo-os-part: 'ubuntu.xenial.main'
+ - ubuntu1804:
+ repo-os-part: 'ubuntu.bionic.main'
stream:
- master:
@@ -38,8 +38,8 @@
project: 'vpp'
os:
- - ubuntu1604:
- repo-os-part: 'ubuntu.xenial.main'
+ - ubuntu1804:
+ repo-os-part: 'ubuntu.bionic.main'
stream:
- master:
@@ -53,7 +53,7 @@
name: 'vpp-docs-verify-{stream}'
project-type: freestyle
- node: ubuntu1604-us
+ node: ubuntu1804-us
concurrent: true
allow-empty: 'true'
fingerprint: false
@@ -73,7 +73,7 @@
- gerrit-parameter:
branch: '{branch}'
- os-parameter:
- os: 'ubuntu1604'
+ os: 'ubuntu1804'
- maven-exec:
maven-version: 'mvn33-new'
- stream-parameter:
@@ -111,18 +111,17 @@
!include-raw-escape: include-raw-vpp-docs.sh
publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
- - naginator:
- rerun-unstable-builds: false
- max-failed-builds: 1
- fixed-delay: 90
+ - lf-infra-publish
+ - naginator:
+ rerun-unstable-builds: false
+ max-failed-builds: 1
+ fixed-delay: 90
- job-template:
name: 'vpp-docs-merge-{stream}'
project-type: freestyle
- node: ubuntu1604-us
+ node: ubuntu1804-us
concurrent: false
archive-artifacts: '**/build-root/docs/html/*'
allow-empty: 'true'
@@ -143,7 +142,7 @@
- gerrit-parameter:
branch: '{branch}'
- os-parameter:
- os: 'ubuntu1604'
+ os: 'ubuntu1804'
- maven-exec:
maven-version: 'mvn33-new'
- stream-parameter:
@@ -164,7 +163,7 @@
triggers:
- reverse:
- jobs: 'vpp-merge-{stream}-ubuntu1604'
+ jobs: 'vpp-merge-{stream}-ubuntu1804'
result: 'success'
- gerrit:
server-name: 'Primary'
@@ -200,8 +199,7 @@
!include-raw-escape: include-raw-vpp-docs.sh
publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ - lf-infra-publish
- naginator:
rerun-unstable-builds: false
max-failed-builds: 1
@@ -211,7 +209,7 @@
name: 'vpp-sphinx-docs-verify-{stream}'
project-type: freestyle
- node: ubuntu1604-us
+ node: ubuntu1804-us
concurrent: true
allow-empty: 'true'
fingerprint: false
@@ -230,7 +228,7 @@
- gerrit-parameter:
branch: '{branch}'
- os-parameter:
- os: 'ubuntu1604'
+ os: 'ubuntu1804'
- maven-exec:
maven-version: 'mvn33-new'
- stream-parameter:
@@ -280,18 +278,17 @@
!include-raw-escape: include-raw-vpp-sphinx-docs.sh
publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
- - naginator:
- rerun-unstable-builds: false
- max-failed-builds: 1
- fixed-delay: 90
+ - lf-infra-publish
+ - naginator:
+ rerun-unstable-builds: false
+ max-failed-builds: 1
+ fixed-delay: 90
- job-template:
name: 'vpp-sphinx-docs-merge-{stream}'
project-type: freestyle
- node: ubuntu1604-us
+ node: ubuntu1804-us
concurrent: false
archive-artifacts: 'docs/_build/html/*'
allow-empty: 'true'
@@ -311,7 +308,7 @@
- gerrit-parameter:
branch: '{branch}'
- os-parameter:
- os: 'ubuntu1604'
+ os: 'ubuntu1804'
- maven-exec:
maven-version: 'mvn33-new'
- stream-parameter:
@@ -360,18 +357,17 @@
!include-raw-escape: include-raw-vpp-sphinx-docs.sh
publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
- - naginator:
- rerun-unstable-builds: false
- max-failed-builds: 1
- fixed-delay: 90
+ - lf-infra-publish
+ - naginator:
+ rerun-unstable-builds: false
+ max-failed-builds: 1
+ fixed-delay: 90
- job-template:
name: 'vpp-make-test-docs-verify-{stream}'
project-type: freestyle
- node: ubuntu1604-us
+ node: ubuntu1804-us
concurrent: true
allow-empty: 'true'
fingerprint: false
@@ -390,7 +386,7 @@
- gerrit-parameter:
branch: '{branch}'
- os-parameter:
- os: 'ubuntu1604'
+ os: 'ubuntu1804'
- maven-exec:
maven-version: 'mvn33-new'
- stream-parameter:
@@ -428,8 +424,7 @@
!include-raw-escape: include-raw-vpp-make-test-docs.sh
publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ - lf-infra-publish
- naginator:
rerun-unstable-builds: false
max-failed-builds: 1
@@ -439,7 +434,7 @@
name: 'vpp-make-test-docs-merge-{stream}'
project-type: freestyle
- node: ubuntu1604-us
+ node: ubuntu1804-us
concurrent: false
archive-artifacts: '**/test/doc/build/html/*'
allow-empty: 'true'
@@ -460,7 +455,7 @@
- gerrit-parameter:
branch: '{branch}'
- os-parameter:
- os: 'ubuntu1604'
+ os: 'ubuntu1804'
- maven-exec:
maven-version: 'mvn33-new'
- stream-parameter:
@@ -482,7 +477,7 @@
triggers:
- reverse:
- jobs: 'vpp-merge-{stream}-ubuntu1604'
+ jobs: 'vpp-merge-{stream}-ubuntu1804'
result: 'success'
- gerrit:
server-name: 'Primary'
@@ -518,8 +513,7 @@
!include-raw-escape: include-raw-vpp-make-test-docs.sh
publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
+ - lf-infra-publish
- naginator:
rerun-unstable-builds: false
max-failed-builds: 1
diff --git a/jjb/vpp/include-raw-vpp-arm-build.sh b/jjb/vpp/include-raw-vpp-arm-build.sh
index 906e18584..9de736ae0 100644
--- a/jjb/vpp/include-raw-vpp-arm-build.sh
+++ b/jjb/vpp/include-raw-vpp-arm-build.sh
@@ -44,7 +44,6 @@ if (git log --oneline | grep 37682e1 > /dev/null 2>&1) && \
[ "x${IS_CSIT_VPP_JOB}" != "xTrue" ]
then
echo "Building using \"make verify\""
- sed -i '33i\ \ DEPENDS api_headers' src/vat/CMakeLists.txt
[ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes verify SKIP_AARCH64=yes
else
echo "Building using \"make build-root/vagrant/build.sh\""
diff --git a/jjb/vpp/include-raw-vpp-clang-build.sh b/jjb/vpp/include-raw-vpp-clang-build.sh
index 5039d5c30..b1bed417b 100644
--- a/jjb/vpp/include-raw-vpp-clang-build.sh
+++ b/jjb/vpp/include-raw-vpp-clang-build.sh
@@ -29,7 +29,7 @@ echo "sha1sum of this script: ${0}"
sha1sum $0
make UNATTENDED=yes install-dep
-make UNATTENDED=yes dpdk-install-dev
+make UNATTENDED=yes install-ext-deps
make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp_clang CC=clang CXX=clang install-packages
make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp_clang CC=clang CXX=clang sample-plugin-install
make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp_clang CC=clang CXX=clang libmemif-install
diff --git a/jjb/vpp/include-raw-vpp-coverity.sh b/jjb/vpp/include-raw-vpp-coverity.sh
new file mode 100644
index 000000000..47a316a89
--- /dev/null
+++ b/jjb/vpp/include-raw-vpp-coverity.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+FILE="scan.txt"
+OUTPUT="output.txt"
+
+wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+dpkg -i google-chrome-stable_current_amd64.deb || true
+apt-get install -f -y
+
+google-chrome --headless --disable-gpu -dump-dom --no-sandbox https://scan.coverity.com/projects/fd-io-vpp > $FILE
+
+grep -i '<dt>Newly detected</dt>' $FILE || exit 42
+
+NEW=$(grep -i -B 1 '<dt>Newly detected</dt>' $FILE | grep -Eo '[0-9]{1,4}')
+ELIM=$(grep -i -B 1 '<dt>Eliminated</dt>' $FILE | grep -Eo '[0-9]{1,4}')
+OUT=$(grep -i -B 1 '<dt>Outstanding</dt>' $FILE | grep -Eo '[0-9]{1,4}')
+
+#ls -lg $FILE
+#cat $FILE
+
+if [ "${OUT}" == "0" ]; then
+ echo 'Current outstanding issues are zero' > $OUTPUT
+ echo "Newly detected: $NEW" >> $OUTPUT
+ echo "Eliminated: $ELIM" >> $OUTPUT
+ echo "More details can be found at https://scan.coverity.com/projects/fd-io-vpp/view_defects" >> $OUTPUT
+else
+ echo "Current number of outstanding issues are $OUT Failing job"
+ echo "Current number of outstanding issues are $OUT" > $OUTPUT
+ echo "Newly detected: $NEW" >> $OUTPUT
+ echo "Eliminated: $ELIM" >> $OUTPUT
+ echo "More details can be found at https://scan.coverity.com/projects/fd-io-vpp/view_defects" >> $OUTPUT
+ exit 1
+fi
diff --git a/jjb/vpp/include-raw-vpp-docs.sh b/jjb/vpp/include-raw-vpp-docs.sh
index 760eaea06..c0bebf330 100644
--- a/jjb/vpp/include-raw-vpp-docs.sh
+++ b/jjb/vpp/include-raw-vpp-docs.sh
@@ -33,7 +33,6 @@ if [[ ${JOB_NAME} == *merge* ]]; then
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>2.9</version>
</extension>
</extensions>
</build>
diff --git a/jjb/vpp/include-raw-vpp-make-test-docs.sh b/jjb/vpp/include-raw-vpp-make-test-docs.sh
index 9860e00bb..6938cddbd 100644
--- a/jjb/vpp/include-raw-vpp-make-test-docs.sh
+++ b/jjb/vpp/include-raw-vpp-make-test-docs.sh
@@ -32,7 +32,6 @@ if [[ ${JOB_NAME} == *merge* ]]; then
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>2.9</version>
</extension>
</extensions>
</build>
diff --git a/jjb/vpp/include-raw-vpp-sphinx-docs.sh b/jjb/vpp/include-raw-vpp-sphinx-docs.sh
index 4d14e7a94..357e78078 100644
--- a/jjb/vpp/include-raw-vpp-sphinx-docs.sh
+++ b/jjb/vpp/include-raw-vpp-sphinx-docs.sh
@@ -33,7 +33,6 @@ if [[ ${JOB_NAME} == *merge* ]]; then
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>2.9</version>
</extension>
</extensions>
</build>
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index dc1672e75..a866115bd 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -30,6 +30,7 @@
name: vpp-clang
jobs:
- 'vpp-verify-{stream}-clang'
+ - 'vpp-coverity-{stream}'
project: 'vpp'
os:
@@ -63,7 +64,7 @@
- '1908':
branch: 'stable/1908'
repo-stream-part: 'stable.1908'
- os: ubuntu1604
+ os: ubuntu1804
- project:
name: vpp-perpatch
@@ -181,16 +182,7 @@
project-type: freestyle
node: '{os}-us'
concurrent: true
- archive-artifacts: >
- **/build-root/*.rpm
- **/build-root/*.deb
- **/dpdk/*.rpm
- **/dpdk/*.deb
- **/tmp/vpp-failed-unittests/*/* **/core
- allow-empty: 'true'
- fingerprint: false
- only-if-success: true
- default-excludes: false
+ archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
triggers:
- gerrit-trigger-checkstyle:
@@ -250,15 +242,6 @@
project-type: freestyle
node: '{os}-us'
- archive-artifacts: >
- **/build-root/*.rpm
- **/build-root/*.deb
- **/dpdk/*.rpm
- **/dpdk/*.deb
- allow-empty: 'true'
- fingerprint: false
- only-if-success: true
- default-excludes: false
build-discarder:
daysToKeep: '{build-days-to-keep}'
@@ -333,15 +316,7 @@
project-type: freestyle
node: '{os}arm-us'
concurrent: true
- archive-artifacts: >
- **/build-root/*.rpm
- **/build-root/*.deb
- **/dpdk/*.rpm
- **/dpdk/*.deb
- allow-empty: 'true'
- fingerprint: false
- only-if-success: true
- default-excludes: false
+ archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
build-discarder:
daysToKeep: '{build-days-to-keep}'
@@ -392,7 +367,6 @@
publishers:
- fdio-infra-shiplogs:
maven-version: 'mvn36'
- archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
- naginator:
rerun-unstable-builds: false
max-failed-builds: 1
@@ -403,15 +377,6 @@
project-type: freestyle
node: '{os}arm-m'
- archive-artifacts: >
- **/build-root/*.rpm
- **/build-root/*.deb
- **/dpdk/*.rpm
- **/dpdk/*.deb
- allow-empty: 'true'
- fingerprint: false
- only-if-success: true
- default-excludes: false
build-discarder:
daysToKeep: '{build-days-to-keep}'
@@ -488,6 +453,7 @@
project-type: freestyle
node: '{os}-us'
concurrent: true
+ archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
build-discarder:
daysToKeep: '{build-days-to-keep}'
@@ -503,7 +469,7 @@
- os-parameter:
os: '{os}'
- repo-name-parameter:
- repo-name: '{repo-stream-part}.ubuntu.xenial.main'
+ repo-name: '{repo-stream-part}.ubuntu.bionic.main'
scm:
- gerrit-trigger-scm:
@@ -577,7 +543,6 @@
publishers:
- fdio-infra-shiplogs:
maven-version: 'mvn36'
- archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
- naginator:
rerun-unstable-builds: true
max-failed-builds: 1
@@ -589,15 +554,7 @@
project-type: freestyle
node: '{os}-us'
concurrent: true
- archive-artifacts: >
- **/build-root/*.rpm
- **/build-root/*.deb
- **/dpdk/*.rpm
- **/dpdk/*.deb
- allow-empty: 'true'
- fingerprint: false
- only-if-success: true
- default-excludes: false
+ archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
build-discarder:
daysToKeep: '{build-days-to-keep}'
@@ -647,7 +604,6 @@
publishers:
- fdio-infra-shiplogs:
maven-version: 'mvn36'
- archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
- naginator:
rerun-unstable-builds: false
max-failed-builds: 2
@@ -659,6 +615,7 @@
project-type: freestyle
node: 'ubuntu1804-us'
concurrent: true
+ archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
build-discarder:
daysToKeep: '{build-days-to-keep}'
@@ -672,7 +629,7 @@
- gerrit-parameter:
branch: '{branch}'
- os-parameter:
- os: 'ubuntu1604'
+ os: 'ubuntu1804'
- repo-name-parameter:
repo-name: '{repo-stream-part}.ubuntu.bionic.main'
- stream-parameter:
@@ -704,26 +661,115 @@
publishers:
- fdio-infra-shiplogs:
maven-version: 'mvn36'
- archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
- naginator:
rerun-unstable-builds: false
max-failed-builds: 1
fixed-delay: 90
- job-template:
+ name: 'vpp-coverity-{stream}'
+
+ project-type: freestyle
+ node: 'ubuntu1804-us'
+ concurrent: true
+ archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
+
+ 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}'
+ - gerrit-parameter:
+ branch: '{branch}'
+ - os-parameter:
+ os: 'ubuntu1804'
+ - repo-name-parameter:
+ repo-name: '{repo-stream-part}.ubuntu.bionic.main'
+ - stream-parameter:
+ stream: '{stream}'
+
+ scm:
+ - gerrit-trigger-scm:
+ credentials-id: 'jenkins-gerrit-credentials'
+ refspec: ''
+ choosing-strategy: 'gerrit'
+
+ wrappers:
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ - timed: '0 14 * * *'
+
+ builders:
+ - shell:
+ command: !include-raw-escape: include-raw-vpp-coverity.sh
+ unstable-return: 42
+
+ publishers:
+ - email-ext:
+ # yamllint disable-line rule:line-length
+ recipients: 'ejk@cisco.com'
+ reply-to: ''
+ content-type: 'text'
+ subject: 'Coverity run passing as of $BUILD_TIMESTAMP'
+ # yamllint disable-line rule:line-length
+ body: |
+ Coverity run passing.
+
+ ${{FILE,path="output.txt"}}
+ failure: false
+ success: true
+ - email-ext:
+ # yamllint disable-line rule:line-length
+ recipients: 'ejk@cisco.com'
+ reply-to: ''
+ content-type: 'text'
+ subject: 'Coverity run UNSTABLE as of $BUILD_TIMESTAMP'
+ # yamllint disable-line rule:line-length
+ body: |
+ Coverity run UNSTABLE.
+
+ Something went wrong with daily scan.
+ failure: false
+ unstable: true
+ - email-ext:
+ # yamllint disable-line rule:line-length
+ recipients: 'vpp-dev@lists.fd.io, ejk@cisco.com'
+ reply-to: ''
+ content-type: 'text'
+ subject: 'Coverity run FAILED as of $BUILD_TIMESTAMP'
+ # yamllint disable-line rule:line-length
+ body: |
+ Coverity run failed today.
+
+ ${{FILE,path="output.txt"}}
+ failure: true
+ - email-ext:
+ # yamllint disable-line rule:line-length
+ recipients: 'vpp-dev@lists.fd.io, ejk@cisco.com'
+ reply-to: ''
+ content-type: 'text'
+ subject: 'Coverity run as of $BUILD_TIMESTAMP'
+ # yamllint disable-line rule:line-length
+ body: |
+ Coverity run fixed today.
+
+ ${{FILE,path="output.txt"}}
+ failure: false
+ fixed: true
+ - fdio-infra-shiplogs:
+ maven-version: 'mvn36'
+
+- job-template:
name: 'vpp-merge-{stream}-{os}'
project-type: freestyle
node: '{os}-us'
- archive-artifacts: >
- **/build-root/*.rpm
- **/build-root/*.deb
- **/dpdk/*.rpm
- **/dpdk/*.deb
- allow-empty: 'true'
- fingerprint: false
- only-if-success: true
- default-excludes: false
build-discarder:
daysToKeep: '{build-days-to-keep}'
@@ -832,9 +878,6 @@
name: ARCHIVE_ARTIFACTS
default: '{archive-artifacts}'
description: Artifacts to archive to the logs server.
- # The API CRC job fails on mismatch, we hunt for real incompatibilities.
- - csit-fail-on-crc-mismatch-parameter:
- fail-on-crc-mismatch: 'False'
scm:
- gerrit-trigger-scm:
@@ -913,9 +956,6 @@
name: ARCHIVE_ARTIFACTS
default: '{archive-artifacts}'
description: Artifacts to archive to the logs server.
- # The API CRC job fails on mismatch, try compare API versions if possible.
- - csit-fail-on-crc-mismatch-parameter:
- fail-on-crc-mismatch: 'False'
scm:
- gerrit-trigger-scm:
@@ -976,6 +1016,10 @@
name: ARCHIVE_ARTIFACTS
default: '{archive-artifacts}'
description: Artifacts to archive to the logs server.
+ # Not sure whether not failing has any useful usage,
+ # but it does not hurt to have some flexibility for future.
+ - csit-fail-on-crc-mismatch-parameter:
+ fail-on-crc-mismatch: 'True'
scm:
- gerrit-trigger-scm: