X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fyardstick%2Fyardstick.yml;h=b6a02dca32f4666a0a6164bdc272cd0da329844d;hb=refs%2Fchanges%2F07%2F4407%2F1;hp=7c40096cdce9efc41ac6f0ff497e18515af580ba;hpb=cb2a3ab93c2c222412ff9921f4019b457abf42f4;p=releng.git

diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml
index 7c40096cd..b6a02dca3 100644
--- a/jjb/yardstick/yardstick.yml
+++ b/jjb/yardstick/yardstick.yml
@@ -30,16 +30,8 @@
 - job-template:
     name: 'yardstick-verify'
 
-    project-type: freestyle
-
     node: ericsson-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -56,10 +48,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -101,16 +89,8 @@
     #
     # 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
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -127,10 +107,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -162,8 +138,6 @@
 - job-template:
     name: 'yardstick-{installer}-{pod}-{stream}'
 
-    project-type: freestyle
-
     disabled: false
 
     node: '{node}'
@@ -171,6 +145,11 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - '{pod}-parameters'
+        - string:
+            name: POD_NAME
+            default: '{pod}'
+            description: "POD where the job runs"
         - string:
             name: INSTALLER_TYPE
             default: '{installer_type}'
@@ -186,16 +165,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'
 
@@ -215,14 +189,11 @@
 
             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
+            # Pull the latest image
+            docker pull opnfv/yardstick
 
-            # Make sure we have latest image
-            docker pull opnfv/yardstick-ci
+            # Test suites to run
+            TEST_SUITES=opnfv_${POD_NAME}_daily.yaml
 
             docker run \
                --privileged=true \
@@ -230,8 +201,11 @@
                 -t \
                 -e "INSTALLER_TYPE=${INSTALLER_TYPE}" \
                 -e "INSTALLER_IP=${INSTALLER_IP}" \
-                opnfv/yardstick-ci \
-                run_benchmarks
+                -e "POD_NAME=${POD_NAME}" \
+                -e "EXTERNAL_NETWORK=net04_ext" \
+                opnfv/yardstick \
+                run_tests.sh \
+                $TEST_SUITES
 
             echo "Yardstick: done!"
 
@@ -241,15 +215,60 @@
         - 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'
+    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."
+
+- parameter:
+    name: 'lf-parameters'
+    parameters:
+        - string:
+            name: GIT_BASE
+            default: ssh://gerrit.opnfv.org:29418/$PROJECT
+            description: "URL for LF POD"
+
 ########################
 # trigger macros
 ########################
 - trigger:
-    name: yardstick-trigger-ericsson
+    name: 'yardstick-trigger-ericsson'
     triggers:
-        timed: "@midnight"
+        - timed: '@midnight'
 
 - trigger:
-    name: yardstick-trigger-lf
+    name: 'yardstick-trigger-lf'
     triggers:
-        timed: "#@midnight"
+        - timed: '#@midnight'