From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Tue, 28 Mar 2017 20:46:30 +0000 (+0000)
Subject: Merge "xci: Rename the deployment host to opnfv"
X-Git-Tag: danube.1.0~48
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=be291c9109c9e2e8d50db56dc8bb26373b0f51e6;hp=a354d385b2b22d6c675dde60ce473f7b54b69ab6;p=releng.git

Merge "xci: Rename the deployment host to opnfv"
---

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 564c9cdb8..6343b838b 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -196,14 +196,16 @@ else
   NETWORK_SETTINGS_DIR="/root/network"
   INVENTORY_FILE="/root/inventory/pod_settings.yaml"
 
+# (trozet) According to FDS folks uio_pci_generic works with UCS-B
+# and there appears to be a bug with vfio-pci
   # if fdio on baremetal, then we are using UCS enic and
   # need to use vfio-pci instead of uio generic
-  if [[ "$DEPLOY_SCENARIO" == *fdio* ]]; then
-    TMP_DEPLOY_FILE="${WORKSPACE}/${DEPLOY_SCENARIO}.yaml"
-    cp -f ${DEPLOY_FILE} ${TMP_DEPLOY_FILE}
-    sed -i 's/^\(\s*uio-driver:\).*$/\1 vfio-pci/g' ${TMP_DEPLOY_FILE}
-    DEPLOY_FILE=${TMP_DEPLOY_FILE}
-  fi
+#  if [[ "$DEPLOY_SCENARIO" == *fdio* ]]; then
+#    TMP_DEPLOY_FILE="${WORKSPACE}/${DEPLOY_SCENARIO}.yaml"
+#    cp -f ${DEPLOY_FILE} ${TMP_DEPLOY_FILE}
+#    sed -i 's/^\(\s*uio-driver:\).*$/\1 vfio-pci/g' ${TMP_DEPLOY_FILE}
+#    DEPLOY_FILE=${TMP_DEPLOY_FILE}
+#  fi
 
   if ! sudo test -e "$INVENTORY_FILE"; then
     echo "ERROR: Required settings file missing: Inventory settings file ${INVENTORY_FILE}"
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index bb6e234fd..e7982ba55 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -57,6 +57,7 @@
          - 'os-odl_l3-fdio_dvr-ha'
          - 'os-odl_l3-csit-noha'
          - 'os-onos-nofeature-ha'
+         - 'os-ovn-nofeature-noha'
          - 'gate'
 
     platform:
@@ -925,6 +926,36 @@
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-ovn-nofeature-noha-{stream}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream}/.build
+              OPNFV_CLEAN=yes
+            git-revision: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+            block: true
+        - trigger-builds:
+          - project: 'functest-apex-{daily-slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-ovn-nofeature-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'yardstick-apex-{slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-ovn-nofeature-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
 
 # CSIT promote
 - job-template: