X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick.yml;h=4c499773167e2da4b7e098b57b64ccdd2641456b;hb=3322005f4964eb905201cdccaf9ae5ce5c78755d;hp=5afaaf723ccd86378c769300e1b9ff71c3faed4b;hpb=99461785a9fa5541177db93b9a3e2e0c94dd75b7;p=releng.git

diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml
index 5afaaf723..4c4997731 100644
--- a/jjb/yardstick/yardstick.yml
+++ b/jjb/yardstick/yardstick.yml
@@ -1,54 +1,41 @@
 - project:
     name: yardstick
 
-    project: 'yardstick'
+    project: '{name}'
 
     pod:
-        - lf:
-            node: 'opnfv-jump-2'
-            installer_type: 'fuel'
-            installer_ip: '10.20.0.2'
-        - ericsson:
-            node: 'yardstick-pod'
-            installer_type: 'fuel'
-            installer_ip: '10.20.0.2'
-
-    installer:
-        - fuel
+        - opnfv-jump-2:
+            installer: fuel
+        - ericsson-pod1:
+            installer: fuel
+        - huawei-us-deploy-bare-1:
+            installer: compass4nfv
+
+    loop:
+        - daily
 
     jobs:
-        - 'yardstick-{installer}-{pod}-{stream}'
-        - 'yardstick-merge'
-        - 'yardstick-verify'
+        - 'yardstick-{installer}-{pod}-{loop}-{stream}'
+        - 'yardstick-merge-{stream}'
+        - 'yardstick-verify-{stream}'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
     stream:
         - master:
             branch: 'master'
+            gs-pathname: ''
+#        - brahmaputra:
+#            branch: 'stable/brahmaputra'
+#            gs-pathname: '/brahmaputra'
 
 - job-template:
-    name: 'yardstick-verify'
-
-    project-type: freestyle
-
-    node: ericsson-build
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    name: 'yardstick-verify-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+            branch: '{branch}'
+        - 'ericsson-ca-build-1-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -70,10 +57,10 @@
                     comment-contains-value: 'reverify'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: 'yardstick'
+                project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
 
     builders:
         - shell: |
@@ -91,31 +78,14 @@
             deactivate
 
 - job-template:
-    name: 'yardstick-merge'
-
-    # builder-merge job to run JJB update
-    #
-    # This job's purpose is to update all the JJB
-
-    project-type: freestyle
-
-    node: ericsson-build
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+    name: 'yardstick-merge-{stream}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+            branch: '{branch}'
+        - 'ericsson-ca-build-1-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -131,10 +101,10 @@
                     comment-contains-value: 'remerge'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: 'yardstick'
+                project-pattern: '{project}'
                 branches:
                     - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+                      branch-pattern: '**/{branch}'
 
     builders:
         - shell: |
@@ -152,30 +122,20 @@
             deactivate
 
 - job-template:
-    name: 'yardstick-{installer}-{pod}-{stream}'
-
-    project-type: freestyle
+    name: 'yardstick-{installer}-{pod}-{loop}-{stream}'
 
     disabled: false
 
-    node: '{node}'
-
     parameters:
         - project-parameter:
             project: '{project}'
-        - '{pod}-parameters'
-        - string:
-            name: POD_NAME
-            default: '{pod}'
-            description: "POD where the job runs"
+        - '{pod}-defaults'
+        - '{installer}-defaults'
+        - 'yardstick-params-{pod}'
         - string:
-            name: INSTALLER_TYPE
-            default: '{installer_type}'
-            description: "Installer name that is used for deployment."
-        - string:
-            name: INSTALLER_IP
-            default: '{installer_ip}'
-            description: "Installer IP."
+            name: YARDSTICK_SUITE_NAME
+            default: opnfv_${{NODE_NAME}}_{loop}.yaml
+            description: 'Path to test suite'
 
     scm:
         - git-scm:
@@ -183,16 +143,11 @@
             refspec: ''
             branch: master
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     triggers:
         - 'yardstick-trigger-{pod}'
 
     builders:
