Remove ODL+FDIO scenarios in Euphrates daily

These scenarios will not be part of 5.1 release.

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

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 1c04260..9c7406a 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -158,10 +158,6 @@
           <<: *euphrates
       - 'os-nosdn-fdio-ha':
           <<: *euphrates
-      - 'os-odl-fdio-noha':
-          <<: *euphrates
-      - 'os-odl-fdio-ha':
-          <<: *euphrates
       - 'os-nosdn-bar-ha':
           <<: *euphrates
       - 'os-nosdn-bar-noha':
@@ -180,10 +176,6 @@
           <<: *euphrates
       - 'os-odl-sfc-ha':
           <<: *euphrates
-      - 'os-odl-fdio_dvr-noha':
-          <<: *euphrates
-      - 'os-odl-fdio_dvr-ha':
-          <<: *euphrates
       - 'os-nosdn-calipso-noha':
           <<: *euphrates
 
@@ -1544,22 +1536,6 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-fdio-noha-baremetal-euphrates'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-fdio-ha-baremetal-euphrates'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
             - name: 'apex-os-nosdn-bar-ha-baremetal-euphrates'
               node-parameters: false
               current-parameters: false
@@ -1632,22 +1608,6 @@
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-fdio_dvr-noha-baremetal-euphrates'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-fdio_dvr-ha-baremetal-euphrates'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
             - name: 'apex-os-nosdn-calipso-noha-baremetal-euphrates'
               node-parameters: false
               current-parameters: false

diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index 3b6b485..98b698d 100644 (file)
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -29,8 +29,6 @@ euphrates:
   - 'os-ovn-nofeature-noha'
   - 'os-nosdn-fdio-noha'
   - 'os-nosdn-fdio-ha'
-  - 'os-odl-fdio-noha'
-  - 'os-odl-fdio-ha'
   - 'os-nosdn-bar-ha'
   - 'os-nosdn-bar-noha'
   - 'os-nosdn-nofeature-ha-ipv6'
@@ -40,8 +38,6 @@ 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-nosdn-calipso-noha'
 danube:
   - 'os-nosdn-nofeature-noha'