summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/3rd_party_ci/odl-netvirt.yml2
-rw-r--r--jjb/apex/apex.yml6
-rw-r--r--jjb/armband/armband-ci-jobs.yml2
-rw-r--r--jjb/armband/armband-project-jobs.yml2
-rw-r--r--jjb/bottlenecks/bottlenecks-ci-jobs.yml2
-rw-r--r--jjb/bottlenecks/bottlenecks-project-jobs.yml2
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml8
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml15
-rw-r--r--jjb/compass4nfv/compass-verify-jobs.yml13
-rw-r--r--jjb/cperf/cperf-ci-jobs.yml2
-rw-r--r--jjb/dovetail/dovetail-ci-jobs.yml2
-rw-r--r--jjb/fuel/fuel-daily-jobs.yml2
-rw-r--r--jjb/fuel/fuel-project-jobs.yml4
-rw-r--r--jjb/functest/functest-ci-jobs.yml2
-rw-r--r--jjb/global/installer-params.yml4
-rw-r--r--jjb/joid/joid-daily-jobs.yml2
-rw-r--r--jjb/onosfw/onosfw.yml4
-rw-r--r--jjb/ovsnfv/ovsnfv.yml2
-rw-r--r--jjb/qtip/qtip-ci-jobs.yml2
-rw-r--r--jjb/releng/artifact-cleanup.yml2
-rw-r--r--jjb/releng/opnfv-docker.yml2
-rw-r--r--jjb/storperf/storperf.yml2
-rw-r--r--jjb/vswitchperf/vswitchperf.yml2
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml2
24 files changed, 60 insertions, 28 deletions
diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml
index 4a65dcbb7..46bdd25ad 100644
--- a/jjb/3rd_party_ci/odl-netvirt.yml
+++ b/jjb/3rd_party_ci/odl-netvirt.yml
@@ -3,7 +3,7 @@
project: 'netvirt'
- installer: 'apex'
+ installer: 'netvirt'
#####################################
# branch definitions
#####################################
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 9c1dedc03..20a7dbcdd 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -374,6 +374,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- apex-parameter:
gs-pathname: '{gs-pathname}'
- string:
@@ -418,6 +420,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- apex-parameter:
gs-pathname: '{gs-pathname}'
- string:
@@ -458,6 +462,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- apex-parameter:
gs-pathname: '{gs-pathname}'
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 2c355b750..22e1dafba 100644
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -199,6 +199,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- '{installer}-defaults'
- '{slave-label}-defaults':
installer: '{installer}'
diff --git a/jjb/armband/armband-project-jobs.yml b/jjb/armband/armband-project-jobs.yml
index 64c320dbd..e3853fa16 100644
--- a/jjb/armband/armband-project-jobs.yml
+++ b/jjb/armband/armband-project-jobs.yml
@@ -35,6 +35,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- 'opnfv-build-arm-defaults'
- '{installer}-defaults'
- armband-project-parameter:
diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index 48cca0dae..0054dddaf 100644
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -95,6 +95,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- '{slave-label}-defaults'
- '{installer}-defaults'
- 'bottlenecks-params-{slave-label}'
diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml
index e5066aace..a461c6a66 100644
--- a/jjb/bottlenecks/bottlenecks-project-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml
@@ -123,6 +123,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- 'opnfv-build-ubuntu-defaults'
- bottlenecks-parameter:
gs-packagepath: '{gs-packagepath}'
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index e9d1f5302..b4910cfc2 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -22,11 +22,11 @@
pod:
- baremetal:
slave-label: compass-baremetal
- os-version: 'trusty'
+ os-version: 'xenial'
<<: *master
- virtual:
slave-label: compass-virtual
- os-version: 'trusty'
+ os-version: 'xenial'
<<: *master
# - baremetal:
# slave-label: compass-baremetal
@@ -190,6 +190,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- compass-ci-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
@@ -235,9 +237,7 @@
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
- - 'mitaka'
- 'newton'
- - 'liberty'
########################
# trigger macros
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index ac132a577..6cf35d631 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -38,6 +38,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- compass-project-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
@@ -77,6 +79,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- compass-project-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
@@ -115,15 +119,4 @@
- string:
name: PPA_CACHE
default: "$WORKSPACE/work/repo/"
- - choice:
- name: COMPASS_OPENSTACK_VERSION
- choices:
- - 'mitaka'
- - 'newton'
- - 'liberty'
- - choice:
- name: COMPASS_OS_VERSION
- choices:
- - 'trusty'
- - 'centos7'
diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 3a11b1e0a..2277e92ab 100644
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -18,13 +18,9 @@
disabled: true
distro:
- - 'trusty':
+ - 'xenial':
disabled: false
- os-version: 'trusty'
- openstack-os-version: ''
- - 'centos7':
- disabled: false
- os-version: 'centos7'
+ os-version: 'xenial'
openstack-os-version: ''
#####################################
# patch verification phases
@@ -232,11 +228,8 @@
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
- - 'mitaka'
- 'newton'
- - 'liberty'
- choice:
name: COMPASS_OS_VERSION
choices:
- - 'trusty'
- - 'centos7'
+ - 'xenial'
diff --git a/jjb/cperf/cperf-ci-jobs.yml b/jjb/cperf/cperf-ci-jobs.yml
index d57d87bac..4ffc3b013 100644
--- a/jjb/cperf/cperf-ci-jobs.yml
+++ b/jjb/cperf/cperf-ci-jobs.yml
@@ -57,6 +57,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- '{pod}-defaults'
- '{installer}-defaults'
- cperf-parameter:
diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 6f3ed128b..f41325020 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -179,6 +179,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- '{SUT}-defaults'
- '{slave-label}-defaults'
- string:
diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml
index a714eeabf..87488c886 100644
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@ -206,6 +206,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- '{installer}-defaults'
- '{slave-label}-defaults':
installer: '{installer}'
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 0b416e35e..8fdf8deae 100644
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -44,6 +44,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- 'opnfv-build-ubuntu-defaults'
- '{installer}-defaults'
- choice:
@@ -231,6 +233,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- '{installer}-defaults'
- string:
name: GIT_BASE
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 40b795bcc..f8fdeb811 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -219,6 +219,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- '{installer}-defaults'
- '{slave-label}-defaults'
- 'functest-{testsuite}-parameter'
diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index 610072d1b..4a50a5906 100644
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -109,11 +109,11 @@
description: 'IP of the installer'
- string:
name: INSTALLER_TYPE
- default: apex
+ default: netvirt
description: 'Installer used for deploying OPNFV on this POD'
- string:
name: DEPLOY_SCENARIO
- default: 'none'
+ default: 'os-odl_l2-bgpvpn-noha'
description: 'Scenario to deploy and test'
- string:
name: EXTERNAL_NETWORK
diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index 5da301974..20429f1a4 100644
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -178,6 +178,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- '{installer}-defaults'
- '{slave-label}-defaults':
installer: '{installer}'
diff --git a/jjb/onosfw/onosfw.yml b/jjb/onosfw/onosfw.yml
index c866d89b5..07bcdc5f6 100644
--- a/jjb/onosfw/onosfw.yml
+++ b/jjb/onosfw/onosfw.yml
@@ -72,6 +72,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- 'opnfv-build-ubuntu-defaults'
scm:
@@ -94,6 +96,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- 'opnfv-build-ubuntu-defaults'
- string:
name: GS_URL
diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index 0492f96a4..a5b8fd812 100644
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -119,6 +119,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- 'opnfv-build-centos-defaults'
- string:
name: GS_URL
diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml
index 167cb2a2a..b83014edb 100644
--- a/jjb/qtip/qtip-ci-jobs.yml
+++ b/jjb/qtip/qtip-ci-jobs.yml
@@ -44,6 +44,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- '{installer}-defaults'
- '{pod}-defaults'
- string:
diff --git a/jjb/releng/artifact-cleanup.yml b/jjb/releng/artifact-cleanup.yml
index ce1da75d9..e10d5defb 100644
--- a/jjb/releng/artifact-cleanup.yml
+++ b/jjb/releng/artifact-cleanup.yml
@@ -27,6 +27,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
scm:
- git-scm
diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 3df8be1e7..be04b15c9 100644
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -68,6 +68,8 @@
parameters: &parameters
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- 'opnfv-build-ubuntu-defaults'
- string:
name: PUSH_IMAGE
diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index d42540dda..1a2eb5e31 100644
--- a/jjb/storperf/storperf.yml
+++ b/jjb/storperf/storperf.yml
@@ -151,6 +151,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
scm:
- git-scm
diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index 681b38436..0d2c67b3f 100644
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -30,6 +30,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- 'intel-pod3-defaults'
scm:
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 271adb7bf..33f557a33 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -238,6 +238,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
- '{installer}-defaults'
- '{slave-label}-defaults'
- 'yardstick-params-{slave-label}'