Merge changes from topic 'stable-branch'

* changes:
  [armband] verify: Simplify and move to build hosts
  [fuel] Retire Danube stream
  [fuel] cleanup: remove unused scenarios
  [fuel] cleanup: remove unused job defs & scripts

9 files changed, 35 insertions, 830 deletions

diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml
index 959115ac2..666a0f596 100644
--- a/jjb/armband/armband-ci-jobs.yaml
+++ b/jjb/armband/armband-ci-jobs.yaml
@@ -208,24 +208,17 @@
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
       # Armband uses Fuel's log collection project job, no need to duplicate
-      - conditional-step:
-          condition-kind: not
-          condition-operand:
-            condition-kind: regex-match
-            regex: 'danube'
-            label: '{stream}'
-          steps:
-            - trigger-builds:
-                - project: 'fuel-collect-logs-{deploy-type}-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'
+      - trigger-builds:
+          - project: 'fuel-collect-logs-{deploy-type}-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: '{installer}-deploy-{pod}-daily-{stream}'
diff --git a/jjb/armband/armband-verify-jobs.yaml b/jjb/armband/armband-verify-jobs.yaml
index 6add90704..171808367 100644
--- a/jjb/armband/armband-verify-jobs.yaml
+++ b/jjb/armband/armband-verify-jobs.yaml
@@ -4,7 +4,6 @@
 
     project: 'armband'
 
-    installer: 'fuel'
     #####################################
     # branch definitions
     #####################################
@@ -18,25 +17,17 @@
           gs-pathname: '/{stream}'
           disabled: false
     #####################################
-    # patch verification phases
-    #####################################
-    phase:
-      - 'deploy-virtual':
-          slave-label: 'armband-virtual'
-    #####################################
     # jobs
     #####################################
     jobs:
       - 'armband-verify-{stream}'
-      - 'armband-verify-{phase}-{stream}'
+
 #####################################
 # job templates
 #####################################
 - job-template:
     name: 'armband-verify-{stream}'
 
-    project-type: multijob
-
     disabled: '{obj:disabled}'
 
     concurrent: true
@@ -45,14 +36,8 @@
       - logrotate-default
       - throttle:
           enabled: true
-          max-total: 4
+          max-total: 2
           option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'fuel-os-.*?-virtual-daily-.*'
-            - 'armband-verify-.*'
-          block-level: 'NODE'
 
     scm:
       - git-scm-gerrit
@@ -97,100 +82,19 @@
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      - 'armband-virtual-defaults':
-          installer: '{installer}'
-      - '{installer}-defaults':
-          gs-pathname: '{gs-pathname}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-ha'
+      - 'opnfv-build-ubuntu-arm-defaults'
 
     builders:
       - description-setter:
           description: "Built on $NODE_NAME"
-      - multijob:
-          name: deploy-virtual
-          condition: SUCCESSFUL
-          projects:
-            - name: 'armband-verify-deploy-virtual-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                BRANCH=$BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
-
-      - multijob:
-          name: smoke-test
-          condition: SUCCESSFUL
-          projects:
-            # Use Functest job definition from jjb/functest/functest-daily-jobs
-            - name: 'functest-fuel-armband-virtual-suite-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                FUNCTEST_MODE=tier
-                FUNCTEST_TIER=healthcheck
-                # Should be in sync with fuel-deploy.sh default scenario
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                BRANCH=$BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: true
-              kill-phase-on: NEVER
-              abort-all-job: true
-
-- job-template:
-    name: 'armband-verify-{phase}-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 2
-          max-per-node: 1
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'armband-verify-deploy-.*'
-          block-level: 'NODE'
-
-    scm:
-      - git-scm-gerrit
+      - 'armband-verify-builder-macro'
 
-    wrappers:
-      - ssh-agent-wrapper
-      - timeout:
-          timeout: 360
-          fail: true
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{slave-label}-defaults'
-      - 'armband-virtual-defaults':
-          installer: '{installer}'
-      - '{installer}-defaults':
-          gs-pathname: '{gs-pathname}'
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - '{project}-verify-{phase}-macro'
 #####################################
 # builder macros
 #####################################
 - builder:
