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

diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml
index a9619032f..4c4997731 100644
--- a/jjb/yardstick/yardstick.yml
+++ b/jjb/yardstick/yardstick.yml
@@ -1,54 +1,41 @@
 - project:
     name: yardstick
 
-    installer:
-        - fuel:
-            node: 'opnfv-jump-2'
-            installer_type: 'fuel'
-            installer_ip: '10.20.0.2'
-        - foreman:
-            node: 'opnfv-jump-2'
-            installer_type: 'foreman'
-            installer_ip: '172.30.10.73'
+    project: '{name}'
+
+    pod:
+        - opnfv-jump-2:
+            installer: fuel
+        - ericsson-pod1:
+            installer: fuel
+        - huawei-us-deploy-bare-1:
+            installer: compass4nfv
+
+    loop:
+        - daily
 
     jobs:
-        - 'yardstick-{installer}-{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'
-        - stable-arno:
-            branch: 'stable/arno'
-            gs-pathname: '/arno'
-
-    project: 'yardstick'
+            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:
@@ -56,10 +43,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -74,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: |
@@ -95,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:
@@ -127,10 +93,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -139,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: |
@@ -160,25 +122,20 @@
             deactivate
 
 - job-template:
-    name: 'yardstick-{installer}-{stream}'
-
-    project-type: freestyle
+    name: 'yardstick-{installer}-{pod}-{loop}-{stream}'
 
     disabled: false
 
-    node: '{node}'
-
     parameters:
         - project-parameter:
             project: '{project}'
+        - '{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:
@@ -186,19 +143,17 @@
             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'
 
     publishers:
         - email:
-            recipients: ana.cunha@ericsson.com
+            recipients: ana.cunha@ericsson.com jorgen.w.karlsson@ericsson.com
 
 ########################
 # builder macros
@@ -208,68 +163,98 @@
     builders:
         - shell: |
             #!/bin/bash
-             set -o errexit
-             set -o pipefail
+            set -o errexit
 
-            echo "Yardstick: prepare Yardstick environment"
+            echo "Yardstick: Run benchmark test suites ..."
 
-            # source openstack vars
-            if [[ ! -f $HOME/opnfv-openrc.sh ]]; then
-                echo "Unable to access file $HOME/opnfv-openrc.sh"
-                exit 1
-            fi
-            source $HOME/opnfv-openrc.sh
+            # Pull the latest image
+            docker pull opnfv/yardstick
 
-            # Emergency fix for glance '--is-public' error.
-            # TODO: This should maybe go into openrc instead!?
-            export OS_IMAGE_API_VERSION=1
+            docker run \
+               --privileged=true \
+                --rm \
+                -t \
+                -e "INSTALLER_TYPE=${INSTALLER_TYPE}" \
+                -e "INSTALLER_IP=${INSTALLER_IP}" \
+                -e "POD_NAME=${NODE_NAME}" \
+                -e "EXTERNAL_NETWORK=net04_ext" \
+                opnfv/yardstick \
+                run_tests.sh \
+                $YARDSTICK_SUITE_NAME
 
-            # Install required packages. 
-            # 'libguestfs-tools' is needed when building the yardstick image.
-            sudo yum -y install libguestfs-tools
+            echo "Yardstick: done!"
 
-            # set virtualenv
-            echo "Yardstick: setup virtualenv"
-            cd $WORKSPACE
-            virtualenv $WORKSPACE/yardstick_venv
-            source $WORKSPACE/yardstick_venv/bin/activate
-            easy_install -U setuptools
-            python setup.py develop > /dev/null 2>&1
-
-            echo "Yardstick: configure the images"
-            # check if cirros-0.3.3 image is already available
-            # if not, create the image
-            IMAGE_NAMES[0]=cirros-0.3.3
-            if ! nova image-show ${IMAGE_NAMES[0]} > /dev/null 2>&1; then
-                echo "Image ${IMAGE_NAMES[0]} doesn't exist. Creating image ${IMAGE_NAMES[0]}"
-                glance image-create --name cirros-0.3.3 --is-public true --disk-format qcow2 --container-format bare --file $HOME/yardstick/cirros-0.3.3-x86_64-disk.img
+- builder:
+    name: yardstick-fetch-os-creds
+    builders:
+        - 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
 
-            # check if yardstick-trusty image is already available
-            # if not, create the image to $WORKSPACE
-            IMAGE_NAMES[1]=yardstick-trusty-server
-            if ! nova image-show ${IMAGE_NAMES[1]} > /dev/null 2>&1; then
-                echo "Image ${IMAGE_NAMES[1]} doesn't exist. Creating image ${IMAGE_NAMES[1]}"
-                sudo $(which yardstick-img-modify) $WORKSPACE/tools/ubuntu-server-cloudimg-modify.sh
-                glance image-create --name yardstick-trusty-server --is-public true --disk-format qcow2 --container-format bare --file $WORKSPACE/yardstick-trusty-server.img
+            # 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: 'yardstick-params-ericsson-pod1'
+    parameters:
+        - string:
+            name: YARDSTICK_DB_BACKEND
+            default: 'none'
+            description: 'Arguments to use in order to choose the backend DB'
 
-            # execute tasks
-            echo "Yardstick: execute scenarios"
-            ./ci/run_tasks.sh
+- parameter:
+    name: 'yardstick-params-opnfv-jump-2'
+    parameters:
+        - string:
+            name: YARDSTICK_DB_BACKEND
+            default: 'db_args'
+            description: 'Arguments to use in order to choose the backend DB'
 
-            # cleanup
-            echo "Yardstick: cleanup"
-            for IMAGE_NAME in ${IMAGE_NAMES[@]}
-            do
-                glance image-delete $IMAGE_NAME
-            done
+- 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-pod1'
+    triggers:
+        - timed: '@midnight'
 
-            # done
-            echo "Yardstick: done!"
+- trigger:
+    name: 'yardstick-trigger-opnfv-jump-2'
+    triggers:
+        - timed: '#@midnight'
 
-- builder:
-    name: yardstick-fetch-os-creds
-    builders:
-        - shell:
-            !include-raw ../../utils/fetch_os_creds.sh
+- trigger:
+    name: 'yardstick-trigger-huawei-us-deploy-bare-1'
+    triggers:
+        - timed: '#@midnight'