X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbottlenecks%2Fbottlenecks-ci-jobs.yml;h=2779e316b3d81b48cb1e417fdd4e366d1d490e82;hb=3a76d9e0aff0902c67cc6c22bed79f4a0a02211f;hp=b4b736faa12c7c9c6e3e1f3f4d09973b0ae9e562;hpb=7dfb2c023cc0f21699b75c41dc5d4812eba6245e;p=releng.git

diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index b4b736faa..072117ae3 100644
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -1,3 +1,4 @@
+---
 ####################################
 # job configuration for bottlenecks
 ####################################
@@ -6,60 +7,81 @@
 
     project: 'bottlenecks'
 
-#--------------------------------
-# BRANCH ANCHORS
-#--------------------------------
+    # -------------------------------
+    # BRANCH ANCHORS
+    # -------------------------------
     master: &master
-        stream: master
-        branch: '{stream}'
-        gs-pathname: ''
-    brahmaputra: &brahmaputra
-        stream: brahmaputra
-        branch: 'stable/{stream}'
-        gs-pathname: '{stream}'
-#--------------------------------
-# POD, INSTALLER, AND BRANCH MAPPING
-#--------------------------------
-#        brahmaputra
-#--------------------------------
+      stream: master
+      branch: '{stream}'
+      # This is used for common project file storage
+      gs-pathname: ''
+      # This is used for different test suite dependent packages storage
+      gs-packagepath: '/{suite}'
+      # docker tag used for version control
+      docker-tag: 'latest'
+    euphrates: &euphrates
+      stream: euphrates
+      branch: 'stable/{stream}'
+      gs-pathname: '/{stream}'
+      gs-packagepath: '/{stream}/{suite}'
+      docker-tag: 'stable'
+    # -------------------------------
+    # POD, INSTALLER, AND BRANCH MAPPING
+    # -------------------------------
+    #    Installers using labels
+    #            CI PODs
+    # This section should only contain the installers
+    # that have been switched using labels for slaves
+    # -------------------------------
     pod:
-        - opnfv-jump-2:
-            installer: fuel
-            <<: *brahmaputra
-        - intel-pod5:
-            installer: joid
-            <<: *brahmaputra
-        - huawei-us-deploy-bare-1:
-            installer: compass
-            <<: *brahmaputra
-#--------------------------------
-#        master
-#--------------------------------
-        - ericsson-pod1:
-            installer: fuel
-            <<: *master
-        - ericsson-pod2:
-            installer: fuel
-            <<: *master
-        - intel-pod6:
-            installer: joid
-            <<: *master
-        - intel-pod8:
-            installer: compass
-            <<: *master
-        - zte-build-1:
-            installer: fuel
-            <<: *master
-        - orange-pod2:
-            installer: joid
-            <<: *master
-#--------------------------------
+      # compass CI PODs
+      - baremetal:
+          slave-label: compass-baremetal-master
+          installer: compass
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
+      - virtual:
+          slave-label: compass-virtual-master
+          installer: compass
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
+      - baremetal:
+          slave-label: compass-baremetal-branch
+          installer: compass
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *euphrates
+      - virtual:
+          slave-label: compass-virtual-branch
+          installer: compass
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *euphrates
+
+    # -------------------------------
+    #        None-CI PODs
+    # -------------------------------
+    # - orange-pod2:
+    #     slave-label: '{pod}'
+    #     installer: joid
+    #     auto-trigger-name: 'daily-trigger-disabled'
+    #     <<: *euphrates
+    # - orange-pod2:
+    #     slave-label: '{pod}'
+    #     installer: joid
+    #     auto-trigger-name: 'daily-trigger-disabled'
+    #     <<: *master
+    # -------------------------------------------
     suite:
-        - 'rubbos'
-        - 'vstf'
+      - 'posca_stress_traffic'
+      - 'posca_stress_ping'
+      - 'posca_factor_multistack_storage'
+      - 'posca_factor_multistack_storage_parallel'
+      - 'posca_feature_moon_resources'
+      - 'posca_feature_moon_tenants'
+      - 'posca_feature_vnf_scale_out'
+      - 'posca_factor_soak_throughputs'
 
     jobs:
-        - 'bottlenecks-{installer}-{suite}-{pod}-daily-{stream}'
+      - 'bottlenecks-{installer}-{suite}-{pod}-daily-{stream}'
 
 ################################
 # job templates
@@ -67,139 +89,116 @@
 - job-template:
     name: 'bottlenecks-{installer}-{suite}-{pod}-daily-{stream}'
 
-    disabled: false
-
     wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+      - build-name:
+          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+      - timeout:
+          timeout: 180
+          abort: true
+      - fix-workspace-permissions
+
+    triggers:
+      - '{auto-trigger-name}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - '{pod}-defaults'
-        - '{installer}-defaults'
-        - 'bottlenecks-params-{pod}'
-        - string:
-            name: GERRIT_REFSPEC_DEBUG
-            default: ''
-            description: "Gerrit refspec for debug."
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - '{slave-label}-defaults'
+      - '{installer}-defaults'
+      - 'bottlenecks-params-{slave-label}'
+      - string:
+          name: REPO_DIR
+          default: "/home/opnfv/bottlenecks"
+          description: "Directory where the repository is cloned"
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-odl_l2-nofeature-ha'
+      - string:
+          name: GERRIT_REFSPEC_DEBUG
+          default: 'true'
+          description: "Gerrit refspec for debug."
+      - string:
+          name: SUITE_NAME
+          default: '{suite}'
+          description: "test suite name."
+      - string:
+          name: DOCKER_TAG
+          default: '{docker-tag}'
+          description: "docker image tag used for version control"
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+      - git-scm
 
     builders:
