From: Ed Warnicke Date: Thu, 20 Oct 2016 15:46:59 +0000 (+0000) Subject: Merge "No-activity timeout for csit-perf jobs" X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=7ed988259acc8820b8aafdf96c7d0a2f28e6d33c;hp=fc94a46a65330a4b683a48b56135d18459f8058c;p=ci-management.git Merge "No-activity timeout for csit-perf jobs" --- diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml index fbce13ff2..226d77f91 100644 --- a/jjb/ci-management/ci-management-jobs.yaml +++ b/jjb/ci-management/ci-management-jobs.yaml @@ -26,14 +26,13 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - gerrit-trigger-patch-submitted: @@ -67,14 +66,13 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - gerrit-trigger-patch-merged: @@ -82,8 +80,10 @@ branch: '{branch}' builders: - - shell: - !include-raw-escape: include-raw-jjb-update.sh + - shell: | + pip freeze + jenkins-jobs --version + jenkins-jobs update --recursive --delete-old --workers 4 jjb/ - job-template: name: ci-management-verify-zuul @@ -100,14 +100,13 @@ scm: - zuul-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$ZUUL_REF' commit: '$ZUUL_COMMIT' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' builders: - shell: @@ -127,14 +126,13 @@ scm: - zuul-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' commit: 'origin/$ZUUL_BRANCH' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' builders: - shell: @@ -157,14 +155,13 @@ scm: - zuul-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$ZUUL_REF' commit: '$ZUUL_COMMIT' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' builders: - shell: @@ -184,14 +181,13 @@ scm: - zuul-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' commit: 'origin/$ZUUL_BRANCH' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' builders: - shell: diff --git a/jjb/ci-management/include-raw-jjb-update.sh b/jjb/ci-management/include-raw-jjb-update.sh deleted file mode 100644 index 1a06ecef9..000000000 --- a/jjb/ci-management/include-raw-jjb-update.sh +++ /dev/null @@ -1,10 +0,0 @@ -jenkins-jobs update --recursive --delete-old --workers 4 jjb/ - -# Submit patches for any jobs that can be auto updated -function submitJJB { - git commit -asm "Update automated project templates" - git push origin HEAD:refs/for/master -} - -gitdir=$(git rev-parse --git-dir); scp -p -P 29418 rotterdam-jobbuilder@gerrit.fd.io:hooks/commit-msg ${gitdir}/hooks/ -git diff --exit-code || submitJJB diff --git a/jjb/csit/csit-vpp-honeycomb.yaml b/jjb/csit/csit-vpp-honeycomb.yaml index 6d11904b6..d96133e5c 100644 --- a/jjb/csit/csit-vpp-honeycomb.yaml +++ b/jjb/csit/csit-vpp-honeycomb.yaml @@ -10,7 +10,10 @@ stream: - master: branch: 'master' - branch-id: 'master' + repo-stream-part: 'master' + - '1609': + branch: 'stable/1609' + repo-stream-part: 'stable.1609' os: - ubuntu1404 @@ -32,25 +35,30 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' + - os-parameter: + os: '{os}' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - - build-result: - combine: false - groups: - - jobs: - - honeycomb-merge-{stream}-{os} - results: - - success + - reverse: + jobs: 'honeycomb-integration-{stream}-{os}' + result: 'success' + + prebuilders: + - shell: | + if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi builders: - shell: !include-raw-escape: include-raw-csit-honeycomb-functional-virl.sh + postbuilders: + - shell: | + if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64||echo 'ignoring failure';fi + publishers: - archive-artifacts: artifacts: 'report.html, log.html, output.xml' diff --git a/jjb/csit/csit-vpp-pylint.yaml b/jjb/csit/csit-vpp-pylint.yaml index 12e581c41..0d3068945 100644 --- a/jjb/csit/csit-vpp-pylint.yaml +++ b/jjb/csit/csit-vpp-pylint.yaml @@ -35,14 +35,13 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - gerrit-trigger-patch-submitted: diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index f8d673642..a0849463a 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -52,15 +52,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -104,15 +100,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: 1440 ##change build timeout behaviour to no-activity, 30 minutes @@ -293,14 +285,10 @@ scm: - git-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' branch: '{branch}' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '480' @@ -355,10 +343,6 @@ branch: '{branch}' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: 480 @@ -406,10 +390,6 @@ branch: '{branch}' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '1440' ##change build timeout behaviour to no-activity, 30 minutes diff --git a/jjb/deb_dpdk/deb_dpdk.yaml b/jjb/deb_dpdk/deb_dpdk.yaml index d7f9384ee..3283aeb34 100644 --- a/jjb/deb_dpdk/deb_dpdk.yaml +++ b/jjb/deb_dpdk/deb_dpdk.yaml @@ -44,14 +44,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -90,14 +87,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -148,14 +142,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index 192163d76..b5aa1009f 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -9,8 +9,3 @@ build-artifact-num-to-keep: 5 # Timeout in minutes build-timeout: 360 - - ssh-credentials: 'jenkins-gerrit-credentials' - - # Maven versions - mvn33: 'Maven_3.3.9' diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 48906269e..caeb86c06 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -120,6 +120,10 @@ timeout: '{build-timeout}' timeout-var: 'BUILD_TIMEOUT' fail: true + - timestamps + - ssh-agent-credentials: + users: + - 'jenkins-gerrit-credentials' - jclouds: single-use: True @@ -258,4 +262,3 @@ variable: 'GLOBAL_SETTINGS_FILE' - file-id: '{settings-file}' variable: 'SETTINGS_FILE' - diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml index d59e19521..8a5011332 100644 --- a/jjb/honeycomb/honeycomb.yaml +++ b/jjb/honeycomb/honeycomb.yaml @@ -47,14 +47,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -67,7 +64,7 @@ - shell: | if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi maven: - maven-name: '{mvn33}' + maven-name: 'mvn33' root-pom: 'pom.xml' goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true site' maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' @@ -103,14 +100,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -136,7 +130,7 @@ - shell: | if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi maven: - maven-name: '{mvn33}' + maven-name: 'mvn33' root-pom: 'pom.xml' goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true' maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' @@ -167,20 +161,20 @@ - os-parameter: os: '{os}' - maven-project-parameter: - maven: '{mvn33}' + maven: 'mvn33' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' wrappers: - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -190,7 +184,7 @@ branch: '{branch}' maven: - maven-name: '{mvn33}' + maven-name: 'mvn33' root-pom: 'pom.xml' goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true -Dsonar -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy' maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' @@ -228,20 +222,20 @@ - os-parameter: os: '{os}' - maven-project-parameter: - maven: '{mvn33}' + maven: 'mvn33' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' scm: - git-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' branch: '{branch}' wrappers: - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -255,7 +249,7 @@ if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi maven: - maven-name: '{mvn33}' + maven-name: 'mvn33' root-pom: 'pom.xml' goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dkaraf.keep.unpack=true' maven-opts: '-Xmx2048m -Dmaven.compile.fork=true' @@ -266,7 +260,7 @@ postbuilders: - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33' goals: '--version' settings: 'honeycomb-settings' settings-type: cfp diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml index 7cb2fc938..339f613ac 100644 --- a/jjb/nsh_sfc/nsh_sfc.yaml +++ b/jjb/nsh_sfc/nsh_sfc.yaml @@ -49,14 +49,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -67,7 +64,7 @@ builders: - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33' goals: '--version' settings: 'nsh_sfc-settings' settings-type: cfp @@ -115,14 +112,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -146,7 +140,7 @@ builders: - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33' goals: '--version' settings: 'nsh_sfc-settings' settings-type: cfp @@ -193,14 +187,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -251,14 +242,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -310,14 +298,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -328,7 +313,7 @@ builders: - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33' goals: '--version' settings: 'vpp-settings' settings-type: cfp @@ -366,14 +351,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -400,7 +382,7 @@ builders: - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33' goals: '--version' settings: 'vpp-settings' settings-type: cfp @@ -411,5 +393,3 @@ global-settings-file: 'global-settings' - shell: !include-raw-escape: include-raw-nsh_sfc-docs.sh - - diff --git a/jjb/rpm_dpdk/include-raw-rpm_dpdk-pkg-build.sh b/jjb/rpm_dpdk/include-raw-rpm_dpdk-pkg-build.sh new file mode 100644 index 000000000..faff83960 --- /dev/null +++ b/jjb/rpm_dpdk/include-raw-rpm_dpdk-pkg-build.sh @@ -0,0 +1,28 @@ +#!/bin/bash +# basic build script example +set -e -o pipefail +# do nothing but print the current slave hostname +hostname + +echo "cat /etc/bootstrap.sha" +if [ -f /etc/bootstrap.sha ];then + cat /etc/bootstrap.sha +else + echo "Cannot find /etc/bootstrap.sha" +fi + +echo "cat /etc/bootstrap-functions.sha" +if [ -f /etc/bootstrap-functions.sha ];then + cat /etc/bootstrap-functions.sha +else + echo "Cannot find /etc/bootstrap-functions.sha" +fi + +echo "sha1sum of this script: ${0}" +sha1sum $0 + +build/build.sh + +echo "*******************************************************************" +echo "* rpm_dpdk BUILD SUCCESSFULLY COMPLETED" +echo "*******************************************************************" diff --git a/jjb/rpm_dpdk/include-raw-rpm_dpdk-pkg-push.sh b/jjb/rpm_dpdk/include-raw-rpm_dpdk-pkg-push.sh new file mode 100644 index 000000000..b9b9c4deb --- /dev/null +++ b/jjb/rpm_dpdk/include-raw-rpm_dpdk-pkg-push.sh @@ -0,0 +1,15 @@ +#!/bin/bash +# basic build script example +set -e -o pipefail +echo "Looking for rpms to publish" +# Find the files +RPMS=$(find . -type f -iname '*.rpm') +SRPMS=$(find . -type f -iname '*.srpm') +SRCRPMS=$(find . -type f -name '*.src.rpm') +echo "Found RPMS=${RPMS}" +echo "Found SRPMS=${SRPMS}" +echo "Found SRCRPMS=${SRCRPMS}" +for i in $RPMS $SRPMS $SRCRPMS +do + push_rpm "$i" +done diff --git a/jjb/rpm_dpdk/rpm_dpdk.yaml b/jjb/rpm_dpdk/rpm_dpdk.yaml new file mode 100644 index 000000000..6c116a49b --- /dev/null +++ b/jjb/rpm_dpdk/rpm_dpdk.yaml @@ -0,0 +1,164 @@ +- project: + name: rpm_dpdk + jobs: + - 'rpm_dpdk-verify-{stream}-{os}' + - 'rpm_dpdk-merge-{stream}-{os}' + - 'rpm_dpdk-verify-image-{stream}-{os}' + + project: 'rpm_dpdk' + os: + - centos7: + repo-os-part: 'centos7' + stream: + - master: + branch: 'master' + repo-stream-part: 'master' + +- job-template: + name: 'rpm_dpdk-verify-{stream}-{os}' + + project-type: freestyle + node: 'verify-{os}' + concurrent: true + + logrotate: + 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: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-submitted: + name: '{project}' + branch: '{branch}' + + builders: + - shell: + !include-raw-escape: + - include-raw-rpm_dpdk-pkg-build.sh + +- job-template: + name: 'rpm_dpdk-verify-image-{stream}-{os}' + + project-type: freestyle + node: 'verify-image-{os}' + concurrent: true + + logrotate: + 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: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'verify-images' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true + + builders: + - shell: + !include-raw-escape: + - include-raw-rpm_dpdk-pkg-build.sh + +- job-template: + name: 'rpm_dpdk-merge-{stream}-{os}' + + project-type: freestyle + node: 'merge-{os}' + + logrotate: + 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: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '' + choosing-strategy: 'default' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-merged: + name: '{project}' + branch: '{branch}' + + builders: + - config-file-provider: + files: + - file-id: 'rpm_dpdk-settings' + variable: 'SETTINGS_FILE' + - file-id: 'global-settings' + variable: 'GLOBAL_SETTINGS_FILE' + - shell: + !include-raw-escape: + - include-raw-rpm_dpdk-pkg-build.sh + - include-raw-rpm_dpdk-pkg-push.sh + diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml index 0ee380686..f0ad3fbc4 100644 --- a/jjb/tldk/tldk.yaml +++ b/jjb/tldk/tldk.yaml @@ -37,14 +37,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -80,14 +77,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -135,14 +129,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' diff --git a/jjb/vpp/vpp-lite.yaml b/jjb/vpp/vpp-lite.yaml index 786ec204d..7f55c8a22 100644 --- a/jjb/vpp/vpp-lite.yaml +++ b/jjb/vpp/vpp-lite.yaml @@ -53,14 +53,13 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - gerrit-trigger-patch-submitted: @@ -96,14 +95,13 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - gerrit: @@ -149,20 +147,19 @@ - os-parameter: os: '{os}' - maven-project-parameter: - maven: '{mvn33}' + maven: 'mvn33' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - '{ssh-credentials}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - gerrit-trigger-patch-merged: @@ -173,4 +170,4 @@ - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: - !include-raw-escape: 'include-raw-vpp-lite-build.sh' \ No newline at end of file + !include-raw-escape: 'include-raw-vpp-lite-build.sh' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index a3cb901e4..b6a8bf2d8 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -37,6 +37,7 @@ jobs: - 'vpp-csit-verify-virl-{stream}' - 'vpp-csit-verify-hw-perf-{stream}-{type}' + - 'vpp-csit-verify-virl-1604-test-{stream}' project: 'vpp' stream: - master: @@ -81,15 +82,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -111,6 +108,59 @@ only-if-success: true default-excludes: false +- job-template: + name: 'vpp-csit-verify-virl-1604-test-{stream}' + + project-type: freestyle + node: 'verify-ubuntu1604' + concurrent: true + + logrotate: + 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: 'ubuntu1604' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-manually-triggered: + name: '{project}' + branch: '{branch}' + comment-trigger-value: 'virl-1604-test' + + builders: + - shell: + !include-raw-escape: include-raw-vpp-checkstyle.sh + - shell: + !include-raw-escape: include-raw-vpp-build.sh + - shell: + !include-raw-escape: include-raw-vpp-csit-functional.sh + + publishers: + - archive-artifacts: + artifacts: 'csit/report.html, csit/log.html, csit/output.xml' + latest-only: false + + - robot-report: + output-path: 'csit' + - job-template: name: 'vpp-verify-image-{stream}-{os}' @@ -134,15 +184,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -190,21 +236,17 @@ - os-parameter: os: '{os}' - maven-project-parameter: - maven: '{mvn33}' + maven: 'mvn33' - repo-name-parameter: repo-name: '{repo-stream-part}.{repo-os-part}' scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -219,7 +261,7 @@ - shell: !include-raw-escape: include-raw-vpp-build.sh - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33' goals: '--version' settings: 'vpp-settings' settings-type: cfp @@ -263,15 +305,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -321,15 +359,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -385,15 +419,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -404,7 +434,7 @@ builders: - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33' goals: '--version' settings: 'vpp-settings' settings-type: cfp @@ -446,15 +476,11 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - '{ssh-credentials}' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -481,7 +507,7 @@ builders: - maven-target: - maven-version: '{mvn33}' + maven-version: 'mvn33' goals: '--version' settings: 'vpp-settings' settings-type: cfp @@ -499,4 +525,3 @@ fingerprint: false only-if-success: true default-excludes: false -