Merge "Assign yardstick/barometer to ericsson-build4"

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index 4690230..b78bab1 100644 (file)
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -39,7 +39,9 @@
 
     jobs:
       - 'doctor-verify-{stream}'
-      - 'doctor-verify-{installer}-{inspector}-{arch}-{stream}'
+      - 'doctor-verify-fault_management-{installer}-{inspector}-{arch}-{stream}'
+      - 'doctor-verify-maintenance-{installer}-{inspector}-{arch}-{stream}'
+      - 'doctor-verify-all-{installer}-{inspector}-{arch}-{stream}'
 
 - job-template:
     name: 'doctor-verify-{stream}'
@@ -68,7 +70,7 @@
           name: 'doctor-verify-sample'
           execution-type: PARALLEL
           projects:
-            - name: 'doctor-verify-apex-sample-x86_64-{stream}'
+            - name: 'doctor-verify-fault_management-apex-sample-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -77,7 +79,16 @@
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
               git-revision: true
-            - name: 'doctor-verify-daisy-sample-x86_64-{stream}'
+            - name: 'doctor-verify-fault_management-daisy-sample-x86_64-{stream}'
+              predefined-parameters: |
+                PROJECT=$PROJECT
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+              kill-phase-on: FAILURE
+              git-revision: true
+            - name: 'doctor-verify-maintenance-apex-sample-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -90,7 +101,7 @@
           name: 'doctor-verify-congress'
           execution-type: PARALLEL
           projects:
-            - name: 'doctor-verify-apex-congress-x86_64-{stream}'
+            - name: 'doctor-verify-fault_management-apex-congress-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -99,9 +110,17 @@
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
               git-revision: true
+      - multijob:
+          name: 'doctor-verify-sample-all'
+          execution-type: PARALLEL
+          # This would be for running all test cases with sample inspector
+      - multijob:
+          name: 'doctor-verify-congress-all'
+          execution-type: PARALLEL
+          # This would be for running all test cases with congress inspector
 
 - job-template:
-    name: 'doctor-verify-{installer}-{inspector}-{arch}-{stream}'
+    name: 'doctor-verify-fault_management-{installer}-{inspector}-{arch}-{stream}'
     disabled: '{obj:disabled}'
     node: 'doctor-{installer}-{arch}'
     wrappers:
@@ -116,6 +135,55 @@
       - 'doctor-slave-parameter'
       - 'doctor-parameter':
           inspector: '{inspector}'
+          test_case: 'fault_management'
+    scm:
+      - git-scm-gerrit
+    builders:
+      - 'doctor-verify-installer-inspector-builders-macro'
+    publishers:
+      - 'doctor-verify-publishers-macro'
+
+- job-template:
+    name: 'doctor-verify-maintenance-{installer}-{inspector}-{arch}-{stream}'
+    disabled: '{obj:disabled}'
+    node: 'nokia-pod1'
+    wrappers:
+      - ssh-agent-wrapper
+      - build-timeout:
+          timeout: 40
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - '{installer}-defaults'
+      - 'doctor-slave-parameter'
+      - 'doctor-parameter':
+          inspector: '{inspector}'
+          test_case: 'maintenance'
+    scm:
+      - git-scm-gerrit
+    builders:
+      - 'doctor-verify-installer-inspector-builders-macro'
+    publishers:
+      - 'doctor-verify-publishers-macro'
+
+- job-template:
+    name: 'doctor-verify-all-{installer}-{inspector}-{arch}-{stream}'
+    disabled: '{obj:disabled}'
+    node: 'nokia-pod1'
+    wrappers:
+      - ssh-agent-wrapper
+      - build-timeout:
+          timeout: 50
+    parameters:
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - '{installer}-defaults'
+      - 'doctor-slave-parameter'
+      - 'doctor-parameter':
+          inspector: '{inspector}'
+          test_case: 'all'
     scm:
       - git-scm-gerrit
     builders:
@@ -134,6 +202,11 @@
           name: INSPECTOR_TYPE
           default: '{inspector}'
           description: 'inspector component'
+      - string:
+          name: TEST_CASE
+          default: '{test_case}'
+          description: 'test case: all, fault_management or maintenance'
+
 
 # -------------------------------
 # builder macros

diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml
index 8eb5ab0..c5a0ec4 100644 (file)
--- a/jjb/fuel/fuel-verify-jobs.yaml
+++ b/jjb/fuel/fuel-verify-jobs.yaml
@@ -18,22 +18,32 @@
           gs-pathname: '/{stream}'
           disabled: false
     #####################################
+    # cluster architectures
+    #####################################
+    arch_tag:
+      - 'amd64':
+          slave-label: 'fuel-virtual'
+          functest-suite-label: 'fuel-virtual'
+      - 'arm64':
+          slave-label: 'armband-virtual'
+          functest-suite-label: 'fuel-armband-virtual'
+    #####################################
     # patch verification phases
     #####################################
     phase:
-      - 'deploy-virtual':
-          slave-label: 'fuel-virtual'
+      - 'docker-build'
+      - 'deploy-virtual'
     #####################################
     # jobs
     #####################################
     jobs:
-      - 'fuel-verify-{stream}'
-      - 'fuel-verify-{phase}-{stream}'
+      - 'fuel-verify-{arch_tag}-{stream}'
+      - 'fuel-verify-{phase}-{arch_tag}-{stream}'
 #####################################
 # job templates
 #####################################
 - job-template:
-    name: 'fuel-verify-{stream}'
+    name: 'fuel-verify-{arch_tag}-{stream}'
 
     project-type: multijob
 
@@ -64,40 +74,13 @@
           fail: true
 
     triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              file-paths:
-                - compare-type: ANT
-                  pattern: 'ci/**'
-                - compare-type: ANT
-                  pattern: 'mcp/**'
-              disable-strict-forbidden-file-verification: 'true'
-              forbidden-file-paths:
-                - compare-type: ANT
-                  pattern: 'docs/**'
-          readable-message: true
+      - 'fuel-verify-{arch_tag}-trigger'
 
     parameters:
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      - 'fuel-virtual-defaults':
+      - '{slave-label}-defaults':
           installer: '{installer}'
       - '{installer}-defaults':
           gs-pathname: '{gs-pathname}'
@@ -108,13 +91,29 @@
     builders:
       - description-setter:
           description: "Built on $NODE_NAME"
+      - multijob:
+          name: docker-build
+          condition: SUCCESSFUL
+          projects:
+            - name: 'fuel-verify-docker-build-{arch_tag}-{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: deploy-virtual
           condition: SUCCESSFUL
           projects:
-            - name: 'fuel-verify-deploy-virtual-{stream}'
+            - name: 'fuel-verify-deploy-virtual-{arch_tag}-{stream}'
               current-parameters: false
               predefined-parameters: |
+                MCP_DOCKER_TAG=verify
                 BRANCH=$BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
@@ -128,7 +127,7 @@
           condition: SUCCESSFUL
           projects:
             # Use Functest job definition from jjb/functest/functest-daily-jobs
-            - name: 'functest-fuel-virtual-suite-{stream}'
+            - name: 'functest-{functest-suite-label}-suite-{stream}'
               current-parameters: false
               predefined-parameters: |
                 FUNCTEST_MODE=tier
@@ -143,7 +142,7 @@
               abort-all-job: true
 
 - job-template:
-    name: 'fuel-verify-{phase}-{stream}'
+    name: 'fuel-verify-{phase}-{arch_tag}-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -159,6 +158,7 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'fuel-verify-docker-build-.*'
             - 'fuel-verify-deploy-.*'
           block-level: 'NODE'
 
@@ -175,8 +175,7 @@
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      - '{slave-label}-defaults'
-      - 'fuel-virtual-defaults':
+      - '{slave-label}-defaults':
           installer: '{installer}'
       - '{installer}-defaults':
           gs-pathname: '{gs-pathname}'
@@ -185,6 +184,50 @@
       - description-setter:
           description: "Built on $NODE_NAME"
       - '{project}-verify-{phase}-macro'
+########################
+# trigger macros
+########################
+- trigger:
+    name: 'fuel-verify-amd64-trigger'
+    triggers:
+      - gerrit: &fuel_verify_amd64_trigger
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: 'ci/**'
+                - compare-type: ANT
+                  pattern: 'mcp/**'
+              disable-strict-forbidden-file-verification: 'true'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'docs/**'
+          readable-message: true
+- trigger:
+    name: 'fuel-verify-arm64-trigger'
+    triggers:
+      - gerrit:
+          <<: *fuel_verify_amd64_trigger
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true
 #####################################
 # builder macros
 #####################################
@@ -193,3 +236,9 @@
     builders:
       - shell:
           !include-raw: ./fuel-deploy.sh
+- builder:
+    name: 'fuel-verify-docker-build-macro'
+    builders:
+      - shell: |
+          #!/bin/bash -ex
+          sudo ./ci/build.sh 'verify' ''

diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml
index 763d1d4..9262988 100644 (file)
--- a/jjb/functest/functest-daily-jobs.yaml
+++ b/jjb/functest/functest-daily-jobs.yaml
@@ -18,6 +18,14 @@
       stream: fraser
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
+    gambia: &gambia
+      stream: gambia
+      branch: 'stable/{stream}'
+      gs-pathname: '/{stream}'
+    hunter: &hunter
+      stream: hunter
+      branch: 'stable/{stream}'
+      gs-pathname: '/{stream}'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index fc2fd3c..14134fa 100644 (file)
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -12,6 +12,12 @@
       - master:
           branch: '{stream}'
           disabled: false
+      - hunter:
+          branch: 'stable/{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
       - fraser:
           branch: 'stable/{stream}'
           disabled: false
@@ -37,6 +43,10 @@
     exclude:
       - stream: 'master'
         image: 'parser'
+      - stream: 'hunter'
+        image: 'parser'
+      - stream: 'gambia'
+        image: 'parser'
       - stream: 'fraser'
         image: 'tempest'
       - stream: 'fraser'

diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml
index 5fbb3be..3836103 100644 (file)
--- a/jjb/functest/functest-kubernetes-docker.yaml
+++ b/jjb/functest/functest-kubernetes-docker.yaml
@@ -12,6 +12,12 @@
       - master:
           branch: '{stream}'
           disabled: false
+      - hunter:
+          branch: 'stable/{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
       - fraser:
           branch: 'stable/{stream}'
           disabled: false

diff --git a/jjb/functest/functest-kubernetes-project-jobs.yaml b/jjb/functest/functest-kubernetes-project-jobs.yaml
index 7f8dd8d..46b77ce 100644 (file)
--- a/jjb/functest/functest-kubernetes-project-jobs.yaml
+++ b/jjb/functest/functest-kubernetes-project-jobs.yaml
@@ -18,6 +18,14 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - hunter: &hunter
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+      - gambia: &gambia
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'

diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml
index 9a12305..b7220a8 100644 (file)
--- a/jjb/functest/functest-project-jobs.yaml
+++ b/jjb/functest/functest-project-jobs.yaml
@@ -18,6 +18,14 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - hunter:
+          branch: 'stable/{stream}'
+          gs-pathname: ''
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          gs-pathname: ''
+          disabled: false
       - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'

diff --git a/jjb/functest/xtesting-docker.yaml b/jjb/functest/xtesting-docker.yaml
index 251c395..84bcb21 100644 (file)
--- a/jjb/functest/xtesting-docker.yaml
+++ b/jjb/functest/xtesting-docker.yaml
@@ -12,6 +12,12 @@
       - master:
           branch: '{stream}'
           disabled: false
+      - hunter:
+          branch: 'stable/{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
       - fraser:
           branch: 'stable/{stream}'
           disabled: false

diff --git a/jjb/functest/xtesting-project-jobs.yaml b/jjb/functest/xtesting-project-jobs.yaml
index e109387..239ae9f 100644 (file)
--- a/jjb/functest/xtesting-project-jobs.yaml
+++ b/jjb/functest/xtesting-project-jobs.yaml
@@ -18,6 +18,14 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - hunter: &hunter
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+      - gambia: &gambia
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'

diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index c31860a..cb9d7f9 100644 (file)
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -26,6 +26,11 @@
     storperf-receivers: &storperf-receivers
       receivers: >
           mark.beierl@emc.com
+    yardstick-receivers: &yardstick-receivers
+      receivers: >
+          limingjiang@huawei.com
+          rexlee8776@gmail.com
+          emma.l.foley@intel.com
     other-receivers: &other-receivers
       receivers: ''
 
@@ -179,7 +184,13 @@
       - 'yardstick':
           project: 'yardstick'
           <<: *master
-          <<: *other-receivers
+          <<: *yardstick-receivers
+      - 'yardstick-image-k8s':
+          project: 'yardstick'
+          dockerdir: 'docker/k8s'
+          <<: *master
+          <<: *yardstick-receivers
+
       # projects with jobs for euphrates
       - 'barometer-collectd':
           project: 'barometer'

diff --git a/jjb/releng/releng-release-jobs.yaml b/jjb/releng/releng-release-jobs.yaml
index c24cdb9..89519ae 100644 (file)
--- a/jjb/releng/releng-release-jobs.yaml
+++ b/jjb/releng/releng-release-jobs.yaml
@@ -14,6 +14,8 @@
 
     stream:
       - fraser
+      - gambia
+      - hunter
 
     jobs:
       - 'releng-release-{stream}-verify'

diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml
index 2c692dd..c4689ba 100644 (file)
--- a/jjb/xci/xci-daily-jobs.yaml
+++ b/jjb/xci/xci-daily-jobs.yaml
@@ -17,57 +17,46 @@
     # -------------------------------
     scenario:
       - 'os-nosdn-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'os-nosdn-nofeature'
           installer-type: 'osa'
           xci-flavor: 'mini'
       - 'os-nosdn-osm-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'os-nosdn-osm'
           installer-type: 'osa'
           xci-flavor: 'mini'
       - 'os-odl-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'os-odl-nofeature'
           installer-type: 'osa'
           xci-flavor: 'mini'
       - 'os-odl-bgpvpn-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'os-odl-bgpvpn'
           installer-type: 'osa'
           xci-flavor: 'mini'
       - 'os-odl-sfc-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'os-odl-sfc'
           installer-type: 'osa'
           xci-flavor: 'mini'
       - 'k8-nosdn-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'k8-nosdn-nofeature'
           installer-type: 'kubespray'
           xci-flavor: 'mini'
       - 'k8-canal-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'k8-canal-nofeature'
           installer-type: 'kubespray'
           xci-flavor: 'mini'
       - 'k8-calico-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'k8-calico-nofeature'
           installer-type: 'kubespray'
           xci-flavor: 'mini'
       - 'k8-contiv-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'k8-contiv-nofeature'
           installer-type: 'kubespray'
           xci-flavor: 'mini'
       - 'k8-flannel-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'k8-flannel-nofeature'
           installer-type: 'kubespray'
           xci-flavor: 'mini'
       - 'k8-nosdn-istio-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
           deploy-scenario: 'k8-nosdn-istio'
           installer-type: 'kubespray'
           xci-flavor: 'mini'
@@ -133,6 +122,9 @@
           block-level: 'NODE'
       - logrotate-default
 
+    triggers:
+      - timed: '@midnight'
+
     parameters:
       - string:
           name: DEPLOY_SCENARIO
@@ -163,9 +155,6 @@
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
           description: 'Git URL to use on this Jenkins Slave'
 
-    triggers:
-      - '{auto-trigger-name}'
-
     wrappers:
       - ssh-agent-wrapper
       - build-timeout:

diff --git a/releases/gambia/functest.yaml b/releases/gambia/functest.yaml
new file mode 100644 (file)
index 0000000..681778c
--- /dev/null
+++ b/releases/gambia/functest.yaml
@@ -0,0 +1,15 @@
+---
+project: functest
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/gambia
+    location:
+      functest: e69190cc9b0763c9a72b654df56fb3ed5f27430f
+  - name: stable/gambia
+    location:
+      functest-kubernetes: 951fc46b7499d9f230c6e8f0e1629ac2325c5ad7
+  - name: stable/gambia
+    location:
+      functest-xtesting: a09ece9bbe9cda52487cf5b443619fec1b3e09ca

diff --git a/releases/hunter/functest.yaml b/releases/hunter/functest.yaml
new file mode 100644 (file)
index 0000000..315b0de
--- /dev/null
+++ b/releases/hunter/functest.yaml
@@ -0,0 +1,15 @@
+---
+project: functest
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      functest: e69190cc9b0763c9a72b654df56fb3ed5f27430f
+  - name: stable/hunter
+    location:
+      functest-kubernetes: 951fc46b7499d9f230c6e8f0e1629ac2325c5ad7
+  - name: stable/hunter
+    location:
+      functest-xtesting: a09ece9bbe9cda52487cf5b443619fec1b3e09ca