X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fqtip%2Fqtip-ci-jobs.yml;h=69cb32b4140cb8c4e374e0ff59689969fe1f0f2f;hb=c2eac4583d767f7052bfad996b35105edd49ee46;hp=ef455f8dfe0cced3039d9f726092bc81c22d77a9;hpb=7ecfd3b34310ef43e845baf28c177a8f1cfbacc4;p=releng.git

diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml
index ef455f8df..69cb32b41 100644
--- a/jjb/qtip/qtip-ci-jobs.yml
+++ b/jjb/qtip/qtip-ci-jobs.yml
@@ -2,7 +2,7 @@
 # job configuration for qtip
 ####################################
 - project:
-    name: qtip-ci-jobs
+    name: qtip
 
     project: 'qtip'
 
@@ -13,38 +13,20 @@
         stream: master
         branch: '{stream}'
         gs-pathname: ''
-    brahmaputra: &brahmaputra
-        stream: brahmaputra
-        branch: 'stable/{stream}'
-        gs-pathname: '{stream}'
+        docker-tag: 'latest'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
-#        brahmaputra
-#--------------------------------
-    pod:
-        - dell-pod1:
-            installer: compass
-            auto-trigger-name: 'qtip-daily-dell-pod1-trigger'
-            <<: *brahmaputra
-        - orange-pod2:
-            installer: joid
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *brahmaputra
-#--------------------------------
 #        master
 #--------------------------------
-        - juniper-pod1:
-            installer: joid
-            <<: *master
-            auto-trigger-name: 'daily-trigger-disabled'
-        - zte-pod1:
+    pod:
+        - zte-pod2:
             installer: fuel
-            auto-trigger-name: 'qtip-daily-zte-pod1-trigger'
+            auto-trigger-name: 'qtip-daily-zte-pod2-trigger'
             <<: *master
-        - zte-pod2:
+        - zte-pod3:
             installer: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
+            auto-trigger-name: 'qtip-daily-zte-pod3-trigger'
             <<: *master
 
 #--------------------------------
@@ -57,137 +39,63 @@
 - job-template:
     name: 'qtip-{installer}-{pod}-daily-{stream}'
 
-    disabled: false
+    disabled: true
 
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
         - '{installer}-defaults'
         - '{pod}-defaults'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-ha'
+        - string:
+            name: DOCKER_TAG
+            default: '{docker-tag}'
+            description: 'Tag to pull docker image'
 
     scm:
-        - git-scm:
-              credentials-id: '{ssh-credentials}'
-              refspec: ''
-              branch: '{branch}'
+        - git-scm
 
     triggers:
         - '{auto-trigger-name}'
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - 'qtip-cleanup'
-        - 'qtip-set-env'
-        - 'qtip-run-suite'
-        - 'qtip-pushtoDB'
+        - 'qtip-daily-ci'
 
     publishers:
         - email:
-            recipients: nauman.ahad@xflowresearch.com, mofassir.arif@xflowresearch.com, vikram@nvirters.com, zhang.yujunz@zte.com.cn
+            recipients: wu.zhihui1@zte.com.cn, zhang.yujunz@zte.com.cn
 
 ###########################
 #biuilder macros
 ###########################
 - builder:
-    name: qtip-set-env
-    builders:
-        - shell: |
-            #!/bin/bash
-            echo "Qtip: Start Docker and prepare environment"
-            envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}"
-            suite="TEST_CASE=all"
-            dir_imgstore="${HOME}/imgstore"
-            img_volume="${dir_imgstore}:/home/opnfv/imgstore"
-            docker pull opnfv/qtip:latest
-            cmd=" docker run -id -e $envs -e $suite -v ${img_volume} opnfv/qtip:latest /bin/bash"
-            echo "Qtip: Running docker run command: ${cmd}"
-            ${cmd}
-            docker ps -a
-            container_id=$(docker ps | grep 'opnfv/qtip:latest' | awk '{print $1}' | head -1)
-             if [ $(docker ps | grep 'opnfv/qtip' | wc -l) == 0 ]; then
-                echo "The container opnfv/qtip with ID=${container_id} has not been properly started. Exiting..."
-                exit 1
-            fi
-- builder:
-    name: qtip-run-suite
+    name: qtip-daily-ci
     builders:
-        - shell: |
-            #!/bin/bash
-            container_id=$(docker ps | grep 'opnfv/qtip:latest' | awk '{print $1}' | head -1)
-            if [[ ! -z ${container_id} ]]; then
-                echo "The container ID is: ${container_id}"
-                QTIP_REPO=/home/opnfv/repos/qtip
-                docker exec -t ${container_id} $QTIP_REPO/docker/run_qtip.sh
-            else
-                echo "Container ID not available"
-            fi
-
-- builder:
-    name: qtip-pushtoDB
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            echo "Pushing available results to DB"
-            echo "The container id is:"
-            container_id=$(docker ps | grep 'opnfv/qtip:latest' | awk '{print $1}' | head -1)
-            if [[ ! -z ${container_id} ]]; then
-                echo "The condiner ID is: ${container_id}"
-                QTIP_REPO=/home/opnfv/repos/qtip
-                docker exec -t ${container_id} $QTIP_REPO/docker/push_db.sh
-            else
-                echo "Container ID not available"
-            fi
+        - shell:
+            !include-raw: ./qtip-daily-ci.sh
 
 - builder:
     name: qtip-cleanup
     builders:
-        - shell: |
-            #!/bin/bash
-
-            echo "Cleaning up QTIP  docker containers/images..."
-            # Remove previous running containers if exist
-            if [[ ! -z $(docker ps -a | grep opnfv/qtip) ]]; then
-                echo "Removing existing opnfv/qtip containers..."
-                running_containers=$(docker ps | grep opnfv/qtip | awk '{print $1}')
-                docker stop ${running_containers}
-                all_containers=$(docker ps -a | grep opnfv/qtip | awk '{print $1}')
-                docker rm ${all_containers}
-            fi
-
-            # Remove existing images if exist
-            if [[ ! -z $(docker images | grep opnfv/qtip) ]]; then
-                echo "Docker images to remove:"
-                docker images | head -1 && docker images | grep opnfv/qtip
-                image_tags=($(docker images | grep opnfv/qtip | awk '{print $2}'))
-                for tag in "${image_tags[@]}"; do
-                    echo "Removing docker image opnfv/qtip:$tag..."
-                    docker rmi opnfv/qtip:$tag
-                done
-            fi
+        - shell:
+            !include-raw: ./qtip-cleanup.sh
 
 #################
 #trigger macros
 #################
-
 - trigger:
-    name: 'qtip-daily-dell-pod1-trigger'
+    name: 'qtip-daily-zte-pod2-trigger'
     triggers:
-        - timed: '0 3 * * *'
-
-#- trigger:
-#    name: 'qtip-daily-juniper-pod1-trigger'
-#    triggers:
-#        - timed : '0 0 * * *'
-
-#- trigger:
-#   name: 'qtip-dailty-orange-pod2-trigger'
-#   triggers:
-#       - timed : ' 0 0 * * *'
+        - timed: '0 7 * * *'
 
 - trigger:
-    name: 'qtip-daily-zte-pod1-trigger'
+    name: 'qtip-daily-zte-pod3-trigger'
     triggers:
-        - timed: '0 5 * * *'
+        - timed: '0 1 * * *'