-    name: 'armband-verify-deploy-virtual-macro'
+    name: 'armband-verify-builder-macro'
     builders:
-      - shell:
-          !include-raw: ../fuel/fuel-deploy.sh
+      - shell: |
+          #!/bin/bash
+          make fuel-patches-import
diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index 07cdb7345..73d33d63b 100644
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -21,11 +21,6 @@
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
-    danube: &danube
-      stream: danube
-      branch: 'stable/{stream}'
-      disabled: false
-      gs-pathname: '/{stream}'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
@@ -59,22 +54,10 @@
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-odl-nofeature-ha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-      - 'os-onos-sfc-ha':
-          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-      - 'os-onos-nofeature-ha':
-          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-ovn-nofeature-ha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-      - 'os-nosdn-kvm-ha':
-          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-nosdn-ovs-ha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-      - 'os-nosdn-kvm_ovs-ha':
-          auto-trigger-name: 'daily-trigger-disabled'
-      - 'os-nosdn-kvm_ovs_dpdk-ha':
-          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-      - 'os-nosdn-kvm_ovs_dpdk_bar-ha':
-          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-nosdn-vpp-ha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       # NOHA scenarios
@@ -82,47 +65,22 @@
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-odl-nofeature-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-      - 'os-onos-sfc-noha':
-          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-      - 'os-onos-nofeature-noha':
-          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-ovn-nofeature-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-odl-ovs-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-      - 'os-nosdn-kvm-noha':
-          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-nosdn-ovs-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-      - 'os-nosdn-kvm_ovs_dpdk-noha':
-          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-      - 'os-nosdn-kvm_ovs_dpdk_bar-noha':
-          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-nosdn-vpp-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-      # danube scenario for Dovetail only
-      - 'os-odl_l2-bgpvpn-ha':
-          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
 
     exclude:
-      - scenario: os-odl_l2-bgpvpn-ha
-        stream: master
-      - scenario: os-odl_l2-bgpvpn-ha
-        stream: fraser
-      - scenario: os-ovn-nofeature-noha
-        stream: danube
-      - scenario: os-ovn-nofeature-ha
-        stream: danube
       - scenario: os-odl-ovs-noha
         stream: fraser
       - scenario: os-nosdn-vpp-ha
         stream: fraser
       - scenario: os-nosdn-vpp-noha
         stream: fraser
-      - scenario: os-nosdn-vpp-ha
-        stream: danube
-      - scenario: os-nosdn-vpp-noha
-        stream: danube
 
     jobs:
       - 'fuel-{scenario}-{pod}-daily-{stream}'
@@ -150,7 +108,6 @@
           use-build-blocker: true
           blocking-jobs:
             - 'fuel-os-.*?-{pod}-daily-.*'
-            - 'fuel-os-.*?-{pod}-weekly-.*'
             - 'fuel-verify-.*'
           block-level: 'NODE'
 
@@ -246,24 +203,17 @@
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
-      - conditional-step:
-          condition-kind: not
-          condition-operand:
-            condition-kind: regex-match
-            regex: 'danube'
-            label: '{stream}'
-          steps:
-            - trigger-builds:
-                - project: 'fuel-collect-logs-{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'
+      - trigger-builds:
+          - project: 'fuel-collect-logs-{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'
 
     publishers:
       - email-fuel-ptl
@@ -287,9 +237,6 @@
           use-build-blocker: true
           blocking-jobs:
             - 'fuel-deploy-{pod}-daily-.*'
-            - 'fuel-deploy-generic-daily-.*'
-            - 'fuel-deploy-{pod}-weekly-.*'
-            - 'fuel-deploy-generic-weekly-.*'
           block-level: 'NODE'
 
     parameters:
@@ -317,8 +264,6 @@
           description: "Built on $NODE_NAME"
       - track-begin-timestamp
       - shell:
