Merge "[Compass4nfv] Make the Gambia stream available to Docker builds"

diff --git a/jjb/apex/apex-download-artifact.sh b/jjb/apex/apex-download-artifact.sh
index 10efbe1..bc3311d 100755 (executable)
--- a/jjb/apex/apex-download-artifact.sh
+++ b/jjb/apex/apex-download-artifact.sh
@@ -47,7 +47,7 @@ else
   RPM_LIST=$(basename $OPNFV_RPM_URL)
   # find version of RPM
   VERSION_EXTENSION=$(echo $(basename $RPM_LIST) | grep -Eo '[0-9]+\.[0-9]+-([0-9]{8}|[a-z]+-[0-9]\.[0-9]+)')
-  if [ "$BRANCH" != 'master' ]; then
+  if [ "$BRANCH" == 'stable/fraser' ]; then
     # build RPM List which already includes base Apex RPM
     RPM_LIST+=" opnfv-apex-undercloud-${VERSION_EXTENSION}.noarch.rpm"
     RPM_LIST+=" python34-opnfv-apex-${VERSION_EXTENSION}.noarch.rpm"

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 0d555c5..26f282f 100644 (file)
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -240,7 +240,7 @@
 
     os_version:
       - 'queens':
-          os_scenario: 'queens'
+          os_scenario: 'nofeature'
           odl_branch: 'stable/oxygen'
       - 'rocky':
           os_scenario: 'rocky'

diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 5f02496..b302cda 100644 (file)
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -86,7 +86,7 @@
 
     os_version:
       - 'queens':
-          os_scenario: 'queens'
+          os_scenario: 'nofeature'
           odl_branch: 'stable/oxygen'
       - 'rocky':
           os_scenario: 'rocky'

diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
index 2e500be..365afdd 100644 (file)
--- a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
+++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
@@ -126,6 +126,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - project-parameter:
           project: $GERRIT_PROJECT
           branch: '{branch}'

diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh
index a5bb6e7..abd62a3 100755 (executable)
--- a/jjb/cperf/cperf-robot-netvirt-csit.sh
+++ b/jjb/cperf/cperf-robot-netvirt-csit.sh
@@ -148,18 +148,24 @@ SUITE_HOME='/home/opnfv/repos/odl_test/csit/suites'
 # This suite fails with an error indicating the connection was closed
 # to the overcloud control node:
 # https://build.opnfv.org/ci/job/cperf-apex-csit-master/104/consoleFull
-
-suites="${SUITE_HOME}/openstack/connectivity/l2.robot \
-        ${SUITE_HOME}/openstack/connectivity/l3.robot \
-        ${SUITE_HOME}/openstack/connectivity/external_network.robot \
-        ${SUITE_HOME}/openstack/connectivity/security_group.robot \
-        ${SUITE_HOME}/openstack/securitygroup/neutron_security_group.robot \
-        ${SUITE_HOME}/openstack/securitygroup/security_group_l3bcast.robot \
-        ${SUITE_HOME}/netvirt/vpnservice/vpn_basic.robot \
-        ${SUITE_HOME}/netvirt/elan/elan.robot \
-        ${SUITE_HOME}/netvirt/vpnservice/arp_learning.robot \
-        ${SUITE_HOME}/netvirt/l2l3_gatewaymac_arp.robot \
-        ${SUITE_HOME}/integration/Create_JVM_Plots.robot"
+#
+# Minimize HA CSIT as it does not pass all suites
+if [ "$NUM_CONTROL_NODES" -eq 3 ]; then
+  suites="${SUITE_HOME}/openstack/connectivity/l2.robot \
+          ${SUITE_HOME}/openstack/connectivity/l3.robot"
+else
+  suites="${SUITE_HOME}/openstack/connectivity/l2.robot \
+          ${SUITE_HOME}/openstack/connectivity/l3.robot \
+          ${SUITE_HOME}/openstack/connectivity/external_network.robot \
+          ${SUITE_HOME}/openstack/connectivity/security_group.robot \
+          ${SUITE_HOME}/openstack/securitygroup/neutron_security_group.robot \
+          ${SUITE_HOME}/openstack/securitygroup/security_group_l3bcast.robot \
+          ${SUITE_HOME}/netvirt/vpnservice/vpn_basic.robot \
+          ${SUITE_HOME}/netvirt/elan/elan.robot \
+          ${SUITE_HOME}/netvirt/vpnservice/arp_learning.robot \
+          ${SUITE_HOME}/netvirt/l2l3_gatewaymac_arp.robot \
+          ${SUITE_HOME}/integration/Create_JVM_Plots.robot"
+fi
 
 echo "Robot command set: ${robot_cmd}"
 echo "Running robot..."

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index b78bab1..c79210e 100644 (file)
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -3,6 +3,11 @@
     name: doctor
 
     project: '{name}'
