summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/3rd_party_ci/odl-netvirt.yaml10
-rw-r--r--jjb/apex/apex-jjb-renderer.py4
-rw-r--r--jjb/apex/apex-verify-jobs.yaml8
-rw-r--r--jjb/apex/apex.yaml71
-rw-r--r--jjb/apex/apex.yaml.j211
-rw-r--r--jjb/apex/scenarios.yaml.hidden6
-rw-r--r--jjb/armband/armband-ci-jobs.yaml15
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yaml27
-rwxr-xr-xjjb/container4nfv/arm64/compass-build.sh8
-rwxr-xr-xjjb/container4nfv/arm64/compass-deploy.sh4
-rwxr-xr-xjjb/container4nfv/arm64/deploy-cni.sh17
-rw-r--r--jjb/container4nfv/container4nfv-arm64.yaml93
-rwxr-xr-xjjb/cperf/cperf-robot-netvirt-csit.sh3
-rwxr-xr-xjjb/dovetail/dovetail-run.sh1
-rw-r--r--jjb/fuel/fuel-daily-jobs.yaml43
-rw-r--r--jjb/fuel/fuel-weekly-jobs.yaml6
-rw-r--r--jjb/global/releng-macros.yaml10
17 files changed, 282 insertions, 55 deletions
diff --git a/jjb/3rd_party_ci/odl-netvirt.yaml b/jjb/3rd_party_ci/odl-netvirt.yaml
index 194924bb9..b810a2998 100644
--- a/jjb/3rd_party_ci/odl-netvirt.yaml
+++ b/jjb/3rd_party_ci/odl-netvirt.yaml
@@ -176,6 +176,16 @@
kill-phase-on: FAILURE
abort-all-job: false
- multijob:
+ name: apex-fetch-logs
+ condition: ALWAYS
+ projects:
+ - name: 'apex-fetch-logs-{stream}'
+ current-parameters: false
+ node-parameters: true
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
+ - multijob:
name: postprocess
condition: ALWAYS
projects:
diff --git a/jjb/apex/apex-jjb-renderer.py b/jjb/apex/apex-jjb-renderer.py
index 0da47b518..58dc4fff9 100644
--- a/jjb/apex/apex-jjb-renderer.py
+++ b/jjb/apex/apex-jjb-renderer.py
@@ -20,7 +20,8 @@ def render_jjb():
gspathname = dict()
branch = dict()
build_slave = dict()
- env = Environment(loader=FileSystemLoader('./'), autoescape=True)
+ env = Environment(loader=FileSystemLoader('./'), autoescape=True,
+ keep_trailing_newline=True)
with open('scenarios.yaml.hidden') as _:
scenarios = yaml.safe_load(_)
@@ -45,5 +46,6 @@ def render_jjb():
with open('./apex.yaml', 'w') as fh:
fh.write(output)
+
if __name__ == "__main__":
render_jjb()
diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml
index f808793fb..f0f99fc78 100644
--- a/jjb/apex/apex-verify-jobs.yaml
+++ b/jjb/apex/apex-verify-jobs.yaml
@@ -194,7 +194,11 @@
max-per-node: 3
max-total: 10
option: 'project'
-
+ - build-blocker:
+ use-build-blocker: true
+ block-level: 'NODE'
+ blocking-jobs:
+ - 'apex-.*-promote.*'
builders:
- description-setter:
description: "Built on $NODE_NAME"
@@ -245,7 +249,7 @@
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
FUNCTEST_SUITE_NAME=tempest_smoke
FUNCTEST_MODE=testcase
- node-parameters: false
+ node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index b20c469bf..82f766e20 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -123,6 +123,8 @@
<<: *master
- 'os-nosdn-nofeature-ha':
<<: *master
+ - 'os-nosdn-nofeature-ha-ipv6':
+ <<: *master
- 'os-odl-nofeature-noha':
<<: *master
- 'os-odl-nofeature-ha':
@@ -131,6 +133,8 @@
<<: *master
- 'os-nosdn-queens-ha':
<<: *master
+ - 'os-nosdn-queens-ha-ipv6':
+ <<: *master
- 'os-odl-queens-noha':
<<: *master
- 'os-odl-queens-ha':
@@ -145,6 +149,14 @@
<<: *master
- 'os-odl-bgpvpn_queens-noha':
<<: *master
+ - 'os-odl-sfc-ha':
+ <<: *master
+ - 'os-odl-sfc-noha':
+ <<: *master
+ - 'os-odl-sfc_queens-ha':
+ <<: *master
+ - 'os-odl-sfc_queens-noha':
+ <<: *master
- 'os-nosdn-nofeature-noha':
<<: *euphrates
- 'os-nosdn-nofeature-ha':
@@ -912,6 +924,17 @@
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: false
+ - name: 'apex-fetch-logs-{stream}'
+ current-parameters: false
+ predefined-parameters: |
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+ node-parameters: true
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
- multijob:
name: create snapshot
condition: SUCCESSFUL
@@ -1490,6 +1513,14 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
+ - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-master'
+ 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-nofeature-noha-baremetal-master'
node-parameters: false
current-parameters: false
@@ -1522,6 +1553,14 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
+ - name: 'apex-os-nosdn-queens-ha-ipv6-baremetal-master'
+ 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-queens-noha-baremetal-master'
node-parameters: false
current-parameters: false
@@ -1578,6 +1617,38 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
+ - name: 'apex-os-odl-sfc-ha-baremetal-master'
+ 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-master'
+ 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_queens-ha-baremetal-master'
+ 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_queens-noha-baremetal-master'
+ node-parameters: false
+ current-parameters: false
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
# euphrates Builder
- builder:
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 8d5c673dd..31e3bd8f3 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -800,6 +800,17 @@
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: false
+ - name: 'apex-fetch-logs-{stream}'
+ current-parameters: false
+ predefined-parameters: |
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+ node-parameters: true
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
- multijob:
name: create snapshot
condition: SUCCESSFUL
diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index 13449aa90..b032613a3 100644
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -1,10 +1,12 @@
master:
- 'os-nosdn-nofeature-noha'
- 'os-nosdn-nofeature-ha'
+ - 'os-nosdn-nofeature-ha-ipv6'
- 'os-odl-nofeature-noha'
- 'os-odl-nofeature-ha'
- 'os-nosdn-queens-noha'
- 'os-nosdn-queens-ha'
+ - 'os-nosdn-queens-ha-ipv6'
- 'os-odl-queens-noha'
- 'os-odl-queens-ha'
- 'k8s-nosdn-nofeature-noha'
@@ -12,6 +14,10 @@ master:
- 'os-odl-bgpvpn-noha'
- 'os-odl-bgpvpn_queens-ha'
- 'os-odl-bgpvpn_queens-noha'
+ - 'os-odl-sfc-ha'
+ - 'os-odl-sfc-noha'
+ - 'os-odl-sfc_queens-ha'
+ - 'os-odl-sfc_queens-noha'
fraser:
- 'os-nosdn-nofeature-ha'
- 'os-odl-bgpvpn-ha'
diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml
index ad96cf38e..959115ac2 100644
--- a/jjb/armband/armband-ci-jobs.yaml
+++ b/jjb/armband/armband-ci-jobs.yaml
@@ -66,11 +66,17 @@
auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
- 'os-nosdn-ovs-ha':
auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+ - 'os-nosdn-vpp-ha':
+ auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
# NOHA scenarios
- 'os-nosdn-nofeature-noha':
auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+ exclude:
+ - scenario: os-nosdn-vpp-ha
+ stream: fraser
+
jobs:
- '{installer}-{scenario}-{pod}-daily-{stream}'
- '{installer}-deploy-{pod}-daily-{stream}'
@@ -301,6 +307,10 @@
name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-master-trigger'
triggers:
- timed: '0 1 * * 1,3,5'
+- trigger:
+ name: 'fuel-os-nosdn-vpp-ha-armband-baremetal-master-trigger'
+ triggers:
+ - timed: ''
# ---------------------------------------------------------------------
# Enea Armband CI Baremetal Triggers running against fraser branch
# ---------------------------------------------------------------------
@@ -324,7 +334,6 @@
name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-fraser-trigger'
triggers:
- timed: ''
-
# --------------------------------------------------------------
# Enea Armband CI Virtual Triggers running against master branch
# --------------------------------------------------------------
@@ -348,6 +357,10 @@
name: 'fuel-os-nosdn-ovs-ha-armband-virtual-master-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-vpp-ha-armband-virtual-master-trigger'
+ triggers:
+ - timed: ''
# -------------------------------------------------------------------
# Enea Armband CI Virtual Triggers running against fraser branch
# -------------------------------------------------------------------
diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml
index f9d222a7d..3a263d451 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yaml
+++ b/jjb/compass4nfv/compass-ci-jobs.yaml
@@ -129,6 +129,9 @@
- 'k8-nosdn-stor4nfv-noha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ - 'os-nosdn-stor4nfv-ha':
+ disabled: false
+ auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
jobs:
- 'compass-{scenario}-{pod}-daily-{stream}'
@@ -511,6 +514,10 @@
name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-centos-master-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-nosdn-stor4nfv-ha-baremetal-centos-master-trigger'
+ triggers:
+ - timed: ''
# ----------------------------
# noha-baremetal-centos-master
@@ -604,6 +611,10 @@
name: 'compass-k8-nosdn-stor4nfv-ha-huawei-pod7-danube-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-nosdn-stor4nfv-ha-huawei-pod7-danube-trigger'
+ triggers:
+ - timed: ''
# ----------------------------
# noha-huawei-pod7-danube
@@ -696,6 +707,10 @@
name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-master-trigger'
triggers:
- timed: '0 16 1-29/2 * *'
+- trigger:
+ name: 'compass-os-nosdn-stor4nfv-ha-baremetal-master-trigger'
+ triggers:
+ - timed: '0 20 1-29/2 * *'
# ---------------------
# noha-baremetal-master
@@ -788,6 +803,10 @@
name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-fraser-trigger'
triggers:
- timed: '0 7 2-30/2 * *'
+- trigger:
+ name: 'compass-os-nosdn-stor4nfv-ha-baremetal-fraser-trigger'
+ triggers:
+ - timed: ''
# ---------------------
# noha-baremetal-fraser
@@ -880,6 +899,10 @@
name: 'compass-k8-nosdn-stor4nfv-ha-virtual-master-trigger'
triggers:
- timed: '0 15 2-30/2 * *'
+- trigger:
+ name: 'compass-os-nosdn-stor4nfv-ha-virtual-master-trigger'
+ triggers:
+ - timed: '0 19 2-30/2 * *'
# -------------------
# noha-virtual-master
@@ -972,6 +995,10 @@
name: 'compass-k8-nosdn-stor4nfv-ha-virtual-fraser-trigger'
triggers:
- timed: '0 15 1-29/2 * *'
+- trigger:
+ name: 'compass-os-nosdn-stor4nfv-ha-virtual-fraser-trigger'
+ triggers:
+ - timed: ''
# -------------------
# noha-virtual-fraser
diff --git a/jjb/container4nfv/arm64/compass-build.sh b/jjb/container4nfv/arm64/compass-build.sh
index 696f7ff76..326e6241b 100755
--- a/jjb/container4nfv/arm64/compass-build.sh
+++ b/jjb/container4nfv/arm64/compass-build.sh
@@ -7,8 +7,8 @@ COMPASS_WORK_DIR=$WORKSPACE/../compass-work
mkdir -p $COMPASS_WORK_DIR
ln -s $COMPASS_WORK_DIR work
-#TODO: remove workaround after all arm64 patches merged
-curl -s http://people.linaro.org/~yibo.cai/compass/compass4nfv-arm64-fixup.sh | bash -s {scenario}
+sudo docker rm -f `docker ps | grep compass | cut -f1 -d' '` || true
-# build tarball
-COMPASS_ISO_REPO='http://people.linaro.org/~yibo.cai/compass' ./build.sh
+curl -s http://people.linaro.org/~yibo.cai/compass/compass4nfv-arm64-fixup.sh | bash -s {scenario} || true
+
+./build.sh
diff --git a/jjb/container4nfv/arm64/compass-deploy.sh b/jjb/container4nfv/arm64/compass-deploy.sh
index a22af09ba..7889c3bba 100755
--- a/jjb/container4nfv/arm64/compass-deploy.sh
+++ b/jjb/container4nfv/arm64/compass-deploy.sh
@@ -5,11 +5,11 @@ cd compass4nfv
export ADAPTER_OS_PATTERN='(?i)CentOS-7.*arm.*'
export OS_VERSION="centos7"
-export KUBERNETES_VERSION="v1.7.5"
+export KUBERNETES_VERSION="v1.9.1"
if [[ "$NODE_NAME" =~ "-virtual" ]]; then
export DHA="deploy/conf/vm_environment/k8-nosdn-nofeature-noha.yml"
export NETWORK="deploy/conf/vm_environment/network.yml"
- export VIRT_NUMBER=2 VIRT_CPUS=4 VIRT_MEM=8192 VIRT_DISK=50G
+ export VIRT_NUMBER=2 VIRT_CPUS=8 VIRT_MEM=8192 VIRT_DISK=50G
else
export DHA="deploy/conf/hardware_environment/huawei-pod8/k8-nosdn-nofeature-noha.yml"
export NETWORK="deploy/conf/hardware_environment/huawei-pod8/network.yml"
diff --git a/jjb/container4nfv/arm64/deploy-cni.sh b/jjb/container4nfv/arm64/deploy-cni.sh
new file mode 100755
index 000000000..9afb98048
--- /dev/null
+++ b/jjb/container4nfv/arm64/deploy-cni.sh
@@ -0,0 +1,17 @@
+#!/bin/bash -e
+
+cd container4nfv/src/arm/cni-deploy
+
+DEPLOY_SCENARIO={scenario}
+
+virtualenv .venv
+source .venv/bin/activate
+pip install ansible==2.6.1
+
+ansible-playbook -i inventory/inventory.cfg deploy.yml --tags flannel,multus
+
+if [ "$DEPLOY_SCENARIO" == "k8-sriov-nofeature-noha" ]; then
+ ansible-playbook -i inventory/inventory.cfg deploy.yml --tags sriov
+elif [ "$DEPLOY_SCENARIO" == "k8-vpp-nofeature-noha" ]; then
+ ansible-playbook -i inventory/inventory.cfg deploy.yml --tags vhost-vpp
+fi
diff --git a/jjb/container4nfv/container4nfv-arm64.yaml b/jjb/container4nfv/container4nfv-arm64.yaml
index 5f5bc8627..5e763aebf 100644
--- a/jjb/container4nfv/container4nfv-arm64.yaml
+++ b/jjb/container4nfv/container4nfv-arm64.yaml
@@ -14,21 +14,28 @@
disabled: false
- 'k8-sriov-nofeature-noha':
disabled: false
+ - 'k8-vpp-nofeature-noha':
+ disabled: false
pod:
- virtual:
slave-label: arm-packet01
- baremetal:
slave-label: compass-baremetal-arm
jobs:
+ - 'container4nfv-arm-deploy-{pod}-daily-{stream}'
- 'container4nfv-{scenario}-{pod}-daily-{stream}'
- job-template:
- name: 'container4nfv-{scenario}-{pod}-daily-{stream}'
- disabled: '{obj:disabled}'
- concurrent: false
+ name: 'container4nfv-arm-deploy-{pod}-daily-{stream}'
+ disabled: false
node: '{slave-label}'
+ wrappers:
+ - timeout:
+ timeout: 210
+ fail: true
+
scm:
- git:
url: https://gerrit.opnfv.org/gerrit/compass4nfv
@@ -38,12 +45,7 @@
wipe-workspace: true
triggers:
- - 'trigger-{scenario}-{pod}-{stream}'
-
- wrappers:
- - timeout:
- timeout: 150
- fail: true
+ - 'trigger-deploy-{pod}-{stream}'
builders:
- shell:
@@ -54,42 +56,65 @@
- project: yardstick-arm64-compass-arm-virtual03-daily-master
current-parameters: false
same-node: true
- block: false
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'Failure'
+ - project: container4nfv-k8-multus-nofeature-noha-{pod}-daily-{stream}
+ current-parameters: true
+ same-node: true
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'Failure'
+ - project: container4nfv-k8-sriov-nofeature-noha-{pod}-daily-{stream}
+ current-parameters: true
+ same-node: true
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'Failure'
+ - project: container4nfv-k8-vpp-nofeature-noha-{pod}-daily-{stream}
+ current-parameters: true
+ same-node: true
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'never'
-- trigger:
- name: 'trigger-k8-multus-nofeature-noha-virtual-master'
- triggers:
- - timed: '0 12 * * *'
-- trigger:
- name: 'trigger-k8-sriov-nofeature-noha-virtual-master'
- triggers:
- - timed: '0 15 * * *'
+- job-template:
+ name: 'container4nfv-{scenario}-{pod}-daily-{stream}'
+ disabled: '{obj:disabled}'
-- trigger:
- name: 'trigger-k8-multus-nofeature-noha-virtual-fraser'
- triggers:
- - timed: '0 18 * * *'
-- trigger:
- name: 'trigger-k8-sriov-nofeature-noha-virtual-fraser'
- triggers:
- - timed: '0 21 * * *'
+ scm:
+ - git:
+ url: https://gerrit.opnfv.org/gerrit/container4nfv
+ basedir: container4nfv
+ wipe-workspace: true
+
+ builders:
+ - shell:
+ !include-raw: arm64/deploy-cni.sh
- trigger:
- name: 'trigger-k8-multus-nofeature-noha-baremetal-master'
+ name: 'trigger-deploy-virtual-master'
triggers:
- timed: '0 12 * * *'
- trigger:
- name: 'trigger-k8-sriov-nofeature-noha-baremetal-master'
+ name: 'trigger-deploy-virtual-fraser'
triggers:
- - timed: '0 15 * * *'
-
+ - timed: '0 18 * * *'
- trigger:
- name: 'trigger-k8-multus-nofeature-noha-baremetal-fraser'
+ name: 'trigger-deploy-baremetal-master'
triggers:
- - timed: '0 18 * * *'
+ - timed: '0 12 * * *'
- trigger:
- name: 'trigger-k8-sriov-nofeature-noha-baremetal-fraser'
+ name: 'trigger-deploy-baremetal-fraser'
triggers:
- - timed: '0 21 * * *'
+ - timed: '0 18 * * *'
diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh
index 0f4bb234b..15f8669a6 100755
--- a/jjb/cperf/cperf-robot-netvirt-csit.sh
+++ b/jjb/cperf/cperf-robot-netvirt-csit.sh
@@ -92,6 +92,7 @@ LOGS_LOCATION=/tmp/robot_results
robot_cmd="pybot \
--removekeywords wuks \
--xunit robotxunit.xml \
+ --name 'CSIT' \
-e exclude \
-d $LOGS_LOCATION \
-v BUNDLEFOLDER:/opt/opendaylight \
@@ -166,6 +167,8 @@ docker run -i --net=host \
opnfv/cperf:$DOCKER_TAG \
/bin/bash -c "source /tmp/overcloudrc; mkdir -p \$HOME/.ssh; cp /tmp/id_rsa \$HOME/.ssh; \
cd /home/opnfv/repos/odl_test/ && git pull origin master; \
+ yum remove -y python-chardet; \
+ pip install odltools; \
${robot_cmd} ${suites};"
echo "Running post CSIT clean"
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index 2797ec5ff..b60ba7dc4 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -208,6 +208,7 @@ if [ -f ${DOVETAIL_CONFIG}/pod.yaml ]; then
cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml
process_info:
- {testcase_name: yardstick.ha.rabbitmq, attack_process: rabbitmq_server}
+- {testcase_name: yardstick.ha.cinder_api, attack_process: cinder_wsgi}
EOF
elif [ "$INSTALLER_TYPE" == "fuel" ]; then
cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml
diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index b5ecf0917..fc8269a56 100644
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -75,6 +75,8 @@
auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
- 'os-nosdn-kvm_ovs_dpdk_bar-ha':
auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+ - 'os-nosdn-vpp-ha':
+ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
# NOHA scenarios
- 'os-nosdn-nofeature-noha':
auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
@@ -96,6 +98,8 @@
auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
- 'os-nosdn-kvm_ovs_dpdk_bar-noha':
auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+ - 'os-nosdn-vpp-noha':
+ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
# danube scenario for Dovetail only
- 'os-odl_l2-bgpvpn-ha':
auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
@@ -111,6 +115,14 @@
stream: danube
- scenario: os-odl-ovs-noha
stream: fraser
+ - scenario: os-nosdn-vpp-ha
+ stream: fraser
+ - scenario: os-nosdn-vpp-noha
+ stream: fraser
+ - scenario: os-nosdn-vpp-ha
+ stream: danube
+ - scenario: os-nosdn-vpp-noha
+ stream: danube
jobs:
- 'fuel-{scenario}-{pod}-daily-{stream}'
@@ -254,8 +266,7 @@
unstable-threshold: 'FAILURE'
publishers:
- - email:
- recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com
+ - email-fuel-ptl
- email-jenkins-admins-on-failure
- job-template:
@@ -311,8 +322,7 @@
!include-raw-escape: ./fuel-deploy.sh
publishers:
- - email:
- recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com
+ - email-fuel-ptl
- email-jenkins-admins-on-failure
- report-provision-result
@@ -397,6 +407,11 @@
name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-baremetal-daily-master-trigger'
triggers:
- timed: '' # '30 8 * * *'
+- trigger:
+ name: 'fuel-os-nosdn-vpp-ha-baremetal-daily-master-trigger'
+ triggers:
+ - timed: ''
+
# NOHA Scenarios
- trigger:
name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-master-trigger'
@@ -438,6 +453,10 @@
name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-baremetal-daily-master-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-vpp-noha-baremetal-daily-master-trigger'
+ triggers:
+ - timed: ''
# ----------------------------------------------
# Triggers for job running on fuel-baremetal against fraser branch
# ----------------------------------------------
@@ -554,6 +573,10 @@
name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-virtual-daily-master-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-vpp-ha-virtual-daily-master-trigger'
+ triggers:
+ - timed: ''
# NOHA Scenarios
- trigger:
name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-master-trigger'
@@ -595,6 +618,10 @@
name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-virtual-daily-master-trigger'
triggers:
- timed: '' # '30 20 * * *'
+- trigger:
+ name: 'fuel-os-nosdn-vpp-noha-virtual-daily-master-trigger'
+ triggers:
+ - timed: ''
# ----------------------------------------------
# Triggers for job running on fuel-virtual against fraser branch
# ----------------------------------------------
@@ -710,6 +737,10 @@
name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-zte-pod1-daily-master-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-vpp-ha-zte-pod1-daily-master-trigger'
+ triggers:
+ - timed: ''
# NOHA Scenarios
- trigger:
name: 'fuel-os-nosdn-nofeature-noha-zte-pod1-daily-master-trigger'
@@ -751,3 +782,7 @@
name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-zte-pod1-daily-master-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-vpp-noha-zte-pod1-daily-master-trigger'
+ triggers:
+ - timed: ''
diff --git a/jjb/fuel/fuel-weekly-jobs.yaml b/jjb/fuel/fuel-weekly-jobs.yaml
index aca625d2b..c6b921729 100644
--- a/jjb/fuel/fuel-weekly-jobs.yaml
+++ b/jjb/fuel/fuel-weekly-jobs.yaml
@@ -118,8 +118,7 @@
unstable-threshold: 'FAILURE'
publishers:
- - email:
- recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com
+ - email-fuel-ptl
- email-jenkins-admins-on-failure
- job-template:
@@ -173,8 +172,7 @@
!include-raw-escape: ./fuel-deploy.sh
publishers:
- - email:
- recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com
+ - email-fuel-ptl
- email-jenkins-admins-on-failure
- report-provision-result
diff --git a/jjb/global/releng-macros.yaml b/jjb/global/releng-macros.yaml
index b282cff4f..8055fdbdf 100644
--- a/jjb/global/releng-macros.yaml
+++ b/jjb/global/releng-macros.yaml
@@ -720,7 +720,7 @@
- email-ext:
<<: *email_ptl_defaults
recipients: >
- gelkinbard@mirantis.com
+ Alexandru.Avadanii@enea.com
- publisher:
name: 'email-functest-ptl'
@@ -883,7 +883,7 @@
- email-ext:
<<: *email_ptl_defaults
recipients: >
- fatih.degirmenci@ericsson.com
+ tbramwell@linuxfoundation.org
- publisher:
name: 'email-releng-anteater-ptl'
<<: *email_releng_ptl_defaults
@@ -900,7 +900,11 @@
<<: *email_releng_ptl_defaults
- publisher:
name: 'email-releng-xci-ptl'
- <<: *email_releng_ptl_defaults
+ publishers:
+ - email-ext:
+ <<: *email_ptl_defaults
+ recipients: >
+ fatih.degirmenci@ericsson.com
- publisher:
name: 'email-samplevnf-ptl'