-          !include-raw-escape: ./fuel-download-artifact.sh
-      - shell:
           !include-raw-escape: ./fuel-deploy.sh
 
     publishers:
@@ -384,30 +329,10 @@
     triggers:
       - timed: '5 5 * * *'
 - trigger:
-    name: 'fuel-os-onos-sfc-ha-baremetal-daily-master-trigger'
-    triggers:
-      - timed: ''  # '5 5 * * *'
-- trigger:
-    name: 'fuel-os-onos-nofeature-ha-baremetal-daily-master-trigger'
-    triggers:
-      - timed: ''  # '5 8 * * *'
-- trigger:
     name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-master-trigger'
-    triggers:
-      - timed: ''  # '5 17 * * *'
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-baremetal-daily-master-trigger'
-    triggers:
-      - timed: ''  # '30 12 * * *'
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-baremetal-daily-master-trigger'
-    triggers:
-      - timed: ''  # '30 8 * * *'
-- trigger:
     name: 'fuel-os-nosdn-vpp-ha-baremetal-daily-master-trigger'
     triggers:
       - timed: ''
@@ -422,14 +347,6 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-onos-sfc-noha-baremetal-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-onos-nofeature-noha-baremetal-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-master-trigger'
     triggers:
       - timed: ''
@@ -438,22 +355,10 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-master-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-baremetal-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-baremetal-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-nosdn-vpp-noha-baremetal-daily-master-trigger'
     triggers:
       - timed: ''
@@ -470,33 +375,13 @@
     triggers:
       - timed: ''  # '0 2 * * *'
 - trigger:
-    name: 'fuel-os-onos-sfc-ha-baremetal-daily-fraser-trigger'
-    triggers:
-      - timed: ''  # '0 5 * * *'
-- trigger:
     name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-baremetal-daily-fraser-trigger'
-    triggers:
-      - timed: ''  # '0 8 * * *'
-- trigger:
-    name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-fraser-trigger'
-    triggers:
-      - timed: ''  # '0 17 * * *'
-- trigger:
     name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''  # '0 20 * * *'
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-baremetal-daily-fraser-trigger'
-    triggers:
-      - timed: ''  # '0 12 * * *'
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-baremetal-daily-fraser-trigger'
-    triggers:
-      - timed: ''  # '0 8 * * *'
 # NOHA Scenarios
 - trigger:
     name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger'
@@ -507,33 +392,13 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-onos-sfc-noha-baremetal-daily-fraser-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-onos-nofeature-noha-baremetal-daily-fraser-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-fraser-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-baremetal-daily-fraser-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-baremetal-daily-fraser-trigger'
-    triggers:
-      - timed: ''
 # ----------------------------------------------
 # Triggers for job running on fuel-virtual against master branch
 # ----------------------------------------------
@@ -546,34 +411,14 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-onos-sfc-ha-virtual-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-onos-nofeature-ha-virtual-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-ovn-nofeature-ha-virtual-daily-master-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm-ha-virtual-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-nosdn-ovs-ha-virtual-daily-master-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-virtual-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-virtual-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-nosdn-vpp-ha-virtual-daily-master-trigger'
     triggers:
       - timed: ''
@@ -587,14 +432,6 @@
     triggers:
       - timed: '5 18 * * *'
 - trigger:
-    name: 'fuel-os-onos-sfc-noha-virtual-daily-master-trigger'
-    triggers:
-      - timed: ''  # '35 20 * * *'
-- trigger:
-    name: 'fuel-os-onos-nofeature-noha-virtual-daily-master-trigger'
-    triggers:
-      - timed: ''  # '5 23 * * *'
-- trigger:
     name: 'fuel-os-ovn-nofeature-noha-virtual-daily-master-trigger'
     triggers:
       - timed: '5 23 * * *'
@@ -603,22 +440,10 @@
     triggers:
       - timed: '5 2 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-kvm-noha-virtual-daily-master-trigger'