+        - 'yardstick-cleanup'
         - 'yardstick-fetch-os-creds'
         - 'yardstick-daily'
 
@@ -212,14 +167,8 @@
 
             echo "Yardstick: Run benchmark test suites ..."
 
-            # Remove old containers
-            docker ps | grep opnfv/yardstick-ci |\
-                awk '{print $1}' | xargs -r docker stop &>/dev/null
-            docker ps -a | grep opnfv/yardstick-ci |\
-                awk '{print $1}' | xargs -r  docker rm &>/dev/null
-
-            # Make sure we have latest image
-            docker pull opnfv/yardstick-ci
+            # Pull the latest image
+            docker pull opnfv/yardstick
 
             docker run \
                --privileged=true \
@@ -227,8 +176,11 @@
                 -t \
                 -e "INSTALLER_TYPE=${INSTALLER_TYPE}" \
                 -e "INSTALLER_IP=${INSTALLER_IP}" \
-                opnfv/yardstick-ci \
-                run_benchmarks
+                -e "POD_NAME=${NODE_NAME}" \
+                -e "EXTERNAL_NETWORK=net04_ext" \
+                opnfv/yardstick \
+                run_tests.sh \
+                $YARDSTICK_SUITE_NAME
 
             echo "Yardstick: done!"
 
@@ -238,34 +190,71 @@
         - shell:
             !include-raw ../../utils/fetch_os_creds.sh
 
+- builder:
+    name: yardstick-cleanup
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "Cleaning up docker containers/images..."
+
+            # Remove previous running containers if exist
+            if [[ ! -z $(docker ps -a | grep opnfv/yardstick) ]]; then
+                echo "Removing existing opnfv/yardstick containers..."
+                docker ps | grep opnfv/yardstick | awk '{print $1}' | xargs docker stop
+                docker ps -a | grep opnfv/yardstick | awk '{print $1}' | xargs docker rm
+            fi
+
+            # Remove existing images if exist
+            if [[ ! -z $(docker images | grep opnfv/yardstick) ]]; then
+                echo "Docker images to remove:"
+                docker images | head -1 && docker images | grep opnfv/yardstick
+                image_tags=($(docker images | grep opnfv/yardstick | awk '{print $2}'))
+                for tag in "${image_tags[@]}"; do
+                    echo "Removing docker image opnfv/yardstick:$tag..."
+                    docker rmi opnfv/yardstick:$tag
+                done
+            fi
 ########################
 # parameter macros
 ########################
 - parameter:
-    name: 'ericsson-parameters'
+    name: 'yardstick-params-ericsson-pod1'
     parameters:
         - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+            name: YARDSTICK_DB_BACKEND
+            default: 'none'
+            description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'lf-parameters'
+    name: 'yardstick-params-opnfv-jump-2'
     parameters:
         - string:
-            name: GIT_BASE
-            default: ssh://gerrit.opnfv.org:29418/$PROJECT
-            description: "URL for LF POD"
+            name: YARDSTICK_DB_BACKEND
+            default: 'db_args'
+            description: 'Arguments to use in order to choose the backend DB'
 
+- parameter:
+    name: 'yardstick-params-huawei-us-deploy-bare-1'
+    parameters:
+        - string:
+            name: YARDSTICK_DB_BACKEND
+            default: 'none'
+            description: 'Arguments to use in order to choose the backend DB'
 ########################
 # trigger macros
 ########################
 - trigger:
-    name: 'yardstick-trigger-ericsson'
+    name: 'yardstick-trigger-ericsson-pod1'
     triggers:
         - timed: '@midnight'
 
 - trigger:
-    name: 'yardstick-trigger-lf'
+    name: 'yardstick-trigger-opnfv-jump-2'
+    triggers:
+        - timed: '#@midnight'
+
+- trigger:
+    name: 'yardstick-trigger-huawei-us-deploy-bare-1'
     triggers:
         - timed: '#@midnight'