Merge "jjb: xci: Make SUSE a voting job"

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 6bd2248..c858b7f 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -140,9 +140,9 @@
               <<: *master
         - 'os-odl-sfc-ha':
               <<: *master
-        - 'os-odl-fdio-dvr-noha':
+        - 'os-odl-fdio_dvr-noha':
               <<: *master
-        - 'os-odl-fdio-dvr-ha':
+        - 'os-odl-fdio_dvr-ha':
               <<: *master
         - 'os-nosdn-nofeature-noha':
               <<: *euphrates
@@ -182,9 +182,9 @@
               <<: *euphrates
         - 'os-odl-sfc-ha':
               <<: *euphrates
-        - 'os-odl-fdio-dvr-noha':
+        - 'os-odl-fdio_dvr-noha':
               <<: *euphrates
-        - 'os-odl-fdio-dvr-ha':
+        - 'os-odl-fdio_dvr-ha':
               <<: *euphrates
 
     platform:
@@ -1809,7 +1809,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-odl-fdio-dvr-noha-baremetal-master'
+                - name: 'apex-os-odl-fdio_dvr-noha-baremetal-master'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1818,7 +1818,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-odl-fdio-dvr-ha-baremetal-master'
+                - name: 'apex-os-odl-fdio_dvr-ha-baremetal-master'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -2008,7 +2008,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-odl-fdio-dvr-noha-baremetal-euphrates'
+                - name: 'apex-os-odl-fdio_dvr-noha-baremetal-euphrates'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -2017,7 +2017,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-os-odl-fdio-dvr-ha-baremetal-euphrates'
+                - name: 'apex-os-odl-fdio_dvr-ha-baremetal-euphrates'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |

diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index e7fe923..a89aa5d 100644 (file)
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -18,8 +18,8 @@ master:
   - 'os-nosdn-kvm_ovs_dpdk-ha'
   - 'os-odl-sfc-noha'
   - 'os-odl-sfc-ha'
-  - 'os-odl-fdio-dvr-noha'
-  - 'os-odl-fdio-dvr-ha'
+  - 'os-odl-fdio_dvr-noha'
+  - 'os-odl-fdio_dvr-ha'
 euphrates:
   - 'os-nosdn-nofeature-noha'
   - 'os-nosdn-nofeature-ha'
@@ -40,8 +40,8 @@ euphrates:
   - 'os-nosdn-kvm_ovs_dpdk-ha'
   - 'os-odl-sfc-noha'
   - 'os-odl-sfc-ha'
-  - 'os-odl-fdio-dvr-noha'
-  - 'os-odl-fdio-dvr-ha'
+  - 'os-odl-fdio_dvr-noha'
+  - 'os-odl-fdio_dvr-ha'
 danube:
   - 'os-nosdn-nofeature-noha'
   - 'os-nosdn-nofeature-ha'

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 7b25a9b..b107c65 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -290,6 +290,24 @@
                         build-step-failure-threshold: 'never'
                         failure-threshold: 'never'
                         unstable-threshold: 'FAILURE'
+        - conditional-step:
+            condition-kind: and
+            condition-operands:
+                - condition-kind: regex-match
+                  regex: os-nosdn-nofeature-ha
+                  label: '{scenario}'
+            steps:
+                - trigger-builds:
+                    - project: 'bottlenecks-compass-posca_stress_ping-{pod}-daily-{stream}'
+                      current-parameters: false
+                      predefined-parameters:
+                        DEPLOY_SCENARIO={scenario}
+                      block: true
+                      same-node: true
+                      block-thresholds:
+                        build-step-failure-threshold: 'never'
+                        failure-threshold: 'never'
+                        unstable-threshold: 'FAILURE'
 
 - job-template:
     name: 'compass-deploy-{pod}-daily-{stream}'

diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index 1b09cca..2cbb947 100755 (executable)
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -152,8 +152,10 @@ dovetail_home_volume="-v ${DOVETAIL_HOME}:${DOVETAIL_HOME}"
 echo "Dovetail: Pulling image opnfv/dovetail:${DOCKER_TAG}"
 docker pull opnfv/dovetail:$DOCKER_TAG >$redirect
 