-    triggers:
-      - timed: ''  # '35 6 * * *'
-- trigger:
     name: 'fuel-os-nosdn-ovs-noha-virtual-daily-master-trigger'
     triggers:
       - timed: '5 9 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-virtual-daily-master-trigger'
-    triggers:
-      - timed: ''  # '30 16 * * *'
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-virtual-daily-master-trigger'
-    triggers:
-      - timed: ''  # '30 20 * * *'
-- trigger:
     name: 'fuel-os-nosdn-vpp-noha-virtual-daily-master-trigger'
     triggers:
       - timed: ''
@@ -634,33 +459,13 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-onos-sfc-ha-virtual-daily-fraser-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-onos-nofeature-ha-virtual-daily-fraser-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-ovn-nofeature-ha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm-ha-virtual-daily-fraser-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-nosdn-ovs-ha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-virtual-daily-fraser-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-virtual-daily-fraser-trigger'
-    triggers:
-      - timed: ''
 # NOHA Scenarios
 - trigger:
     name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-fraser-trigger'
@@ -675,29 +480,9 @@
     triggers:
       - timed: '5 23 * * *'
 - trigger:
-    name: 'fuel-os-onos-sfc-noha-virtual-daily-fraser-trigger'
-    triggers:
-      - timed: ''  # '30 20 * * *'
-- trigger:
-    name: 'fuel-os-onos-nofeature-noha-virtual-daily-fraser-trigger'
-    triggers:
-      - timed: ''  # '0 23 * * *'
-- trigger:
-    name: 'fuel-os-nosdn-kvm-noha-virtual-daily-fraser-trigger'
-    triggers:
-      - timed: ''  # '30 6 * * *'
-- trigger:
     name: 'fuel-os-nosdn-ovs-noha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''  # '0 9 * * *'
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-virtual-daily-fraser-trigger'
-    triggers:
-      - timed: ''  # '0 16 * * *'
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-virtual-daily-fraser-trigger'
-    triggers:
-      - timed: ''  # '0 20 * * *'
 # ----------------------------------------------
 # ZTE POD1 Triggers running against master branch
 # ----------------------------------------------
@@ -710,34 +495,14 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-onos-sfc-ha-zte-pod1-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-onos-nofeature-ha-zte-pod1-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-ovn-nofeature-ha-zte-pod1-daily-master-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm-ha-zte-pod1-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-nosdn-ovs-ha-zte-pod1-daily-master-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-zte-pod1-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-zte-pod1-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-nosdn-vpp-ha-zte-pod1-daily-master-trigger'
     triggers:
       - timed: ''
@@ -751,14 +516,6 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-onos-sfc-noha-zte-pod1-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-onos-nofeature-noha-zte-pod1-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-ovn-nofeature-noha-zte-pod1-daily-master-trigger'
     triggers:
       - timed: ''
@@ -767,22 +524,10 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm-noha-zte-pod1-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-nosdn-ovs-noha-zte-pod1-daily-master-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-zte-pod1-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-zte-pod1-daily-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
     name: 'fuel-os-nosdn-vpp-noha-zte-pod1-daily-master-trigger'
     triggers:
       - timed: ''
diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index dace7fc7f..9d71f0833 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # SPDX-license-identifier: Apache-2.0
 ##############################################################################
-# Copyright (c) 2017 Ericsson AB, Mirantis Inc., Enea Software AB and others.
+# Copyright (c) 2018 Ericsson AB, Mirantis Inc., Enea Software AB and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -12,38 +12,12 @@ set -o pipefail
 
 export TERM="vt220"
 