+    project-name: '{name}'
+    project-pattern: '{project}'
+
+    rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-doctor/47214/'
+    rtd-token: '13264f62c1a044e39e9aed22a0dc1853d5a0b196'
 
     stream:
       - master:
@@ -42,6 +47,7 @@
       - 'doctor-verify-fault_management-{installer}-{inspector}-{arch}-{stream}'
       - 'doctor-verify-maintenance-{installer}-{inspector}-{arch}-{stream}'
       - 'doctor-verify-all-{installer}-{inspector}-{arch}-{stream}'
+      - '{project-name}-rtd-jobs'
 
 - job-template:
     name: 'doctor-verify-{stream}'

diff --git a/jjb/fuel/fuel-docker-jobs.yaml b/jjb/fuel/fuel-docker-jobs.yaml
index 21656ed..c06848e 100644 (file)
--- a/jjb/fuel/fuel-docker-jobs.yaml
+++ b/jjb/fuel/fuel-docker-jobs.yaml
@@ -132,6 +132,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build-ubuntu'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: PROJECT
           default: "{project}"
@@ -174,6 +176,8 @@
           name: SLAVE_LABEL
           default: '{slave_label}'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index 14134fa..19967e9 100644 (file)
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -230,6 +230,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build-ubuntu'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: PROJECT
           default: "{project}"
@@ -272,6 +274,8 @@
           name: SLAVE_LABEL
           default: '{slave_label}'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT

diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml
index 3836103..c328f5d 100644 (file)
--- a/jjb/functest/functest-kubernetes-docker.yaml
+++ b/jjb/functest/functest-kubernetes-docker.yaml
@@ -183,6 +183,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build-ubuntu'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: PROJECT
           default: "{project}"
@@ -225,6 +227,8 @@
           name: SLAVE_LABEL
           default: '{slave_label}'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT

diff --git a/jjb/functest/xtesting-docker.yaml b/jjb/functest/xtesting-docker.yaml
index 84bcb21..88416bb 100644 (file)
--- a/jjb/functest/xtesting-docker.yaml
+++ b/jjb/functest/xtesting-docker.yaml
@@ -135,6 +135,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build-ubuntu'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: PROJECT
           default: "{project}"
@@ -176,6 +178,8 @@
           name: SLAVE_LABEL
           default: '{slave_label}'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT

diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml
index 023d2dd..805673a 100644 (file)
--- a/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@ -10,6 +10,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-baremetal-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -25,6 +27,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-baremetal-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -40,6 +44,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-baremetal-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -55,6 +61,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-baremetal-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -70,6 +78,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-baremetal-danube'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -86,6 +96,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-virtual-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -101,6 +113,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-virtual-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -116,6 +130,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-virtual-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -131,6 +147,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-virtual-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -146,6 +164,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-virtual-danube'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -240,6 +260,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-baremetal'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -254,6 +276,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'compass-baremetal'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -265,6 +289,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'compass-baremetal-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -276,6 +302,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'compass-baremetal-branch'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -287,6 +315,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'fuel-baremetal'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -298,6 +328,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'armband-baremetal'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -309,6 +341,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'auto-baremetal'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -320,6 +354,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'joid-baremetal'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -342,6 +378,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'daisy-baremetal'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: INSTALLER_IP
           default: '10.20.7.3'
@@ -360,6 +398,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'apex-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -375,6 +415,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'compass-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -386,6 +428,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'compass-arm-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -397,6 +441,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'compass-virtual-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -408,6 +454,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'compass-virtual-branch'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -419,6 +467,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'fuel-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -430,6 +480,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'armband-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -441,6 +493,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'joid-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -460,6 +514,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'daisy-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: INSTALLER_IP
           default: '10.20.11.2'
@@ -482,6 +538,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'opnfv-build-centos'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -498,6 +556,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build-ubuntu'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -514,6 +574,8 @@
           name: SLAVE_LABEL
           default: 'pharos-dashboard'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -530,6 +592,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -546,6 +610,8 @@
           name: SLAVE_LABEL
           default: 'ericsson-build3'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -558,6 +624,8 @@
           name: SLAVE_LABEL
           default: 'ericsson-build4'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -589,6 +657,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build-ubuntu-arm'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -708,6 +778,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'huawei-test'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -726,6 +798,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'huawei-test'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -765,6 +839,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'huawei-virtual5'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -1080,6 +1156,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'ericsson-virtual5'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://git.opendaylight.org/gerrit/p/$PROJECT.git
@@ -1091,6 +1169,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'ericsson-virtual12'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -1102,6 +1182,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'ericsson-virtual13'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -1113,6 +1195,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'ericsson-virtual-pod1bl01'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -1124,6 +1208,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'odl-netvirt-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -1135,6 +1221,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'odl-netvirt-virtual-intel'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -1165,6 +1253,8 @@
           name: SLAVE_LABEL
           default: 'sandbox-baremetal'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -1181,6 +1271,8 @@
           name: SLAVE_LABEL
           default: 'sandbox-virtual'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -1197,6 +1289,8 @@
           name: SLAVE_LABEL
           default: 'dummy-pod1'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT

diff --git a/jjb/openci/openci-opnfv-daily-jobs.yaml b/jjb/openci/openci-opnfv-daily-jobs.yaml
index afa8eff..020171b 100644 (file)
--- a/jjb/openci/openci-opnfv-daily-jobs.yaml
+++ b/jjb/openci/openci-opnfv-daily-jobs.yaml
@@ -47,6 +47,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
 
     wrappers:
       - credentials-binding:
@@ -104,6 +106,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
 
     wrappers:
       - credentials-binding:

diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index 87c37b3..1492a68 100644 (file)
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -29,6 +29,8 @@
           name: SLAVE_LABEL
           default: 'lf-build1'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
@@ -60,6 +62,8 @@
           name: SLAVE_LABEL
           default: 'lf-build2'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - project-parameter:
           project: '{project}'
           branch: '{branch}'

diff --git a/jjb/releng/compass4nfv-docker.yaml b/jjb/releng/compass4nfv-docker.yaml
index fe28b2b..7cedba9 100644 (file)
--- a/jjb/releng/compass4nfv-docker.yaml
+++ b/jjb/releng/compass4nfv-docker.yaml
@@ -219,6 +219,8 @@
           name: SLAVE_LABEL
           default: '{slave_label}'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT

diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml
index b0ea767..3c5c07b 100644 (file)
--- a/jjb/releng/opnfv-utils.yaml
+++ b/jjb/releng/opnfv-utils.yaml
@@ -131,6 +131,7 @@
           default-slaves:
             - lf-build1
             - lf-build2
+            - lf-build3
             - ericsson-build3
             - ericsson-build4
           allowed-multiselect: true

diff --git a/jjb/releng/testresults-automate.yaml b/jjb/releng/testresults-automate.yaml
index 01fbe0c..3a9bead 100644 (file)
--- a/jjb/releng/testresults-automate.yaml
+++ b/jjb/releng/testresults-automate.yaml
@@ -28,6 +28,8 @@
           name: SLAVE_LABEL
           default: 'testresults'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - project-parameter:
           project: 'releng-testresults'
           branch: 'master'

diff --git a/jjb/xci/bifrost-periodic-jobs.yaml b/jjb/xci/bifrost-periodic-jobs.yaml
index 3109e87..4c61be1 100644 (file)
--- a/jjb/xci/bifrost-periodic-jobs.yaml
+++ b/jjb/xci/bifrost-periodic-jobs.yaml
@@ -122,6 +122,8 @@
       - label:
           name: SLAVE_LABEL
           default: '{slave-label}'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: CI_LOOP
           default: 'periodic'

diff --git a/jjb/xci/bifrost-verify-jobs.yaml b/jjb/xci/bifrost-verify-jobs.yaml
index e1569fe..f895cf6 100644 (file)
--- a/jjb/xci/bifrost-verify-jobs.yaml
+++ b/jjb/xci/bifrost-verify-jobs.yaml
@@ -128,6 +128,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: CI_LOOP
           default: 'verify'

diff --git a/jjb/xci/osa-periodic-jobs.yaml b/jjb/xci/osa-periodic-jobs.yaml
index ecbf0fc..b731bf5 100644 (file)
--- a/jjb/xci/osa-periodic-jobs.yaml
+++ b/jjb/xci/osa-periodic-jobs.yaml
@@ -82,6 +82,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: OPENSTACK_OSA_VERSION
           default: 'master'

diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml
index eaeb841..18b20f2 100644 (file)
--- a/jjb/xci/xci-daily-jobs.yaml
+++ b/jjb/xci/xci-daily-jobs.yaml
@@ -138,6 +138,8 @@
       - label:
           name: SLAVE_LABEL
           default: '{slave-label}'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: XCI_DISTRO
           default: '{distro}'
@@ -272,6 +274,8 @@
       - label:
           name: SLAVE_LABEL
           default: '{slave-label}'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: FUNCTEST_VERSION
           default: 'hunter'