-        - 'bottlenecks-fetch-os-creds'
-        - 'bottlenecks-run-{suite}'
+      - 'bottlenecks-env-cleanup'
+      - 'bottlenecks-run-suite'
+      - 'bottlenecks-workspace-cleanup'
 
     publishers:
-        - email:
-            recipients: hongbo.tianhongbo@huawei.com matthew.lijun@huawei.com liangqi1@huawei.com liyiting@huawei.com
+      - email:
+          recipients: gabriel.yuyang@huawei.com, liyin11@huawei.com
+      - email-jenkins-admins-on-failure
 
 ########################
 # builder macros
 ########################
-#- builder:
-#    name: bottlenecks-fetch-os-creds
-#    builders:
-#        - shell:
-#            !include-raw ../../utils/fetch_os_creds.sh
-
-#- builder:
-#    name: bottlenecks-run-rubbos
-#    builders:
-#        - shell: |
-#            #!/bin/bash
-#            set -o errexit
-#
-#            echo "Bottlenecks: rubbos running now..."
-#            cd $WORKSPACE
-#            ./ci/run.sh $GERRIT_REFSPEC_DEBUG
-
-#- builder:
-#    name: bottlenecks-run-vstf
-#    builders:
-#        - shell: |
-#            #!/bin/bash
-#            set -o errexit
-
-#            echo "Bottlenecks: vstf running now..."
-#            cd $WORKSPACE
-#            ./ci/vstf_run.sh $GERRIT_REFSPEC_DEBUG
-
-########################
-# parameter macros
-########################
-- parameter:
-    name: 'bottlenecks-params-intel-pod5'
-    parameters:
-        - string:
-            name: BOTTLENECKS_DB_TARGET
-            default: '213.77.62.197'
-            description: 'Arguments to use in order to choose the backend DB'
+- builder:
+    name: bottlenecks-env-cleanup
+    builders:
+      - shell:
+          !include-raw: ./bottlenecks-cleanup.sh
 
-- parameter:
-    name: 'bottlenecks-params-intel-pod6'
-    parameters:
-        - string:
-            name: BOTTLENECKS_DB_TARGET
-            default: '213.77.62.197'
-            description: 'Arguments to use in order to choose the backend DB'
+- builder:
+    name: bottlenecks-run-suite
+    builders:
+      - shell:
+          !include-raw: ./bottlenecks-run-suite.sh
 
-- parameter:
-    name: 'bottlenecks-params-intel-pod8'
-    parameters:
-        - string:
-            name: BOTTLENECKS_DB_TARGET
-            default: '213.77.62.197'
-            description: 'Arguments to use in order to choose the backend DB'
+- builder:
+    name: bottlenecks-workspace-cleanup
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+          set -o nounset
+          set -o pipefail
 
-- parameter:
-    name: 'bottlenecks-params-ericsson-pod1'
-    parameters:
-        - string:
-            name: BOTTLENECKS_DB_TARGET
-            default: '213.77.62.197'
-            description: 'Arguments to use in order to choose the backend DB'
+          # delete everything that is in $WORKSPACE
+          sudo rm -rf $WORKSPACE
 
-- parameter:
-    name: 'bottlenecks-params-ericsson-pod2'
-    parameters:
-        - string:
-            name: BOTTLENECKS_DB_TARGET
-            default: '213.77.62.197'
-            description: 'Arguments to use in order to choose the backend DB'
+####################
+# parameter macros
+####################
 
 - parameter:
-    name: 'bottlenecks-params-opnfv-jump-2'
+    name: 'bottlenecks-params-compass-baremetal-master'
     parameters:
-        - string:
-            name: BOTTLENECKS_DB_TARGET
-            default: '213.77.62.197'
-            description: 'Arguments to use in order to choose the backend DB'
+      - string:
+          name: BOTTLENECKS_DB_TARGET
+          default: 'http://testresults.opnfv.org/test/api/v1/results'
+          description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'bottlenecks-params-huawei-us-deploy-bare-1'
+    name: 'bottlenecks-params-compass-virtual-master'
     parameters:
-        - string:
-            name: BOTTLENECKS_DB_TARGET
-            default: '213.77.62.197'
-            description: 'Arguments to use in order to choose the backend DB'
+      - string:
+          name: BOTTLENECKS_DB_TARGET
+          default: 'http://testresults.opnfv.org/test/api/v1/results'
+          description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'bottlenecks-params-zte-build-1'
+    name: 'bottlenecks-params-compass-baremetal-branch'
     parameters:
-        - string:
-            name: BOTTLENECKS_DB_TARGET
-            default: '213.77.62.197'
-            description: 'Arguments to use in order to choose the backend DB'
+      - string:
+          name: BOTTLENECKS_DB_TARGET
+          default: 'http://testresults.opnfv.org/test/api/v1/results'
+          description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'bottlenecks-params-orange-pod2'
+    name: 'bottlenecks-params-compass-virtual-branch'
     parameters:
-        - string:
-            name: BOTTLENECKS_DB_TARGET
-            default: '213.77.62.197'
-            description: 'Arguments to use in order to choose the backend DB'
+      - string:
+          name: BOTTLENECKS_DB_TARGET
+          default: 'http://testresults.opnfv.org/test/api/v1/results'
+          description: 'Arguments to use in order to choose the backend DB'