-if [[ "$BRANCH" =~ 'danube' ]]; then
-    # source the file so we get OPNFV vars
-    # shellcheck disable=SC1091
-    source latest.properties
-
-    # echo the info about artifact that is used during the deployment
-    echo "Using ${OPNFV_ARTIFACT_URL/*\/} for deployment"
-
-    # for Danube deployments (no artifact for current master or newer branches)
-    # checkout the commit that was used for building the downloaded artifact
-    # to make sure the ISO and deployment mechanism uses same versions
-    echo "Checking out ${OPNFV_GIT_SHA1}"
-    git checkout "${OPNFV_GIT_SHA1}" --quiet
-
-    # releng wants us to use nothing else but opnfv.iso for now. We comply.
-    ISO_FILE_ARG="-i file://${WORKSPACE}/opnfv.iso"
-fi
-
-# shellcheck disable=SC2153
-if [[ "${JOB_NAME}" =~ 'verify' ]]; then
-    # set simplest scenario for virtual deploys to run for verify
-    DEPLOY_SCENARIO="os-nosdn-nofeature-noha"
-fi
-
 # set deployment parameters
 export TMPDIR=${HOME}/tmpdir
 # shellcheck disable=SC2153
 LAB_NAME=${NODE_NAME/-*}
 # shellcheck disable=SC2153
 POD_NAME=${NODE_NAME/*-}
-# Armband might override LAB_CONFIG_URL, all others use the default
-LAB_CONFIG_URL=${LAB_CONFIG_URL:-'ssh://jenkins-ericsson@gerrit.opnfv.org:29418/securedlab'}
 
 # Fuel requires deploy script to be ran with sudo, Armband does not
 SUDO='sudo -E'
@@ -69,26 +43,14 @@ mkdir -p "${TMPDIR}"
 chmod a+x "${HOME}" "${TMPDIR}"
 
 cd "${WORKSPACE}" || exit 1
-if [[ "$BRANCH" =~ (danube|euphrates) ]]; then
-    if [[ "${LAB_CONFIG_URL}" =~ ^(git|ssh):// ]]; then
-        echo "Cloning securedlab repo ${BRANCH}"
-        LOCAL_CFG="${TMPDIR}/securedlab"
-        rm -rf "${LOCAL_CFG}"
-        git clone --quiet --branch "${BRANCH}" "${LAB_CONFIG_URL}" "${LOCAL_CFG}"
-        LAB_CONFIG_ARG="-b file://${LOCAL_CFG}"
-        BRIDGE_ARG="-B ${BRIDGE:-pxebr}"
-    else
-        LAB_CONFIG_ARG="-b ${LAB_CONFIG_URL}"
-    fi
-fi
 
 # log file name
 FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz"
 
 # construct the command
-DEPLOY_COMMAND="${SUDO} ${WORKSPACE}/ci/deploy.sh ${LAB_CONFIG_ARG:-} \
-    -l ${LAB_NAME} -p ${POD_NAME} -s ${DEPLOY_SCENARIO} ${ISO_FILE_ARG:-} \
-    -S ${TMPDIR} ${BRIDGE_ARG:-} \
+DEPLOY_COMMAND="${SUDO} ${WORKSPACE}/ci/deploy.sh \
+    -l ${LAB_NAME} -p ${POD_NAME} -s ${DEPLOY_SCENARIO} \
+    -S ${TMPDIR} \
     -L ${WORKSPACE}/${FUEL_LOG_FILENAME}"
 
 # log info to console
@@ -97,7 +59,6 @@ echo "--------------------------------------------------------"
 echo "Scenario: ${DEPLOY_SCENARIO}"
 echo "Lab: ${LAB_NAME}"
 echo "POD: ${POD_NAME}"
-[[ "${BRANCH}" =~ 'danube' ]] && echo "ISO: ${OPNFV_ARTIFACT_URL/*\/}"
 echo
 echo "Starting the deployment using ${INSTALLER_TYPE}. This could take some time..."
 echo "--------------------------------------------------------"
@@ -117,7 +78,7 @@ echo "Deployment is done!"
 
 # upload logs for baremetal deployments
 # work with virtual deployments is still going on, so skip that for now
-if [[ "${JOB_NAME}" =~ (baremetal-daily|baremetal-weekly) ]]; then
+if [[ "${JOB_NAME}" =~ baremetal-daily ]]; then
     echo "Uploading deployment logs"
     gsutil cp "${WORKSPACE}/${FUEL_LOG_FILENAME}" \
         "gs://${GS_URL}/logs/${FUEL_LOG_FILENAME}" > /dev/null 2>&1
diff --git a/jjb/fuel/fuel-download-artifact.sh b/jjb/fuel/fuel-download-artifact.sh
deleted file mode 100755
index 02ca10305..000000000
--- a/jjb/fuel/fuel-download-artifact.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-# SPDX-license-identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2016 Ericsson AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-set -o errexit
-set -o pipefail
-
-# disable Fuel ISO download for master branch
-[[ ! "$BRANCH" =~ (danube) ]] && exit 0
-
-# use proxy url to replace the normal URL, or googleusercontent.com will be blocked randomly
-[[ "$NODE_NAME" =~ (zte) ]] && GS_URL=${GS_BASE_PROXY%%/*}/$GS_URL
-
-# get the latest.properties file in order to get info regarding latest artifact
-echo "Downloading http://$GS_URL/latest.properties"
-curl -L -s -o $WORKSPACE/latest.properties http://$GS_URL/latest.properties
-
-# check if we got the file
-[[ -f $WORKSPACE/latest.properties ]] || exit 1
-
-# source the file so we get artifact metadata
-source $WORKSPACE/latest.properties
-
-# echo the info about artifact that is used during the deployment
-OPNFV_ARTIFACT=${OPNFV_ARTIFACT_URL/*\/}
-echo "Using $OPNFV_ARTIFACT for deployment"
-
-# check if we already have the ISO to avoid redownload
-ISOSTORE="/iso_mount/opnfv_ci/${BRANCH##*/}"
-if [[ -f "$ISOSTORE/$OPNFV_ARTIFACT" ]]; then
-    echo "ISO exists locally. Skipping the download and using the file from ISO store"
-    ln -s $ISOSTORE/$OPNFV_ARTIFACT $WORKSPACE/opnfv.iso
-    echo "--------------------------------------------------------"
-    echo
-    ls -al $WORKSPACE/opnfv.iso
-    echo
-    echo "--------------------------------------------------------"
-    echo "Done!"
-    exit 0
-fi
-
-[[ "$NODE_NAME" =~ (zte) ]] && OPNFV_ARTIFACT_URL=${GS_BASE_PROXY%%/*}/$OPNFV_ARTIFACT_URL
-
-# log info to console
-echo "Downloading the $INSTALLER_TYPE artifact using URL http://$OPNFV_ARTIFACT_URL"
-echo "This could take some time..."
-echo "--------------------------------------------------------"
-echo
-
-# download the file
-curl -L -s -o $WORKSPACE/opnfv.iso http://$OPNFV_ARTIFACT_URL > gsutil.iso.log 2>&1
-
-# list the file
-ls -al $WORKSPACE/opnfv.iso
-
-echo
-echo "--------------------------------------------------------"
-echo "Done!"
diff --git a/jjb/fuel/fuel-lab-reconfig.sh b/jjb/fuel/fuel-lab-reconfig.sh
deleted file mode 100755
index 4b42a396e..000000000
--- a/jjb/fuel/fuel-lab-reconfig.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-# SPDX-license-identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2016 Ericsson AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-set -o errexit
-set -o nounset
-set -o pipefail
-
-# check to see if ucs login info file exists
-if [ -e ~/.ssh/ucs_creds ];then
-    source ~/.ssh/ucs_creds
-else
-    echo "Unable to find UCS credentials for LF lab reconfiguration...Exiting"
-    exit 1
-fi
-
-# clone releng
-echo "Cloning releng repo..."
-if ! GIT_SSL_NO_VERIFY=true git clone https://gerrit.opnfv.org/gerrit/releng; then
-    echo "Unable to clone releng repo...Exiting"
-    exit 1
-fi
-
-# log info to console
-echo "Starting the lab reconfiguration for $INSTALLER_TYPE..."
-echo "--------------------------------------------------------"
-echo
-
-# create venv
-$WORKSPACE/releng/utils/lab-reconfiguration/create_venv.sh
-
-# disable nounset because 'activate' script contains unbound variable(s)
-set +o nounset
-# enter venv
-source $WORKSPACE/releng/utils/lab-reconfiguration/venv/bin/activate
-# set nounset back again
-set -o nounset
-
-# verify we are in venv
-if [[ ! $(which python | grep venv) ]]; then
-    echo "Unable to activate venv...Exiting"
-    exit 1
-fi
-
-python $WORKSPACE/releng/utils/lab-reconfiguration/reconfigUcsNet.py -i $ucs_host -u $ucs_user -p $ucs_password -f $WORKSPACE/releng/utils/lab-reconfiguration/fuel.yaml
-
-# while undergoing reboot
-sleep 30
-
-# check to see if slave is back up
-ping_counter=0
-ping_flag=0
-while [ "$ping_counter" -lt 20 ]; do
-    if [[ $(ping -c 5 172.30.10.72) ]]; then
-        ping_flag=1
-        break
-    fi
-    ((ping_counter++))
-    sleep 10
-done
-
-if [ "$ping_flag" -eq 1 ]; then
-    echo "Slave is pingable, now wait 180 seconds for services to start"
-    sleep 180
-else
-    echo "Slave did not come back up after reboot: please check lf-pod2"
-    exit 1
-fi
-
-set +o nounset
-deactivate
-
-echo
-echo "--------------------------------------------------------"
-echo "Done!"
diff --git a/jjb/fuel/fuel-project-jobs.yaml b/jjb/fuel/fuel-project-jobs.yaml
index 40ba6e696..7d7e4593a 100644
--- a/jjb/fuel/fuel-project-jobs.yaml
+++ b/jjb/fuel/fuel-project-jobs.yaml
@@ -25,62 +25,4 @@
     rtd-token: 38f40bf6c08fd4bccb930871bc29b08404cf98b0
 
     jobs:
-      - 'fuel-deploy-generic-daily-{stream}'
       - '{project-name}-rtd-jobs'
-
-########################
-# job templates
-########################
-- job-template:
-    name: 'fuel-deploy-generic-daily-{stream}'
-
-    concurrent: true
-
-    disabled: '{obj:disabled}'
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-per-node: 1
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'fuel-os-.*?-daily-.*'
-            - 'fuel-deploy-generic-daily-.*'
-          block-level: 'NODE'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{installer}-defaults':
-          gs-pathname: '{gs-pathname}'
-      - string:
-          name: GIT_BASE
-          default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-odl-nofeature-ha'
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - ericsson-pod2
-            - lf-pod2
-            - ericsson-pod1
-          default-slaves:
-            - ericsson-pod2
-
-    scm:
-      - git-scm
-
-    wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER - POD: $NODE_NAME Scenario: $DEPLOY_SCENARIO'
-
-    builders:
-      - shell:
-          !include-raw-escape: ./fuel-deploy.sh
diff --git a/jjb/fuel/fuel-weekly-jobs.yaml b/jjb/fuel/fuel-weekly-jobs.yaml
deleted file mode 100644
index c6b921729..000000000
--- a/jjb/fuel/fuel-weekly-jobs.yaml
+++ /dev/null
@@ -1,189 +0,0 @@
----
-# jenkins job templates for Fuel
-- project:
-
-    name: fuel-weekly
-
-    project: fuel
-
-    installer: fuel
-
-    # -------------------------------
-    # BRANCH ANCHORS
-    # -------------------------------
-    master: &master
-      stream: master
-      branch: '{stream}'
-      disabled: false
-      gs-pathname: ''
-    fraser: &fraser
-      stream: fraser
-      branch: 'stable/{stream}'
-      disabled: false
-      gs-pathname: '/{stream}'
-    # -------------------------------
-    # POD, INSTALLER, AND BRANCH MAPPING
-    # -------------------------------
-    #        CI PODs
-    # -------------------------------
-    pod:
-      - baremetal:
-          slave-label: fuel-baremetal
-          <<: *master
-      - virtual:
-          slave-label: fuel-virtual
-          <<: *master
-      - baremetal:
-          slave-label: fuel-baremetal
-          <<: *fraser
-      - virtual:
-          slave-label: fuel-virtual
-          <<: *fraser
-    # -------------------------------
-    #       scenarios
-    # -------------------------------
-    scenario:
-      # HA scenarios
-      - 'os-nosdn-nofeature-ha':
-          auto-trigger-name: 'weekly-trigger-disabled'
-
-    jobs:
-      - 'fuel-{scenario}-{pod}-weekly-{stream}'
-      - 'fuel-deploy-{pod}-weekly-{stream}'
-
-########################
-# job templates
-########################
-- job-template:
-    name: 'fuel-{scenario}-{pod}-weekly-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 4
-          max-per-node: 1
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'fuel-os-.*?-{pod}-daily-.*'
-            - 'fuel-os-.*?-{pod}-weekly-.*'
-            - 'fuel-verify-.*'
-          block-level: 'NODE'
-
-    wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-
-    triggers:
-      - '{auto-trigger-name}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{installer}-defaults':
-          gs-pathname: '{gs-pathname}'
-      - '{slave-label}-defaults':
-          installer: '{installer}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: '{scenario}'
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - trigger-builds:
-          - project: 'fuel-deploy-{pod}-weekly-{stream}'
-            current-parameters: false
-            predefined-parameters:
-              DEPLOY_SCENARIO={scenario}
-            same-node: true
-            block: true
-      - trigger-builds:
-          - project: 'functest-fuel-{pod}-weekly-{stream}'
-            current-parameters: false
-            predefined-parameters:
-              DEPLOY_SCENARIO={scenario}
-            same-node: true
-            block: true
-            block-thresholds:
-              build-step-failure-threshold: 'never'
-              failure-threshold: 'never'
-              unstable-threshold: 'FAILURE'
-
-    publishers:
-      - email-fuel-ptl
-      - email-jenkins-admins-on-failure
-
-- job-template:
-    name: 'fuel-deploy-{pod}-weekly-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 4
-          max-per-node: 1
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'fuel-deploy-{pod}-daily-.*'
-            - 'fuel-deploy-generic-daily-.*'
-            - 'fuel-deploy-{pod}-weekly-.*'
-            - 'fuel-deploy-generic-weekly-.*'
-          block-level: 'NODE'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{installer}-defaults':
-          gs-pathname: '{gs-pathname}'
-      - '{slave-label}-defaults':
-          installer: '{installer}'
-      - testapi-parameter
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-odl-nofeature-ha'
-
-    scm:
-      - git-scm
-
-    wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - track-begin-timestamp
-      - shell:
-          !include-raw-escape: ./fuel-deploy.sh
-
-    publishers:
-      - email-fuel-ptl
-      - email-jenkins-admins-on-failure
-      - report-provision-result
-
-########################
-# trigger macros
-########################
-# ----------------------------------------------
-# Triggers for job running on fuel-baremetal against master branch
-# ----------------------------------------------
-# HA Scenarios
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-baremetal-weekly-master-trigger'
-    triggers:
-      - timed: ''
diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml
index 5b9ce413c..e83a10265 100644
--- a/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@ -272,10 +272,6 @@
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
           description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: LAB_CONFIG_URL
-          default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab
-          description: 'Base URI to the configuration directory'
 
 - parameter:
     name: 'auto-baremetal-defaults'
@@ -408,10 +404,6 @@
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
           description: 'Git URL to use on this Jenkins Slave'
-      - string:
-          name: LAB_CONFIG_URL
-          default: ssh://jenkins-enea@gerrit.opnfv.org:29418/securedlab
-          description: 'Base URI to the configuration directory'
 
 - parameter:
     name: 'joid-virtual-defaults'