Apex: baremetal to use vfio-pci driver, adds nosdn-fdio to daily

Change-Id: I298b09f654dfe5efa64df9dc287fd586fcdf131d
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index c91e3ee..564c9cd 100755 (executable)
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -196,6 +196,15 @@ else
   NETWORK_SETTINGS_DIR="/root/network"
   INVENTORY_FILE="/root/inventory/pod_settings.yaml"
 
+  # 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 ! sudo test -e "$INVENTORY_FILE"; then
     echo "ERROR: Required settings file missing: Inventory settings file ${INVENTORY_FILE}"
     exit 1

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 60340e9..f3b6ad3 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -832,6 +832,36 @@
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-nosdn-fdio-ha-{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-nosdn-fdio-ha
+            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-nosdn-fdio-ha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
 
 # CSIT promote
 - job-template: