summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/csit/csit-vpp-pylint.yaml2
-rw-r--r--jjb/csit/csit.yaml22
-rw-r--r--jjb/deb_dpdk/deb_dpdk.yaml15
-rw-r--r--jjb/global-macros.yaml4
-rw-r--r--jjb/hc2vpp/csit-hc2vpp.yaml10
-rw-r--r--jjb/honeycomb/honeycomb.yaml22
-rw-r--r--jjb/vpp/vpp.yaml28
7 files changed, 66 insertions, 37 deletions
diff --git a/jjb/csit/csit-vpp-pylint.yaml b/jjb/csit/csit-vpp-pylint.yaml
index 0d3068945..0915643e1 100644
--- a/jjb/csit/csit-vpp-pylint.yaml
+++ b/jjb/csit/csit-vpp-pylint.yaml
@@ -18,7 +18,7 @@
name: 'csit-validate-pylint-{stream}'
project-type: freestyle
- node: verify
+ node: ubuntu1604-basebuild-4c-4g
concurrent: true
logrotate:
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 4354bb00f..18f806cfb 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -38,7 +38,7 @@
name: 'csit-vpp-functional-{stream}-virl'
project-type: freestyle
- node: verify-ubuntu1604
+ node: ubuntu1604-basebuild-4c-4g
concurrent: true
logrotate:
@@ -85,7 +85,7 @@
name: 'csit-vpp-perf-{stream}-{type}'
project-type: freestyle
- node: verify-ubuntu1604
+ node: ubuntu1604-basebuild-4c-4g
concurrent: false
logrotate:
@@ -270,7 +270,7 @@
description: 'Purpose of this job is to validate CSIT code of corresponding branch against verified vpp build from corresponding branch and create corresponding operational branch in case of success.'
project-type: freestyle
- node: verify-ubuntu1604
+ node: ubuntu1604-basebuild-4c-4g
concurrent: false
logrotate:
@@ -329,7 +329,7 @@
description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.'
project-type: freestyle
- node: verify-ubuntu1604
+ node: ubuntu1604-basebuild-4c-4g
concurrent: false
logrotate:
@@ -377,7 +377,7 @@
description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.'
project-type: freestyle
- node: verify-ubuntu1604
+ node: ubuntu1604-basebuild-4c-4g
concurrent: false
logrotate:
@@ -553,7 +553,7 @@
name: 'csit-docs-verify-{stream}'
project-type: freestyle
- node: 'verify-ubuntu1604'
+ node: 'ubuntu1604-basebuild-4c-4g'
concurrent: true
logrotate:
@@ -567,6 +567,8 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
+ - maven-exec:
+ maven-version: 'mvn33-new'
scm:
- gerrit-trigger-scm:
@@ -587,7 +589,7 @@
builders:
- maven-target:
- maven-version: 'mvn33'
+ maven-version: 'mvn33-new'
goals: '--version'
settings: 'csit-settings'
settings-type: cfp
@@ -612,7 +614,7 @@
name: 'csit-docs-merge-{stream}'
project-type: freestyle
- node: 'verify-ubuntu1604'
+ node: 'ubuntu1604-basebuild-4c-4g'
concurrent: true
logrotate:
@@ -626,6 +628,8 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
+ - maven-exec:
+ maven-version: 'mvn33-new'
scm:
- gerrit-trigger-scm:
@@ -655,7 +659,7 @@
builders:
- maven-target:
- maven-version: 'mvn33'
+ maven-version: 'mvn33-new'
goals: '--version'
settings: 'csit-settings'
settings-type: cfp
diff --git a/jjb/deb_dpdk/deb_dpdk.yaml b/jjb/deb_dpdk/deb_dpdk.yaml
index 81c1d9917..08040e2c1 100644
--- a/jjb/deb_dpdk/deb_dpdk.yaml
+++ b/jjb/deb_dpdk/deb_dpdk.yaml
@@ -23,7 +23,7 @@
name: 'deb_dpdk-verify-{stream}-{os}'
project-type: freestyle
- node: 'verify-{os}'
+ node: '{os}-basebuild-4c-4g'
concurrent: true
logrotate:
@@ -66,7 +66,7 @@
name: 'deb_dpdk-verify-image-{stream}-{os}'
project-type: freestyle
- node: 'verify-image-{os}'
+ node: '{os}-basebuild-4c-4g'
concurrent: true
logrotate:
@@ -122,7 +122,7 @@
name: 'deb_dpdk-merge-{stream}-{os}'
project-type: freestyle
- node: 'merge-{os}'
+ node: '{os}-basebuild-4c-4g'
logrotate:
daysToKeep: '{build-days-to-keep}'
@@ -137,6 +137,8 @@
branch: '{branch}'
- os-parameter:
os: '{os}'
+ - maven-exec:
+ maven-version: 'mvn33-new'
- repo-name-parameter:
repo-name: '{repo-stream-part}.{repo-os-part}'
@@ -156,6 +158,13 @@
branch: '{branch}'
builders:
+ - maven-target:
+ maven-version: 'mvn33-new'
+ goals: '--version'
+ settings: 'deb_dpdk-settings'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
- config-file-provider:
files:
- file-id: 'deb_dpdk-settings'
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index ba0d1a596..8601fa8d8 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -141,6 +141,8 @@
- 'jenkins-gerrit-credentials'
- jclouds:
single-use: True
+ - openstack:
+ single-use: True
- wrapper:
# This wrapper is required for all jobs as it configures the wrappers
@@ -158,6 +160,8 @@
- 'jenkins-gerrit-credentials'
- jclouds:
single-use: True
+ - openstack:
+ single-use: True
###### TRIGGERS
- trigger:
diff --git a/jjb/hc2vpp/csit-hc2vpp.yaml b/jjb/hc2vpp/csit-hc2vpp.yaml
index 3e80ad47c..94e469948 100644
--- a/jjb/hc2vpp/csit-hc2vpp.yaml
+++ b/jjb/hc2vpp/csit-hc2vpp.yaml
@@ -21,7 +21,7 @@
name: 'hc2vpp-csit-integration-{stream}-{os}'
project-type: freestyle
- node: verify-{os}
+ node: 'ubuntu1604-basebuild-4c-4g'
concurrent: true
logrotate:
@@ -76,7 +76,7 @@
name: 'hc2vpp-csit-verify-{stream}-{os}'
project-type: maven
- node: verify-{os}
+ node: 'ubuntu1604-basebuild-4c-4g'
concurrent: true
logrotate:
@@ -93,7 +93,9 @@
- os-parameter:
os: '{os}'
- maven-project-parameter:
- maven: 'mvn33'
+ maven: 'mvn33-new'
+ - maven-exec:
+ maven-version: 'mvn33-new'
scm:
- gerrit-trigger-scm:
@@ -131,7 +133,7 @@
!include-raw-escape: include-raw-hc2vpp-csit-verify-prebuild.sh
maven:
- maven-name: 'mvn33'
+ maven-name: 'mvn33-new'
root-pom: 'pom.xml'
goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} -DskipTests'
maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 9662b5b01..c3ff0c5ea 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -20,7 +20,7 @@
- job-template:
name: 'honeycomb-verify-{stream}-{os}'
project-type: maven
- node: verify-{os}
+ node: '{os}-basebuild-4c-4g'
concurrent: true
jdk: openjdk8-{os}
@@ -57,7 +57,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-new'
root-pom: 'pom.xml'
goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge site'
maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -73,7 +73,7 @@
- job-template:
name: 'honeycomb-merge-{stream}-{os}'
project-type: maven
- node: merge-{os}
+ node: '{os}-basebuild-4c-4g'
jdk: openjdk8-{os}
logrotate:
@@ -88,7 +88,9 @@
- os-parameter:
os: '{os}'
- maven-project-parameter:
- maven: 'mvn33'
+ maven: 'mvn33-new'
+ - maven-exec:
+ maven-version: 'mvn33-new'
- repo-name-parameter:
repo-name: '{repo-stream-part}.{repo-os-part}'
@@ -111,7 +113,7 @@
branch: '{branch}'
maven:
- maven-name: 'mvn33'
+ maven-name: 'mvn33-new'
root-pom: 'pom.xml'
goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dsonar -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy'
maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -122,7 +124,7 @@
postbuilders:
- maven-target:
- maven-version: 'mvn33'
+ maven-version: 'mvn33-new'
goals: '--version'
settings: 'honeycomb-settings'
settings-type: cfp
@@ -150,7 +152,7 @@
- job-template:
name: 'honeycomb-benchmark-master'
project-type: maven
- node: verify-ubuntu1604
+ node: ubuntu1604-basebuild-4c-4g
jdk: openjdk8-ubuntu1604
logrotate:
@@ -165,7 +167,9 @@
- os-parameter:
os: 'ubuntu1604'
- maven-project-parameter:
- maven: 'mvn33'
+ maven: 'mvn33-new'
+ - maven-exec:
+ maven-version: 'mvn33-new'
- repo-name-parameter:
repo-name: 'master.ubuntu.xenial.main'
@@ -185,7 +189,7 @@
- timed: '@daily'
maven:
- maven-name: 'mvn33'
+ maven-name: 'mvn33-new'
root-pom: 'pom.xml'
goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Pbenchmark'
maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index a47f8b1f5..730ab847d 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -68,7 +68,7 @@
name: 'vpp-verify-{stream}-{os}'
project-type: freestyle
- node: 'verify-{os}'
+ node: '{os}-basebuild-4c-4g'
concurrent: true
logrotate:
@@ -117,7 +117,7 @@
name: 'vpp-verify-image-{stream}-{os}'
project-type: freestyle
- node: 'verify-image-{os}'
+ node: '{os}-basebuild-4c-4g'
concurrent: true
logrotate:
@@ -172,7 +172,7 @@
name: 'vpp-merge-{stream}-{os}'
project-type: freestyle
- node: 'merge-{os}'
+ node: '{os}-basebuild-4c-4g'
logrotate:
daysToKeep: '{build-days-to-keep}'
@@ -188,7 +188,9 @@
- os-parameter:
os: '{os}'
- maven-project-parameter:
- maven: 'mvn33'
+ maven: 'mvn33-new'
+ - maven-exec:
+ maven-version: 'mvn33-new'
- repo-name-parameter:
repo-name: '{repo-stream-part}.{repo-os-part}'
@@ -213,7 +215,7 @@
- shell:
!include-raw-escape: include-raw-vpp-build.sh
- maven-target:
- maven-version: 'mvn33'
+ maven-version: 'mvn33-new'
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
@@ -238,7 +240,7 @@
name: 'vpp-csit-verify-virl-{stream}'
project-type: freestyle
- node: 'verify-{os}'
+ node: '{os}-basebuild-4c-4g'
concurrent: true
logrotate:
@@ -292,7 +294,7 @@
name: 'vpp-csit-verify-hw-perf-{stream}-{type}'
project-type: freestyle
- node: 'verify-{os}'
+ node: '{os}-basebuild-4c-4g'
concurrent: false
logrotate:
@@ -356,7 +358,7 @@
name: 'vpp-docs-verify-{stream}'
project-type: freestyle
- node: 'verify-ubuntu1604'
+ node: ubuntu1604-basebuild-4c-4g
concurrent: true
logrotate:
@@ -372,6 +374,8 @@
branch: '{branch}'
- os-parameter:
os: 'ubuntu1604'
+ - maven-exec:
+ maven-version: 'mvn33-new'
scm:
- gerrit-trigger-scm:
@@ -390,7 +394,7 @@
builders:
- maven-target:
- maven-version: 'mvn33'
+ maven-version: 'mvn33-new'
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
@@ -413,7 +417,7 @@
name: 'vpp-docs-merge-{stream}'
project-type: freestyle
- node: 'verify-ubuntu1604'
+ node: ubuntu1604-basebuild-4c-4g
concurrent: true
logrotate:
@@ -429,6 +433,8 @@
branch: '{branch}'
- os-parameter:
os: 'ubuntu1604'
+ - maven-exec:
+ maven-version: 'mvn33-new'
scm:
- gerrit-trigger-scm:
@@ -463,7 +469,7 @@
builders:
- maven-target:
- maven-version: 'mvn33'
+ maven-version: 'mvn33-new'
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp