summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xjjb/apex/apex-unit-test.sh2
-rw-r--r--jjb/apex/apex-verify-jobs.yml2
-rw-r--r--jjb/apex/apex.yml42
-rw-r--r--jjb/apex/apex.yml.j212
-rw-r--r--jjb/armband/armband-ci-jobs.yml9
-rw-r--r--jjb/ci_gate_security/opnfv-ci-gate-security.yml6
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml4
-rw-r--r--jjb/compass4nfv/compass-verify-jobs.yml6
-rw-r--r--jjb/daisy4nfv/daisy-daily-jobs.yml100
-rw-r--r--jjb/daisy4nfv/daisy-project-jobs.yml4
-rw-r--r--jjb/doctor/doctor.yml4
-rwxr-xr-xjjb/dovetail/dovetail-run.sh10
-rw-r--r--jjb/global/releng-macros.yml40
-rw-r--r--jjb/global/slave-params.yml11
-rw-r--r--jjb/joid/joid-daily-jobs.yml2
-rw-r--r--jjb/octopus/octopus.yml11
-rw-r--r--jjb/opnfvdocs/docs-rtd.yaml2
-rw-r--r--jjb/opnfvdocs/opnfvdocs.yml7
-rw-r--r--jjb/prediction/prediction.yml8
-rw-r--r--jjb/releng/opnfv-lint.yml2
-rw-r--r--jjb/releng/opnfv-utils.yml1
-rw-r--r--jjb/yardstick/yardstick-daily-jobs.yml23
22 files changed, 157 insertions, 151 deletions
diff --git a/jjb/apex/apex-unit-test.sh b/jjb/apex/apex-unit-test.sh
index 3112c9d36..3f15847f2 100755
--- a/jjb/apex/apex-unit-test.sh
+++ b/jjb/apex/apex-unit-test.sh
@@ -7,6 +7,8 @@ echo "Starting unit tests for Apex..."
echo "---------------------------------------------------------------------------------------"
echo
+PATH=$PATH:/usr/sbin
+
pushd build/ > /dev/null
for pkg in yamllint rpmlint iproute epel-release python34-devel python34-nose python34-PyYAML python-pep8 python34-mock python34-pip; do
diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml
index 6b7271f7e..7dbd6709b 100644
--- a/jjb/apex/apex-verify-jobs.yml
+++ b/jjb/apex/apex-verify-jobs.yml
@@ -317,7 +317,7 @@
builders:
# yamllint disable rule:line-length
- shell: |
- echo DEPLOY_SCENARIO=$(echo $GERRIT_EVENT_COMMENT_TEXT | grep start-gate-scenario | grep -Eo 'os|k8s-.*$') > detected_scenario
+ echo DEPLOY_SCENARIO=$(echo $GERRIT_EVENT_COMMENT_TEXT | grep start-gate-scenario | grep -Eo '(os|k8s)-.*$') > detected_scenario
# yamllint enable rule:line-length
- inject:
properties-file: detected_scenario
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 849720336..587a06377 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -82,16 +82,10 @@
<<: *fraser
- 'os-nosdn-bar-noha':
<<: *fraser
- - 'os-nosdn-nofeature-ha-ipv6':
- <<: *fraser
- 'os-nosdn-ovs_dpdk-noha':
<<: *fraser
- 'os-nosdn-ovs_dpdk-ha':
<<: *fraser
- - 'os-nosdn-kvm_ovs_dpdk-noha':
- <<: *fraser
- - 'os-nosdn-kvm_ovs_dpdk-ha':
- <<: *fraser
- 'os-odl-sfc-noha':
<<: *fraser
- 'os-odl-sfc-ha':
@@ -496,6 +490,7 @@
- multijob:
name: 'Baremetal Deploy'
condition: SUCCESSFUL
+ execution-type: SEQUENTIALLY
projects:
- name: 'apex-deploy-baremetal-{scenario_stream}'
node-parameters: true
@@ -505,7 +500,16 @@
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
- kill-phase-on: FAILURE
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
+ - name: 'apex-fetch-logs-{scenario_stream}'
+ current-parameters: true
+ predefined-parameters: |
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=
+ node-parameters: true
+ kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- multijob:
@@ -1224,14 +1228,6 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-fraser'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- name: 'apex-os-nosdn-ovs_dpdk-noha-baremetal-fraser'
node-parameters: false
current-parameters: false
@@ -1248,22 +1244,6 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-nosdn-kvm_ovs_dpdk-noha-baremetal-fraser'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-nosdn-kvm_ovs_dpdk-ha-baremetal-fraser'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- name: 'apex-os-odl-sfc-noha-baremetal-fraser'
node-parameters: false
current-parameters: false
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index dac7c3a88..4620bbc7e 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -374,6 +374,7 @@
- multijob:
name: 'Baremetal Deploy'
condition: SUCCESSFUL
+ execution-type: SEQUENTIALLY
projects:
- name: 'apex-deploy-baremetal-{scenario_stream}'
node-parameters: true
@@ -383,7 +384,16 @@
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
- kill-phase-on: FAILURE
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
+ - name: 'apex-fetch-logs-{scenario_stream}'
+ current-parameters: true
+ predefined-parameters: |
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=
+ node-parameters: true
+ kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- multijob:
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index c74e3c83d..5bf64c11d 100644
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -164,9 +164,7 @@
- condition-kind: day-of-week
day-selector: select-days
days:
- MON: true
- WED: true
- FRI: true
+ SAT: true
use-build-time: true
steps:
- trigger-builds:
@@ -189,7 +187,7 @@
- condition-kind: day-of-week
day-selector: select-days
days:
- TUES: true
+ SUN: true
use-build-time: true
steps:
- trigger-builds:
@@ -250,6 +248,7 @@
gs-pathname: '{gs-pathname}'
- '{slave-label}-defaults':
installer: '{installer}'
+ - testapi-parameter
- string:
name: DEPLOY_SCENARIO
default: 'os-odl-nofeature-ha'
@@ -262,6 +261,7 @@
name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
builders:
+ - track-begin-timestamp
- shell:
!include-raw-escape: ../fuel/fuel-deploy.sh
@@ -269,6 +269,7 @@
- email:
recipients: armband@enea.com
- email-jenkins-admins-on-failure
+ - report-provision-result
########################
# trigger macros
diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yml b/jjb/ci_gate_security/opnfv-ci-gate-security.yml
index 56aee174c..cd3831310 100644
--- a/jjb/ci_gate_security/opnfv-ci-gate-security.yml
+++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yml
@@ -34,7 +34,6 @@
- dovetail
- dpacc
- enfv
- - fastpathmetrics
- fds
- fuel
- functest
@@ -43,12 +42,9 @@
- kvmfornfv
- models
- moon
- - multisite
- netready
- nfvbench
- - octopus
- onosfw
- - openretriever
- opera
- opnfvdocs
- orchestra
@@ -159,7 +155,7 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'REG_EXP'
- project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|copper|cperf|daisy|doctor|dovetail|dpacc|enfv|escalator|fds|fuel|functest|octopus|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|lsoapi|models|moon|multisite|netready'
+ project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|copper|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|functest|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon|netready'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 0d5f92c2a..5f82803b6 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -790,7 +790,7 @@
- trigger:
name: 'compass-k8-nosdn-nofeature-ha-baremetal-fraser-trigger'
triggers:
- - timed: ''
+ - timed: '0 5 1-29/2 * *'
- trigger:
name: 'compass-os-odl-sfc-ha-baremetal-fraser-trigger'
triggers:
@@ -802,7 +802,7 @@
- trigger:
name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-fraser-trigger'
triggers:
- - timed: ''
+ - timed: '0 7 2-30/2 * *'
# ---------------------
# noha-baremetal-fraser
diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 444b17361..c357ff641 100644
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -14,14 +14,14 @@
gs-pathname: ''
ppa-pathname: '/{stream}'
disabled: false
- openstack-version: 'ocata'
+ openstack-version: 'pike'
branch-type: 'master'
- - euphrates:
+ - fraser:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
ppa-pathname: '/{stream}'
disabled: false
- openstack-version: 'ocata'
+ openstack-version: 'pike'
branch-type: 'master'
distro:
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 4eaa39ae9..1769bb4da 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -48,9 +48,12 @@
# -------------------------------
# None-CI PODs
# -------------------------------
- # - baremetal:
- # slave-label: zte-pod3
- # <<: *master
+ - zte-pod3:
+ slave-label: zte-pod3
+ <<: *master
+ - zte-pod3:
+ slave-label: zte-pod3
+ <<: *fraser
- zte-pod9:
slave-label: zte-pod9
<<: *master
@@ -121,7 +124,9 @@
- 'testapi-parameter'
- 'daisy-project-parameter':
gs-pathname: '{gs-pathname}'
- - 'deploy-scenario'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: '{scenario}'
builders:
- description-setter:
@@ -150,27 +155,20 @@
build-step-failure-threshold: 'never'
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
- - conditional-step:
- condition-kind: and
- condition-operands:
- - condition-kind: regex-match
- regex: 'baremetal'
- label: '{pod}'
- steps:
- - trigger-builds:
- - project: 'yardstick-daisy-{pod}-daily-{stream}'
- current-parameters: false
- predefined-parameters: |
- DEPLOY_SCENARIO={scenario}
- INSTALLER_VERSION={stream}
- UPSTREAM_JOB_NAME=$JOB_NAME
- UPSTREAM_BUILD_ID=$BUILD_ID
- block: true
- same-node: true
- block-thresholds:
- build-step-failure-threshold: 'never'
- failure-threshold: 'never'
- unstable-threshold: 'FAILURE'
+ - trigger-builds:
+ - project: 'yardstick-daisy-{pod}-daily-{stream}'
+ current-parameters: false
+ predefined-parameters: |
+ DEPLOY_SCENARIO={scenario}
+ INSTALLER_VERSION={stream}
+ UPSTREAM_JOB_NAME=$JOB_NAME
+ UPSTREAM_BUILD_ID=$BUILD_ID
+ block: true
+ same-node: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
- job-template:
name: '{project}-deploy-{pod}-daily-{stream}'
@@ -191,8 +189,8 @@
blocking-jobs:
- 'daisy-kolla-build-.*'
- '{installer}-(build|deploy|test)-daily-(fraser|master)'
- - '{installer}-deploy-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
- - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
+ - '{installer}-deploy-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
+ - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
block-level: 'NODE'
parameters:
@@ -329,6 +327,54 @@
- timed: ''
# ----------------------------------------------
+# Triggers for job running on zte-pod3 against master branch
+# ----------------------------------------------
+# Basic HA Scenarios
+- trigger:
+ name: 'daisy-os-nosdn-nofeature-ha-zte-pod3-daily-master-trigger'
+ triggers:
+ - timed: ''
+# Basic NOHA Scenarios
+- trigger:
+ name: 'daisy-os-nosdn-nofeature-noha-zte-pod3-daily-master-trigger'
+ triggers:
+ - timed: ''
+# ODL Scenarios
+- trigger:
+ name: 'daisy-os-odl-nofeature-ha-zte-pod3-daily-master-trigger'
+ triggers:
+ - timed: ''
+# ovs_dpdk Scenarios
+- trigger:
+ name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod3-daily-master-trigger'
+ triggers:
+ - timed: ''
+
+# ----------------------------------------------
+# Triggers for job running on zte-pod3 against fraser branch
+# ----------------------------------------------
+# Basic HA Scenarios
+- trigger:
+ name: 'daisy-os-nosdn-nofeature-ha-zte-pod3-daily-fraser-trigger'
+ triggers:
+ - timed: ''
+# Basic NOHA Scenarios
+- trigger:
+ name: 'daisy-os-nosdn-nofeature-noha-zte-pod3-daily-fraser-trigger'
+ triggers:
+ - timed: ''
+# ODL Scenarios
+- trigger:
+ name: 'daisy-os-odl-nofeature-ha-zte-pod3-daily-fraser-trigger'
+ triggers:
+ - timed: '0 16,22 * * *'
+# ovs_dpdk Scenarios
+- trigger:
+ name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod3-daily-fraser-trigger'
+ triggers:
+ - timed: ''
+
+# ----------------------------------------------
# ZTE POD9 Triggers running against master branch
# ----------------------------------------------
# ovs_dpdk Scenarios
diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index 3ea74a9a8..cb0dea196 100644
--- a/jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yml
@@ -219,8 +219,8 @@
use-build-blocker: true
blocking-jobs:
- '{installer}-daily-(build|deploy|test)-(fraser|master)'
- - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
- - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
+ - '{installer}-.*-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
+ - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
block-level: 'NODE'
scm:
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 5732100be..3985356c1 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -121,7 +121,9 @@
branch: '{branch}'
- '{installer}-defaults'
- 'doctor-slave-parameter'
- - 'doctor-parameter'
+ - 'doctor-parameter':
+ docker-tag: '{docker-tag}'
+ scenario: '{scenario}'
- 'doctor-functest-parameter'
scm:
- git-scm-gerrit
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index d01128385..f74b10754 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -213,7 +213,7 @@ if [[ ! -f ${ubuntu_image} ]]; then
fi
sudo cp ${ubuntu_image} ${DOVETAIL_IMAGES}
-# functest needs to download this image first before running
+# yardstick and bottlenecks need to download this image first before running
cirros_image=${image_path}/cirros-0.3.5-x86_64-disk.img
if [[ ! -f ${cirros_image} ]]; then
echo "Download image cirros-0.3.5-x86_64-disk.img ..."
@@ -221,6 +221,14 @@ if [[ ! -f ${cirros_image} ]]; then
fi
sudo cp ${cirros_image} ${DOVETAIL_IMAGES}
+# functest needs to download this image first before running
+cirros_image=${image_path}/cirros-0.4.0-x86_64-disk.img
+if [[ ! -f ${cirros_image} ]]; then
+ echo "Download image cirros-0.4.0-x86_64-disk.img ..."
+ wget -q -nc http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img -P ${image_path}
+fi
+sudo cp ${cirros_image} ${DOVETAIL_IMAGES}
+
# snaps_smoke test case needs to download this image first before running
ubuntu14_image=${image_path}/ubuntu-14.04-server-cloudimg-amd64-disk1.img
if [[ ! -f ${ubuntu14_image} ]]; then
diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index 93ade90c9..b7335fafa 100644
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -692,22 +692,6 @@
JBuchanan@advaoptical.com
- publisher:
- name: 'email-escalator-ptl'
- publishers:
- - email-ext:
- <<: *email_ptl_defaults
- recipients: >
- kong.wei2@zte.com.cn
-
-- publisher:
- name: 'email-fastpathmetrics-ptl'
- publishers:
- - email-ext:
- <<: *email_ptl_defaults
- recipients: >
- maryam.tahhan@intel.com
-
-- publisher:
name: 'email-fds-ptl'
publishers:
- email-ext:
@@ -772,14 +756,6 @@
ruan.he@orange.com
- publisher:
- name: 'email-multisite-ptl'
- publishers:
- - email-ext:
- <<: *email_ptl_defaults
- recipients: >
- joehuang@huawei.com
-
-- publisher:
name: 'email-netready-ptl'
publishers:
- email-ext:
@@ -796,14 +772,6 @@
ahothan@cisco.com
- publisher:
- name: 'email-octopus-ptl'
- publishers:
- - email-ext:
- <<: *email_ptl_defaults
- recipients: >
- ulrich.kleber@huawei.com
-
-- publisher:
name: 'email-onosfw-ptl'
publishers:
- email-ext:
@@ -812,14 +780,6 @@
su.wei@huawei.com
- publisher:
- name: 'email-openretriever-ptl'
- publishers:
- - email-ext:
- <<: *email_ptl_defaults
- recipients: >
- jiaxuan@chinamobile.com
-
-- publisher:
name: 'email-opera-ptl'
publishers:
- email-ext:
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index ee6357890..9d8bed45f 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -1015,17 +1015,6 @@
description: 'SSH key to be used'
- parameter:
- name: 'multisite-virtual-defaults'
- parameters:
- - label:
- name: SLAVE_LABEL
- default: 'multisite-virtual'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
name: 'ericsson-virtual5-defaults'
parameters:
- label:
diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index 1e92fbfef..2719c7292 100644
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -316,7 +316,7 @@
- trigger:
name: 'joid-os-nosdn-openbaton-ha-baremetal-fraser-trigger'
triggers:
- - timed: '5 23 * * *'
+ - timed: '' # Disabled as there is no branch for orchestra
# os-nosdn-openbaton-ha trigger - branch: master
- trigger:
name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger'
diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
deleted file mode 100644
index a04d7f10d..000000000
--- a/jjb/octopus/octopus.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-################################
-# job configuration for Octopus
-################################
-- project:
- name: octopus
-
- project: '{name}'
-
- jobs:
- - '{project}-verify-basic'
diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index 28f9354fa..ece856903 100644
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -8,6 +8,8 @@
stream:
- master:
branch: 'master'
+ - fraser:
+ branch: 'stable/{stream}'
- danube:
branch: 'stable/{stream}'
- euphrates:
diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 908ddba9d..5f08f69a4 100644
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -17,6 +17,10 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
+ - fraser: &fraser
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
- euphrates:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
@@ -87,7 +91,8 @@
- string:
name: GS_URL
default: '$GS_BASE{gs-pathname}'
- description: "Directory where the build artifact will be located upon the completion of the build."
+ description: "Directory where the build artifact will be located upon\
+ \ the completion of the build."
scm:
- git-scm
diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml
deleted file mode 100644
index b686d9524..000000000
--- a/jjb/prediction/prediction.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- project:
- name: prediction
-
- project: '{name}'
-
- jobs:
- - '{project}-verify-basic'
diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml
index 80893de89..f8e994c90 100644
--- a/jjb/releng/opnfv-lint.yml
+++ b/jjb/releng/opnfv-lint.yml
@@ -172,7 +172,7 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'REG_EXP'
- project-pattern: 'armband|fuel|octopus|releng-anteater'
+ project-pattern: 'armband|fuel|releng-anteater'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
diff --git a/jjb/releng/opnfv-utils.yml b/jjb/releng/opnfv-utils.yml
index fb3bab42b..19fb4b5af 100644
--- a/jjb/releng/opnfv-utils.yml
+++ b/jjb/releng/opnfv-utils.yml
@@ -129,6 +129,7 @@
default-slaves:
- lf-build1
- lf-build2
+ - ericsson-build4
allowed-multiselect: true
ignore-offline-nodes: true
- project-parameter:
diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index fefa8e68a..4df3f520d 100644
--- a/jjb/yardstick/yardstick-daily-jobs.yml
+++ b/jjb/yardstick/yardstick-daily-jobs.yml
@@ -178,6 +178,21 @@
installer: daisy
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
+ - zte-pod3:
+ slave-label: '{pod}'
+ installer: daisy
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *fraser
+ - zte-pod9:
+ slave-label: '{pod}'
+ installer: daisy
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *master
+ - zte-pod9:
+ slave-label: '{pod}'
+ installer: daisy
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *fraser
- orange-pod2:
slave-label: '{pod}'
installer: joid
@@ -455,6 +470,14 @@
description: 'Arguments to use in order to choose the backend DB'
- parameter:
+ name: 'yardstick-params-zte-pod9'
+ parameters:
+ - string:
+ name: YARDSTICK_DB_BACKEND
+ default: '-i 104.197.68.199:8086'
+ description: 'Arguments to use in order to choose the backend DB'
+
+- parameter:
name: 'yardstick-params-orange-pod1'
parameters:
- string: