Apex: Adds fdio, ipv6 scenarios/jobs

Changes include:
 - Adds nosdn-fdio scenario and daily
 - Adds odl_l2-fdio scenario and daily
 - Adds nosdn ipv6 deploy job to daily (no tests)

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

2 files changed, 120 insertions, 2 deletions

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index b0ff7bded..c6cfb26d1 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -4,6 +4,7 @@ set -o nounset
 set -o pipefail
 
 APEX_PKGS="common undercloud opendaylight-sfc onos"
+IPV6_FLAG=False
 
 # log info to console
 echo "Starting the Apex virtual deployment."
@@ -145,6 +146,12 @@ if [ "$OPNFV_CLEAN" == 'yes' ]; then
   fi
 fi
 
+if echo ${DEPLOY_SCENARIO} | grep ipv6; then
+  IPV6_FLAG=True
+  DEPLOY_SCENARIO=$(echo ${DEPLOY_SCENARIO} |  sed 's/-ipv6//')
+  echo "INFO: IPV6 Enabled"
+fi
+
 echo "Deploy Scenario set to ${DEPLOY_SCENARIO}"
 DEPLOY_FILE="${DEPLOY_SETTINGS_DIR}/${DEPLOY_SCENARIO}.yaml"
 
@@ -154,11 +161,19 @@ fi
 
 if [[ "$JOB_NAME" == *virtual* ]]; then
   # settings for virtual deployment
-  NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings.yaml"
+  if [ "$IPV6_FLAG" == "True" ]; then
+    NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings_v6.yaml"
+  else
+    NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings.yaml"
+  fi
   DEPLOY_CMD="${DEPLOY_CMD} -v"
 else
   # settings for bare metal deployment
-  NETWORK_FILE="/root/network/network_settings.yaml"
+  if [ "$IPV6_FLAG" == "True" ]; then
+    NETWORK_FILE="/root/network/network_settings_v6.yaml"
+  else
+    NETWORK_FILE="/root/network/network_settings.yaml"
+  fi
   INVENTORY_FILE="/root/inventory/pod_settings.yaml"
 
   if ! sudo test -e "$INVENTORY_FILE"; then
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 604e4d406..da9089cd6 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -54,8 +54,11 @@
     scenario:
          - 'os-nosdn-nofeature-noha'
          - 'os-nosdn-nofeature-ha'
+         - 'os-nosdn-nofeature-ha-ipv6'
+         - 'os-nosdn-fdio-noha'
          - 'os-odl_l2-nofeature-ha'
          - 'os-odl_l2-bgpvpn-ha'
+         - 'os-odl_l2-fdio-noha'
          - 'os-odl_l2-sfc-noha'
          - 'os-odl_l3-nofeature-ha'
          - 'os-onos-nofeature-ha'
@@ -919,6 +922,106 @@
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-odl_l2-fdio-noha-{stream1}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream1}/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-{stream1}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl_l2-fdio-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-{stream1}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl_l2-fdio-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-nosdn-fdio-noha-{stream1}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream1}/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-{stream1}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-nosdn-fdio-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-{stream1}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-nosdn-fdio-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-nosdn-fdio-noha-{stream1}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream1}/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-{stream1}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-nosdn-fdio-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-{stream1}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-nosdn-fdio-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-ipv6-{stream1}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream1}/build
+              OPNFV_CLEAN=yes
+            git-revision: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+            block: true
 
 - job-template:
     name: 'apex-gs-clean-{stream}'