diff --git a/jjb/xci/xci-merge-jobs.yaml b/jjb/xci/xci-merge-jobs.yaml
index b369ec1..c468be6 100644 (file)
--- a/jjb/xci/xci-merge-jobs.yaml
+++ b/jjb/xci/xci-merge-jobs.yaml
@@ -108,6 +108,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: CI_LOOP
           default: 'merge'
@@ -252,6 +254,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: CI_LOOP
           default: 'merge'

diff --git a/jjb/xci/xci-verify-jobs.yaml b/jjb/xci/xci-verify-jobs.yaml
index ae98fa4..9edf555 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yaml
+++ b/jjb/xci/xci-verify-jobs.yaml
@@ -140,6 +140,8 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: DISTRO
           default: '{distro}'

diff --git a/utils/build-server-ansible/main.yml b/utils/build-server-ansible/main.yml
index c9f244b..1df8a04 100644 (file)
--- a/utils/build-server-ansible/main.yml
+++ b/utils/build-server-ansible/main.yml
@@ -39,3 +39,8 @@
       when: ansible_distribution == "CentOS"
     - include: vars/docker-compose-Ubuntu.yml
       when: ansible_distribution == "Ubuntu"
+    - name: Install manifest-tool
+      get_url:
+        url: '{{ manifest_tool_url }}/{{ manifest_tool_version }}/manifest-tool-linux-{{ facter_architecture }}'
+        dest: '{{ manifest_tool_bin_dir }}/manifest-tool'
+        mode: '755'

diff --git a/utils/build-server-ansible/vars/Ubuntu.yml b/utils/build-server-ansible/vars/Ubuntu.yml
index f502558..bd77a4d 100644 (file)
--- a/utils/build-server-ansible/vars/Ubuntu.yml
+++ b/utils/build-server-ansible/vars/Ubuntu.yml
@@ -60,6 +60,76 @@
     - xmlstarlet
     - facter
     - jq
+    - python-tox
+    - collectd-dev
+    - python3
+    - python3-dev
+    - libdpdk-dev
+    - dpdk-dev
+    - fakeroot
+    - devscripts
+    - debhelper
+    - dpkg-dev
+    - po-debconf
+    - dh-systemd
+    - dh-strip-nondeterminism
+    - autotools-dev
+    - libltdl-dev
+    - iptables-dev
+    - javahelper
+    - libatasmart-dev
+    - libcap-dev
+    - libcurl4-gnutls-dev
+    - libdbi0-dev
+    - libesmtp-dev
+    - libganglia1-dev
+    - libgcrypt11-dev
+    - libgps-dev
+    - libhiredis-dev
+    - libi2c-dev
+    - libldap2-dev
+    - liblua5.3-dev
+    - liblvm2-dev
+    - libmemcached-dev
+    - libmodbus-dev
+    - libmnl-dev
+    - libmosquitto-dev
+    - libmysqlclient-dev
+    - libnotify-dev
+    - libopenipmi-dev
+    - liboping-dev
+    - libow-dev
+    - libpcap0.8-dev
+    - libpcap-dev
+    - libperl-dev
+    - libpq-dev
+    - libprotobuf-c-dev
+    - libriemann-client-dev
+    - librdkafka-dev
+    - librabbitmq-dev
+    - librrd-dev
+    - libsensors4-dev
+    - libsigrok-dev
+    - libsnmp-dev
+    - libsnmp9-dev
+    - snmp
+    - snmp-mibs-downloader
+    - snmpd
+    - perl
+    - libtokyocabinet-dev
+    - libtokyotyrant-dev
+    - libudev-dev
+    - libupsclient-dev
+    - libvarnishapi-dev
+    - libvirt-dev
+    - libvirt-daemon
+    - libxen-dev
+    - libyajl-dev
+    - linux-libc-dev
+    - default-jdk
+    - protobuf-c-compiler
+    - openvswitch-switch
+    - mcelog
 
 - name: Add Docker apt key.
   apt_key:

diff --git a/utils/build-server-ansible/vars/defaults.yml b/utils/build-server-ansible/vars/defaults.yml
index 8d83380..ff37c95 100644 (file)
--- a/utils/build-server-ansible/vars/defaults.yml
+++ b/utils/build-server-ansible/vars/defaults.yml
@@ -21,3 +21,7 @@ docker_yum_repo_url: https://download.docker.com/linux/centos/docker-ce.repo
 # yamllint enable rule:line-length
 docker_yum_repo_enable_edge: 0
 docker_yum_repo_enable_test: 0
+
+manifest_tool_version: 'v0.7.0'
+manifest_tool_url: 'https://github.com/estesp/manifest-tool/releases/download'
+manifest_tool_bin_dir: '/usr/local/bin'