+env4bgpvpn="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}"
+
 cmd="docker run ${opts} -e DOVETAIL_HOME=${DOVETAIL_HOME} ${docker_volume} ${dovetail_home_volume} \
-     ${sshkey} opnfv/dovetail:${DOCKER_TAG} /bin/bash"
+     ${sshkey} ${env4bgpvpn} opnfv/dovetail:${DOCKER_TAG} /bin/bash"
 echo "Dovetail: running docker run command: ${cmd}"
 ${cmd} >${redirect}
 sleep 5

diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index 0873a68..ac75950 100755 (executable)
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -167,11 +167,7 @@ elif [ "$installer_type" == "apex" ]; then
     sudo scp $ssh_options root@$installer_ip:/home/stack/overcloudrc.v3 $dest_path
 
 elif [ "$installer_type" == "compass" ]; then
-    if [ "${BRANCH}" == "master" ]; then
-        sudo docker cp compass-tasks:/opt/openrc $dest_path &> /dev/null
-        sudo chown $(whoami):$(whoami) $dest_path
-        sudo docker cp compass-tasks:/opt/os_cacert $os_cacert
-    else
+    if [ "${BRANCH}" == "stable/danube" ]; then
         verify_connectivity $installer_ip
         controller_ip=$(sshpass -p'root' ssh 2>/dev/null $ssh_options root@${installer_ip} \
             'mysql -ucompass -pcompass -Dcompass -e"select *  from cluster;"' \
@@ -201,6 +197,10 @@ elif [ "$installer_type" == "compass" ]; then
         fi
         info "public_ip: $public_ip"
         swap_to_public $public_ip
+    else
+        sudo docker cp compass-tasks:/opt/openrc $dest_path &> /dev/null
+        sudo chown $(whoami):$(whoami) $dest_path
+        sudo docker cp compass-tasks:/opt/os_cacert $os_cacert
     fi
 
 elif [ "$installer_type" == "joid" ]; then

diff --git a/utils/test/reporting/img/euphrates.jpg b/utils/test/reporting/img/euphrates.jpg
index 3625b50..3eb490d 100644 (file)
Binary files a/utils/test/reporting/img/euphrates.jpg and b/utils/test/reporting/img/euphrates.jpg differ

diff --git a/utils/test/reporting/reporting/bottlenecks/reporting-status.py b/utils/test/reporting/reporting/bottlenecks/reporting-status.py
index 8966d06..225227a 100644 (file)
--- a/utils/test/reporting/reporting/bottlenecks/reporting-status.py
+++ b/utils/test/reporting/reporting/bottlenecks/reporting-status.py
@@ -37,10 +37,14 @@ for version in VERSIONS:
     # For all the installers
     for installer in INSTALLERS:
         # get scenarios results data
+        if version != 'master':
+            new_version = "stable/{}".format(version)
+        else:
+            new_version = version
         scenario_results = rp_utils.getScenarios("bottlenecks",
                                                  "posca_factor_ping",
                                                  installer,
-                                                 version)
+                                                 new_version)
         LOGGER.info("scenario_results: %s", scenario_results)
 
         scenario_stats = rp_utils.getScenarioStats(scenario_results)

diff --git a/utils/test/reporting/reporting/functest/reporting-status.py b/utils/test/reporting/reporting/functest/reporting-status.py
index 808c841..267803e 100755 (executable)
--- a/utils/test/reporting/reporting/functest/reporting-status.py
+++ b/utils/test/reporting/reporting/functest/reporting-status.py
@@ -13,8 +13,8 @@ import time
 
 import jinja2
 
-import testCase as tc
-import scenarioResult as sr
+import reporting.functest.testCase as tc
+import reporting.functest.scenarioResult as sr
 import reporting.utils.reporting_utils as rp_utils
 
 """
@@ -221,7 +221,7 @@ for version in versions:
                                 LOGGER.debug("No results found")
 
                         items[s] = testCases2BeDisplayed
-                except Exception:
+                except Exception:  # pylint: disable=broad-except
                     LOGGER.error("Error installer %s, version %s, scenario %s",
                                  installer, version, s)
                     LOGGER.error("No data available: %s", sys.exc_info()[0])