Merge "[armband] Cleanup Fraser jobs, sync with Fuel"

2 files changed, 30 insertions, 341 deletions

diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml
index a100f49b4..0e99cfbdd 100644
--- a/jjb/armband/armband-ci-jobs.yaml
+++ b/jjb/armband/armband-ci-jobs.yaml
@@ -3,6 +3,7 @@
 - project:
     name: 'armband-ci'
     project: 'armband'
+    installer: 'fuel'
 
     # -------------------------------
     # BRANCH ANCHORS
@@ -13,302 +14,59 @@
       gs-pathname: ''
       disabled: false
       functest_docker_tag: hunter
-    fraser: &fraser
-      stream: fraser
-      branch: 'stable/{stream}'
-      disabled: false
-      gs-pathname: '/{stream}'
-      functest_docker_tag: '{stream}'
-    gambia: &gambia
-      stream: gambia
+    hunter: &hunter
+      stream: hunter
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
       disabled: true
       functest_docker_tag: '{stream}'
     # -------------------------------
-    # DEPLOY TYPE ANCHORS
-    # -------------------------------
-    baremetal: &baremetal
-      installer: 'fuel'
-      deploy-type: 'baremetal'
-      slave-label: 'armband-{deploy-type}'
-    virtual: &virtual
-      installer: 'fuel'
-      deploy-type: 'virtual'
-      slave-label: 'armband-{deploy-type}'
-    # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
     # CI POD's
     # -------------------------------
-    # yamllint disable rule:key-duplicates
     pod:
       # -------------------------------
-      #        fraser
-      # -------------------------------
-      - armband-baremetal:
-          <<: *baremetal
-          <<: *fraser
-      # -------------------------------
-      #        gambia
+      #        hunter
       # -------------------------------
       - armband-baremetal:
-          <<: *baremetal
-          <<: *gambia
-      - armband-virtual:
-          <<: *virtual
-          <<: *gambia
+          deploy-type: 'baremetal'
+          slave-label: 'armband-{deploy-type}'
+          <<: *hunter
       # -------------------------------
       #        master
       # -------------------------------
       - armband-baremetal:
-          <<: *baremetal
+          deploy-type: 'baremetal'
+          slave-label: 'armband-{deploy-type}'
           <<: *master
-      - armband-virtual:
-          <<: *virtual
-          <<: *master
-    # yamllint enable rule:key-duplicates
     # -------------------------------
     #       scenarios
     # -------------------------------
     scenario:
       # HA scenarios
       - 'os-nosdn-nofeature-ha':
-          auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+          auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
       - 'os-odl-nofeature-ha':
-          auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+          auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
       - 'os-ovn-nofeature-ha':
-          auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+          auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
       - 'os-nosdn-ovs-ha':
-          auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+          auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
 
       # NOHA scenarios
       - 'os-nosdn-nofeature-noha':
-          auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+          auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
       - 'os-nosdn-fdio-noha':
-          auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
-
-    exclude:
-      # Dovetail (and only it) should run against Fraser HA baremetal scenarios
-      - scenario: os-nosdn-nofeature-noha
-        stream: fraser
-      - scenario: os-ovn-nofeature-ha
-        stream: fraser
-      - scenario: os-nosdn-fdio-noha
-        stream: fraser
+          auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
 
     jobs:
-      - '{installer}-{scenario}-{pod}-daily-{stream}'
-      - '{installer}-deploy-{pod}-daily-{stream}'
+      - 'fuel-{scenario}-{pod}-daily-{stream}'
+      - 'fuel-deploy-{pod}-daily-{stream}'
 
 ########################
-# job templates
+# job templates: Armband uses Fuel's job templates, no need to duplicate
 ########################
-- job-template:
-    name: '{installer}-{scenario}-{pod}-daily-{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:
-            - '{installer}-os-.*?-{pod}-daily-.*'
-            - 'armband-verify-.*'
-          blocking-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:
-      - trigger-builds:
-          - project: '{installer}-deploy-{pod}-daily-{stream}'
-            current-parameters: false
-            predefined-parameters: |
-              DEPLOY_SCENARIO={scenario}
-              INSTALLER_VERSION={stream}
-            same-node: true
-            block: true
-      - conditional-step:
-          condition-kind: not
-          condition-operand:
-            condition-kind: regex-match
-            regex: 'fraser'
-            label: '{stream}'
-          steps:
-            - trigger-builds:
-                - project: 'functest-{installer}-{pod}-daily-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                    DOCKER_TAG={functest_docker_tag}
-                  same-node: true
-                  block: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
-      - conditional-step:
-          condition-kind: not
-          condition-operand:
-            condition-kind: regex-match
-            regex: 'fraser'
-            label: '{stream}'
-          steps:
-            - trigger-builds:
-                - project: 'yardstick-{installer}-{pod}-daily-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                  block: true
-                  same-node: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
-      # 1.here the stream means the SUT stream, dovetail stream is defined in its own job
-      # 2.testsuite proposed_tests here is for new test cases planning to add into OVP
-      # 3.run proposed_tests on Monday, Wednesday and Friday against ha scenario
-      # 4.testsuite default here is for the test cases already added into OVP
-      # 5.run default testsuite on Tuesday against ha scenario
-      # 6.not used for release criteria or compliance,
-      #   only to debug the dovetail tool bugs with arm pods
-      - conditional-step:
-          condition-kind: and
-          condition-operands:
-            - condition-kind: regex-match
-              regex: '.*-ha'
-              label: '{scenario}'
-            - condition-kind: regex-match
-              regex: 'fraser'
-              label: '{stream}'
-          steps:
-            - trigger-builds:
-                - project: 'dovetail-{installer}-{pod}-proposed_tests-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                  block: true
-                  same-node: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
-      - conditional-step:
-          condition-kind: and
-          condition-operands:
-            - condition-kind: regex-match
-              regex: '.*-ha'
-              label: '{scenario}'
-            - condition-kind: regex-match
-              regex: 'fraser'
-              label: '{stream}'
-          steps:
-            - trigger-builds:
-                - project: 'dovetail-{installer}-{pod}-default-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                  block: true
-                  same-node: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
-      # Armband uses Fuel's log collection project job, no need to duplicate
-      - trigger-builds:
-          - project: 'fuel-collect-logs-{deploy-type}-daily-{stream}'
-            current-parameters: false
-            predefined-parameters: |
-              DEPLOY_SCENARIO={scenario}
-              INSTALLER_VERSION={stream}
-            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}'
-
-    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:
-            - '{installer}-deploy-{pod}-daily-{stream}'
-            - '{installer}-deploy-generic-daily-.*'
-          blocking-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'
-      - string:
-          name: PROJECT
-          default: '{project}'
-
-    scm:
-      - git-scm
-
-    wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-
-    builders:
-      - track-begin-timestamp
-      - shell:
-          !include-raw-escape: ../fuel/fuel-deploy.sh
-
-    publishers:
-      - email:
-          recipients: armband@enea.com
-      - email-jenkins-admins-on-failure
-      - report-provision-result
 
 ########################
 # trigger macros
