X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbottlenecks%2Fbottlenecks-ci-jobs.yml;h=686b7d45c114d9caf7a1cb738a7999aff286cf74;hb=refs%2Fchanges%2F43%2F15343%2F5;hp=09b7df172d8d6708e82d0bb652523e631228fc56;hpb=cbc32fd99926ea20df148832776ec15a034f7f02;p=releng.git

diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index 09b7df172..686b7d45c 100644
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -23,44 +23,58 @@
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
         gs-packagepath: '/{stream}/{suite}'
-        docker-tag: 'brahmaputra'
+        docker-tag: 'stable'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
-#        brahmaputra
+#    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
+#compass CI PODs
+        - baremetal:
+            slave-label: compass-baremetal
+            installer: compass
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - virtual:
+            slave-label: compass-virtual
+            installer: compass
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - baremetal:
+            slave-label: compass-baremetal
+            installer: compass
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *brahmaputra
-        - huawei-us-deploy-bare-1:
+        - virtual:
+            slave-label: compass-virtual
             installer: compass
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *brahmaputra
+
 #--------------------------------
-#        master
+#        None-CI PODs
 #--------------------------------
-        - ericsson-pod1:
-            installer: fuel
-            <<: *master
-        - ericsson-pod2:
-            installer: fuel
-            <<: *master
-        - intel-pod6:
+        - orange-pod2:
+            slave-label: '{pod}'
             installer: joid
-            <<: *master
-        - intel-pod8:
-            installer: compass
-            <<: *master
-        - zte-build-1:
-            installer: fuel
-            <<: *master
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *brahmaputra
         - orange-pod2:
+            slave-label: '{pod}'
             installer: joid
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
-#--------------------------------
+        - huawei-pod2:
+            slave-label: '{pod}'
+            installer: compass
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+
+#--------------------------------------------
     suite:
         - 'rubbos'
         - 'vstf'
@@ -74,18 +88,29 @@
 - job-template:
     name: 'bottlenecks-{installer}-{suite}-{pod}-daily-{stream}'
 
-    disabled: false
-
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 180
+            abort: true
+
+    triggers:
+        - '{auto-trigger-name}'
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - '{pod}-defaults'
+        - '{slave-label}-defaults'
         - '{installer}-defaults'
-        - 'bottlenecks-params-{pod}'
+        - '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: 'false'
@@ -107,7 +132,6 @@
 
     builders:
         - 'bottlenecks-env-cleanup'
-        - 'bottlenecks-fetch-os-creds'
         - 'bottlenecks-run-suite'
 
     publishers:
@@ -117,12 +141,6 @@
 ########################
 # builder macros
 ########################
-- builder:
-    name: bottlenecks-fetch-os-creds
-    builders:
-        - shell:
-            !include-raw ../../utils/fetch_os_creds.sh
-
 - builder:
     name: bottlenecks-env-cleanup
     builders:
@@ -155,88 +173,63 @@
             set -e
             [[ $GERRIT_REFSPEC_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
 
-            echo "Bottlenecks: ${SUITE_NAME} running now..."
-
-            # pull latest image
-            docker pull opnfv/bottlenecks:$DOCKER_TAG >$redirect
+            echo "Bottlenecks: to pull image opnfv/bottlenecks:${DOCKER_TAG}"
+            docker pull opnfv/bottlenecks:$DOCKER_TAG >${redirect}
 
-            # run tests by using docker
-            opts="--privileged=true --rm"
+            echo "Bottlenecks: docker start running"
+            opts="--privileged=true -id"
             envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
                   -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NET=${EXTERNAL_NETWORK} \
                   -e BOTTLENECKS_BRANCH=${BOTTLENECKS_BRANCH} -e GERRIT_REFSPEC_DEBUG=${GERRIT_REFSPEC_DEBUG} \
                   -e BOTTLENECKS_DB_TARGET=${BOTTLENECKS_DB_TARGET} -e PACKAGE_URL=${PACKAGE_URL}"
-            run_testsuite="run_tests.sh -s ${SUITE_NAME}"
-            cmd="sudo docker run ${opts} ${envs} opnfv/bottlenecks ${run_testsuite} >${redirect}"
-            echo "Bottlenecks: docker cmd running: ${cmd}"
-            ${cmd}
+            cmd="sudo docker run ${opts} ${envs} opnfv/bottlenecks:${DOCKER_TAG} /bin/bash"
+            echo "Bottlenecks: docker cmd running ${cmd}"
+            ${cmd} >${redirect}
+
+            echo "Bottlenecks: obtain docker id"
+            container_id=$(docker ps | grep "opnfv/bottlenecks:${DOCKER_TAG}" | awk '{print $1}' | head -1)
+            if [ -z ${container_id} ]; then
+                echo "Cannot find opnfv/bottlenecks container ID ${container_id}. Please check if it exists."
+                docker ps -a
+                exit 1
+            fi
+
+            echo "Bottlenecks: to prepare openstack environment"
+            prepare_env="${REPO_DIR}/ci/prepare_env.sh"
+            echo "Bottlenecks: docker cmd running: ${prepare_env}"
+            sudo docker exec ${container_id} ${prepare_env}
+
+            echo "Bottlenecks: to run testsuite ${SUITE_NAME}"
+            run_testsuite="${REPO_DIR}/run_tests.sh -s ${SUITE_NAME}"
+            echo "Bottlenecks: docker cmd running: ${run_testsuite}"
+            sudo docker exec ${container_id} ${run_testsuite}
 
 ####################
 # 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'
-
-- 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'
-
-- 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'
-
-- 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'
-
-- 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:
-    name: 'bottlenecks-params-opnfv-jump-2'
+    name: 'bottlenecks-params-compass-baremetal'
     parameters:
         - string:
             name: BOTTLENECKS_DB_TARGET
-            default: '213.77.62.197'
+            default: '104.197.68.199:8086'
             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'
     parameters:
         - string:
             name: BOTTLENECKS_DB_TARGET
-            default: '213.77.62.197'
+            default: ''
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'bottlenecks-params-zte-build-1'
+    name: 'bottlenecks-params-huawei-pod2'
     parameters:
         - string:
             name: BOTTLENECKS_DB_TARGET
-            default: '213.77.62.197'
+            default: '104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
@@ -244,5 +237,5 @@
     parameters:
         - string:
             name: BOTTLENECKS_DB_TARGET
-            default: '213.77.62.197'
+            default: '104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'