@@ -342,98 +100,29 @@
     triggers:
       - timed: '0 1 * * 3,5'
 # ---------------------------------------------------------------------
-# Enea Armband CI Baremetal Triggers running against gambia branch
+# Enea Armband CI Baremetal Triggers running against hunter branch
 # ---------------------------------------------------------------------
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-gambia-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-hunter-trigger'
     triggers:
       - timed: '10 1 * * 1'
 - trigger:
-    name: 'fuel-os-odl-nofeature-ha-armband-baremetal-gambia-trigger'
+    name: 'fuel-os-odl-nofeature-ha-armband-baremetal-hunter-trigger'
     triggers:
       - timed: '10 1 * * 7'
 - trigger:
-    name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-gambia-trigger'
+    name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-hunter-trigger'
     triggers:
       - timed: '10 1 * * 2'
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-gambia-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-hunter-trigger'
     triggers:
       - timed: '10 1 * * 4,6'
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-gambia-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-fdio-noha-armband-baremetal-gambia-trigger'
+    name: 'fuel-os-nosdn-fdio-noha-armband-baremetal-hunter-trigger'
     triggers:
       - timed: '10 1 * * 3,5'
-# -------------------------------------------------------------------
-# Enea Armband CI Baremetal Triggers running against fraser branch (for Dovetail)
-# -------------------------------------------------------------------
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-fraser-trigger'
-    triggers:
-      - timed: '5 13 * * 6,7'
-- trigger:
-    name: 'fuel-os-odl-nofeature-ha-armband-baremetal-fraser-trigger'
-    triggers:
-      - timed: '0 13 * * 6'
-- trigger:
-    name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-fraser-trigger'
-    triggers:
-      - timed: '0 13 * * 7'
-# --------------------------------------------------------------
-# Enea Armband CI Virtual Triggers running against master branch
-# --------------------------------------------------------------
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-odl-nofeature-ha-armband-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-ovn-nofeature-ha-armband-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-ovs-ha-armband-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-fdio-noha-armband-virtual-master-trigger'
-    triggers:
-      - timed: ''
-# -------------------------------------------------------------------
-# Enea Armband CI Virtual Triggers running against gambia branch
-# -------------------------------------------------------------------
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-gambia-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-odl-nofeature-ha-armband-virtual-gambia-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-ovn-nofeature-ha-armband-virtual-gambia-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-ovs-ha-armband-virtual-gambia-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-gambia-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-fdio-noha-armband-virtual-gambia-trigger'
-    triggers:
-      - timed: ''
diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml
index 84bb6141c..3b47c47ee 100644
--- a/jjb/auto/auto.yaml
+++ b/jjb/auto/auto.yaml
@@ -43,8 +43,8 @@
           auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
 
     jobs:
-      - '{installer}-{scenario}-{pod}-auto-daily-{stream}'
-      - '{installer}-deploy-{pod}-daily-{stream}'
+      - 'fuel-{scenario}-{pod}-auto-daily-{stream}'
+      - 'fuel-deploy-{pod}-daily-{stream}'
       - 'auto-daily-{stream}'
       - 'auto-verify-{stream}'
       - 'auto-merge-{stream}'
@@ -53,7 +53,7 @@
 # job templates
 ########################
 - job-template:
-    name: '{installer}-{scenario}-{pod}-auto-daily-{stream}'
+    name: 'fuel-{scenario}-{pod}-auto-daily-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -69,7 +69,7 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - '{installer}-os-.*?-{pod}-auto-daily-.*'
+            - 'fuel-os-.*?-{pod}-auto-daily-.*'
           blocking-level: 'NODE'
 
     wrappers:
@@ -93,7 +93,7 @@
 
     builders:
       - trigger-builds:
-          - project: '{installer}-deploy-{pod}-daily-{stream}'
+          - project: 'fuel-deploy-{pod}-daily-{stream}'
             current-parameters: false
             predefined-parameters: |
               DEPLOY_SCENARIO=os-nosdn-nofeature-ha