Merge "add zte-pod1 to functest dashboard"
authorMorgan Richomme <morgan.richomme@orange.com>
Tue, 24 May 2016 14:24:11 +0000 (14:24 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 24 May 2016 14:24:11 +0000 (14:24 +0000)
15 files changed:
jjb/compass4nfv/compass-ci-jobs.yml
jjb/compass4nfv/compass-deploy.sh
jjb/compass4nfv/compass-project-jobs.yml
jjb/functest/functest-ci-jobs.yml
jjb/functest/functest-cleanup.sh [new file with mode: 0755]
jjb/functest/functest-daily.sh [new file with mode: 0755]
jjb/functest/functest-suite.sh [new file with mode: 0755]
jjb/functest/set-functest-env.sh [new file with mode: 0755]
jjb/opnfv/opnfv-docker.sh
jjb/yardstick/yardstick-ci-jobs.yml
jjb/yardstick/yardstick-cleanup.sh [new file with mode: 0755]
jjb/yardstick/yardstick-daily.sh [new file with mode: 0755]
jjb/yardstick/yardstick-project-jobs.yml
jjb/yardstick/yardstick-vtcdaily.sh [new file with mode: 0755]
utils/test/result_collection_api/README.md

index ce9193c..40f5445 100644 (file)
@@ -34,7 +34,8 @@
         - huawei-pod2:
             os-version: 'centos7'
             <<: *master
-        - intel-pod8:
+#        - intel-pod8:
+        - huawei-pod1:
             os-version: 'trusty'
             <<: *master
         - huawei-virtual:
     scenario:
         - 'os-nosdn-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l2-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l3-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
         - 'os-onos-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
         - 'os-ocl-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
 
     jobs:
         - 'compass-{scenario}-{pod}-daily-{stream}'
 # trigger macros
 ########################
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-master-trigger'
     triggers:
         - timed: '0 3 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-master-trigger'
     triggers:
         - timed: '0 21 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-pod2-trigger'
+    name: 'compass-os-onos-nofeature-ha-huawei-pod2-master-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-pod2-trigger'
+    name: 'compass-os-ocl-nofeature-ha-huawei-pod2-master-trigger'
     triggers:
-        - timed: '0 9 * * *'
+        - timed: ''
+
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-pod1-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-huawei-pod1-master-trigger'
     triggers:
-        - timed: '0 3 * * * '
+        - timed: '0 3 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod1-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod1-master-trigger'
     triggers:
         - timed: '0 21 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod1-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod1-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-pod1-trigger'
+    name: 'compass-os-onos-nofeature-ha-huawei-pod1-master-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-pod1-trigger'
+    name: 'compass-os-ocl-nofeature-ha-huawei-pod1-master-trigger'
     triggers:
         - timed: '0 9 * * *'
+
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-intel-pod8-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-huawei-pod1-brahmaputra-trigger'
     triggers:
-        - timed: '0 3 * * *'
+        - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-intel-pod8-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod1-brahmaputra-trigger'
     triggers:
-        - timed: '0 21 * * *'
+        - timed: ''
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-intel-pod8-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod1-brahmaputra-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-intel-pod8-trigger'
+    name: 'compass-os-onos-nofeature-ha-huawei-pod1-brahmaputra-trigger'
     triggers:
-        - timed: '0 15 * * *'
+        - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-intel-pod8-trigger'
+    name: 'compass-os-ocl-nofeature-ha-huawei-pod1-brahmaputra-trigger'
     triggers:
-        - timed: '0 9 * * *'
+        - timed: ''
+
+- trigger:
+    name: 'compass-os-nosdn-nofeature-ha-intel-pod8-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l2-nofeature-ha-intel-pod8-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l3-nofeature-ha-intel-pod8-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-onos-nofeature-ha-intel-pod8-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-intel-pod8-master-trigger'
+    triggers:
+        - timed: ''
+
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-master-trigger'
     triggers:
         - timed: '0 3 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-master-trigger'
     triggers:
         - timed: '0 21 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-virtual-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-virtual-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-virtual-trigger'
+    name: 'compass-os-onos-nofeature-ha-huawei-virtual-master-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-virtual-trigger'
+    name: 'compass-os-ocl-nofeature-ha-huawei-virtual-master-trigger'
     triggers:
         - timed: '0 9 * * *'
+- trigger:
+    name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-onos-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
index 790d43b..7d09d53 100644 (file)
@@ -24,12 +24,19 @@ echo 1 > /proc/sys/vm/drop_caches
 
 export CONFDIR=$WORKSPACE/deploy/conf
 export ISO_URL=file://$BUILD_DIRECTORY/compass.iso
+
+if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]]; then
+    export NETWORK_CONF_FILE=network_ocl.yml
+else
+    export NETWORK_CONF_FILE=network.yml
+fi
+
 if [[ "$NODE_NAME" =~ "-virtual" ]]; then
-    export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/network.yml
+    export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/${NETWORK_CONF_FILE}
     export DHA_CONF=$CONFDIR/vm_environment/${DEPLOY_SCENARIO}.yml
 else
     export INSTALL_NIC=eth1
-    export NETWORK_CONF=$CONFDIR/hardware_environment/$NODE_NAME/network.yml
+    export NETWORK_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${NETWORK_CONF_FILE}
     export DHA_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${DEPLOY_SCENARIO}.yml
 fi
 
index 4898b87..920923a 100644 (file)
@@ -6,13 +6,13 @@
 
     project: 'compass4nfv'
 
+    pod: 'huawei-virtual'
+
     stream:
         - master:
-            slave_name: 'huawei-virtual1'
             branch: '{stream}'
             gs-pathname: ''
         - brahmaputra:
-            slave_name: 'huawei-virtual2'
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
 
@@ -58,8 +58,8 @@
         - compass-project-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - 'huawei-virtual-defaults'
         - '{installer}-defaults'
+        - '{pod}-defaults'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-ha'
               current-parameters: true
               same-node: true
               block: true
+        - trigger-builds:
+            - project: 'functest-compass-{pod}-suite-{stream}'
+              current-parameters: true
+              predefined-parameters:
+                FUNCTEST_SUITE_NAME=vping_userdata
+              same-node: true
+              block: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
 
 - job-template:
     name: 'compass-verify-deploy-{stream}'
index ce7be1f..4b11c4b 100644 (file)
 - builder:
     name: functest-suite
     builders:
-        - shell: |
-            #!/bin/bash
-            set -e
-            branch=${GIT_BRANCH##*/}
-            echo "Functest: run $FUNCTEST_SUITE_NAME on branch ${branch}"
-            if [[ ${branch} == *"brahmaputra"* ]]; then
-                cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME"
-            else
-                cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME"
-            fi
-            container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
-            docker exec $container_id $cmd
-
+        - shell:
+            !include-raw: ./functest-suite.sh
 
 - builder:
     name: functest-daily
     builders:
-        - shell: |
-            #!/bin/bash
-            set +e
-            branch=${GIT_BRANCH##*/}
-            [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r"
-            if [[ ${branch} == *"brahmaputra"* ]]; then
-                cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh -s ${flags}"
-            else
-                cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t all ${flags}"
-            fi
-            container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
-            docker exec $container_id $cmd
+        - shell:
+            !include-raw: ./functest-daily.sh
 
 - builder:
     name: set-functest-env
     builders:
-        - shell: |
-            #!/bin/bash
-            set -e
-            [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
-            # labconfig is used only for joid
-            labconfig=""
-            if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
-                if sudo virsh list | grep instack; then
-                    instack_mac=$(sudo virsh domiflist instack | grep default | \
-                                  grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
-                elif sudo virsh list | grep undercloud; then
-                    instack_mac=$(sudo virsh domiflist undercloud | grep default | \
-                                  grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
-                else
-                    echo "No available installer VM exists...exiting"
-                    exit 1
-                fi
-                INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'})
-                sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
-                if sudo iptables -C FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable 2> ${redirect}; then
-                    sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable
-                fi
-                if sudo iptables -C FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable 2> ${redirect}; then
-                    sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable
-                fi
-            elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then
-                # If production lab then creds may be retrieved dynamically
-                # creds are on the jumphost, always in the same folder
-                labconfig="-v $LAB_CONFIG/admin-openrc:/home/opnfv/functest/conf/openstack.creds"
-                # If dev lab, credentials may not be the default ones, just provide a path to put them into docker
-                # replace the default one by the customized one provided by jenkins config
-            fi
-            echo "Functest: Start Docker and prepare environment"
-            envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
-                -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
-                -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG}"
-            branch=${GIT_BRANCH##*/}
-            dir_result="${HOME}/opnfv/functest/results/${branch}"
-            mkdir -p ${dir_result}
-            sudo rm -rf ${dir_result}/*
-            res_volume="-v ${dir_result}:/home/opnfv/functest/results"
-            custom_params=
-            test -f ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG} && custom_params=$(cat ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG})
-
-            echo "Functest: Pulling image opnfv/functest:${DOCKER_TAG}"
-            docker pull opnfv/functest:$DOCKER_TAG >/dev/null
-
-            cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} ${custom_params} opnfv/functest:${DOCKER_TAG} /bin/bash"
-            echo "Functest: Running docker run command: ${cmd}"
-            ${cmd} >${redirect}
-            sleep 5
-            container_id=$(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | awk '{print $1}' | head -1)
-            echo "Container ID=${container_id}"
-            if [ -z ${container_id} ]; then
-                echo "Cannot find opnfv/functest container ID ${container_id}. Please check if it is existing."
-                docker ps -a
-                exit 1
-            fi
-            echo "Starting the container: docker start ${container_id}"
-            docker start ${container_id}
-            sleep 5
-            docker ps >${redirect}
-            if [ $(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | wc -l) == 0 ]; then
-                echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
-                exit 1
-            fi
-            if [[ ${branch} == *"brahmaputra"* ]]; then
-                cmd="${FUNCTEST_REPO_DIR}/docker/prepare_env.sh"
-            else
-                cmd="python ${FUNCTEST_REPO_DIR}/ci/prepare_env.py start"
-            fi
-            echo "Executing command inside the docker: ${cmd}"
-            docker exec ${container_id} ${cmd}
+        - shell:
+            !include-raw: ./set-functest-env.sh
 
 - builder:
     name: functest-store-results
 - builder:
     name: functest-cleanup
     builders:
-        - shell: |
-            #!/bin/bash
-            [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
-
-            echo "Cleaning up docker containers/images..."
-            # Remove previous running containers if exist
-            if [[ ! -z $(docker ps -a | grep opnfv/functest) ]]; then
-                echo "Removing existing opnfv/functest containers..."
-                docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm -f >${redirect}
-            fi
-
-            # Remove existing images if exist
-            if [[ ! -z $(docker images | grep opnfv/functest) ]]; then
-                echo "Docker images to remove:"
-                docker images | head -1 && docker images | grep opnfv/functest >${redirect}
-                image_tags=($(docker images | grep opnfv/functest | awk '{print $2}'))
-                for tag in "${image_tags[@]}"; do
-                    echo "Removing docker image opnfv/functest:$tag..."
-                    docker rmi opnfv/functest:$tag >/dev/null
-                done
-            fi
+        - shell:
+            !include-raw: ./functest-cleanup.sh
diff --git a/jjb/functest/functest-cleanup.sh b/jjb/functest/functest-cleanup.sh
new file mode 100755 (executable)
index 0000000..4bedfe7
--- /dev/null
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
+
+echo "Cleaning up docker containers/images..."
+# Remove previous running containers if exist
+if [[ ! -z $(docker ps -a | grep opnfv/functest) ]]; then
+    echo "Removing existing opnfv/functest containers..."
+    docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm -f >${redirect}
+fi
+
+# Remove existing images if exist
+if [[ ! -z $(docker images | grep opnfv/functest) ]]; then
+    echo "Docker images to remove:"
+    docker images | head -1 && docker images | grep opnfv/functest >${redirect}
+    image_tags=($(docker images | grep opnfv/functest | awk '{print $2}'))
+    for tag in "${image_tags[@]}"; do
+        echo "Removing docker image opnfv/functest:$tag..."
+        docker rmi opnfv/functest:$tag >/dev/null
+    done
+fi
diff --git a/jjb/functest/functest-daily.sh b/jjb/functest/functest-daily.sh
new file mode 100755 (executable)
index 0000000..5abddfd
--- /dev/null
@@ -0,0 +1,12 @@
+#!/bin/bash
+set +e
+
+branch=${GIT_BRANCH##*/}
+[[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r"
+if [[ ${branch} == *"brahmaputra"* ]]; then
+    cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh -s ${flags}"
+else
+    cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t all ${flags}"
+fi
+container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
+docker exec $container_id $cmd
diff --git a/jjb/functest/functest-suite.sh b/jjb/functest/functest-suite.sh
new file mode 100755 (executable)
index 0000000..7e9fa09
--- /dev/null
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+branch=${GIT_BRANCH##*/}
+echo "Functest: run $FUNCTEST_SUITE_NAME on branch ${branch}"
+if [[ ${branch} == *"brahmaputra"* ]]; then
+    cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME"
+else
+    cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME"
+fi
+container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
+docker exec $container_id $cmd
diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh
new file mode 100755 (executable)
index 0000000..b3be3ab
--- /dev/null
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+set -e
+[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
+# labconfig is used only for joid
+labconfig=""
+if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
+    if sudo virsh list | grep instack; then
+        instack_mac=$(sudo virsh domiflist instack | grep default | \
+                      grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
+    elif sudo virsh list | grep undercloud; then
+        instack_mac=$(sudo virsh domiflist undercloud | grep default | \
+                      grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
+    else
+        echo "No available installer VM exists...exiting"
+        exit 1
+    fi
+    INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'})
+    sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
+    if sudo iptables -C FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable 2> ${redirect}; then
+        sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable
+    fi
+    if sudo iptables -C FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable 2> ${redirect}; then
+        sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable
+    fi
+elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then
+    # If production lab then creds may be retrieved dynamically
+    # creds are on the jumphost, always in the same folder
+    labconfig="-v $LAB_CONFIG/admin-openrc:/home/opnfv/functest/conf/openstack.creds"
+    # If dev lab, credentials may not be the default ones, just provide a path to put them into docker
+    # replace the default one by the customized one provided by jenkins config
+fi
+echo "Functest: Start Docker and prepare environment"
+envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
+    -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
+    -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG}"
+branch=${GIT_BRANCH##*/}
+dir_result="${HOME}/opnfv/functest/results/${branch}"
+mkdir -p ${dir_result}
+sudo rm -rf ${dir_result}/*
+res_volume="-v ${dir_result}:/home/opnfv/functest/results"
+custom_params=
+test -f ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG} && custom_params=$(cat ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG})
+
+echo "Functest: Pulling image opnfv/functest:${DOCKER_TAG}"
+docker pull opnfv/functest:$DOCKER_TAG >/dev/null
+
+cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} ${custom_params} opnfv/functest:${DOCKER_TAG} /bin/bash"
+echo "Functest: Running docker run command: ${cmd}"
+${cmd} >${redirect}
+sleep 5
+container_id=$(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | awk '{print $1}' | head -1)
+echo "Container ID=${container_id}"
+if [ -z ${container_id} ]; then
+    echo "Cannot find opnfv/functest container ID ${container_id}. Please check if it is existing."
+    docker ps -a
+    exit 1
+fi
+echo "Starting the container: docker start ${container_id}"
+docker start ${container_id}
+sleep 5
+docker ps >${redirect}
+if [ $(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | wc -l) == 0 ]; then
+    echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
+    exit 1
+fi
+if [[ ${branch} == *"brahmaputra"* ]]; then
+    cmd="${FUNCTEST_REPO_DIR}/docker/prepare_env.sh"
+else
+    cmd="python ${FUNCTEST_REPO_DIR}/ci/prepare_env.py start"
+fi
+echo "Executing command inside the docker: ${cmd}"
+docker exec ${container_id} ${cmd}
index 1093d5f..ef47384 100644 (file)
@@ -75,10 +75,10 @@ elif [[ "$DOCKER_REPO_NAME" == "opnfv/functest" ]]; then
     cd $WORKSPACE/docker
 elif [[ "$DOCKER_REPO_NAME" == "opnfv/qtip" ]]; then
     cd $WORKSPACE/docker
-elif [[ "$DOCKER_REPO_NAME" == "opnfv/storeperf" ]]; then
+elif [[ "$DOCKER_REPO_NAME" == "opnfv/storperf" ]]; then
     cd $WORKSPACE/docker
 elif [[ "$DOCKER_REPO_NAME" == "opnfv/yardstick" ]]; then
-    cd $WORKSPACE/ci/docker/yardstick-ci
+    cd $WORKSPACE/tests/ci/docker/yardstick-ci
 else
     echo "ERROR: DOCKER_REPO_NAME parameter not valid: $DOCKER_REPO_NAME"
     exit 1
index a907d34..b7c1c0a 100644 (file)
 
     publishers:
         - email:
-            recipients: ana.cunha@ericsson.com
+            recipients: jean.gaoliang@huawei.com matthew.lijun@huawei.com
 
 ########################
 # builder macros
 - builder:
     name: yardstick-daily
     builders:
-        - shell: |
-            #!/bin/bash
-            set -e
-            [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
-
-            # labconfig is used only for joid
-            labconfig=""
-            sshkey=""
-            if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
-                instack_mac=$(sudo virsh domiflist instack | grep default | \
-                              grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
-                INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'})
-                sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
-                if [[ -n $(sudo iptables -L FORWARD |grep "REJECT"|grep "reject-with icmp-port-unreachable") ]]; then
-                    #note: this happens only in opnfv-lf-pod1
-                    sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable
-                    sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable
-                fi
-            elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then
-                # If production lab then creds may be retrieved dynamically
-                # creds are on the jumphost, always in the same folder
-                labconfig="-v $LAB_CONFIG/admin-openrc:/home/opnfv/openrc"
-                # If dev lab, credentials may not be the default ones, just provide a path to put them into docker
-                # replace the default one by the customized one provided by jenkins config
-            fi
-
-            opts="--privileged=true --rm"
-            envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
-                -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK} \
-                -e YARDSTICK_BRANCH=${GIT_BRANCH##origin/} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO}"
-
-            # Pull the latest image
-            docker pull opnfv/yardstick:$DOCKER_TAG >$redirect
-
-            # Run docker
-            cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick \
-                run_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SUITE_NAME}"
-            echo "Yardstick: Running docker cmd: ${cmd}"
-            ${cmd}
-
-            echo "Yardstick: done!"
+        - shell:
+            !include-raw: ./yardstick-daily.sh
 
 - builder:
     name: yardstick-vtcdaily
     builders:
-        - shell: |
-            #!/bin/bash
-            set -e
-            [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
-
-            cd $WORKSPACE
-            ./ci/apexlake-verify
+        - shell:
+            !include-raw: ./yardstick-vtcdaily.sh
 
 - builder:
     name: yardstick-fetch-os-creds
 - builder:
     name: yardstick-cleanup
     builders:
-        - shell: |
-            #!/bin/bash
-            [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
-
-            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 -a | grep opnfv/yardstick | awk '{print $1}' | xargs docker rm -f >$redirect
-
-            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 >$redirect
-
-                done
-            fi
+        - shell:
+            !include-raw: ./yardstick-cleanup.sh
 ########################
 # parameter macros
 ########################
diff --git a/jjb/yardstick/yardstick-cleanup.sh b/jjb/yardstick/yardstick-cleanup.sh
new file mode 100755 (executable)
index 0000000..4e6f7d6
--- /dev/null
@@ -0,0 +1,22 @@
+#!/bin/bash
+[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
+
+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 -a | grep opnfv/yardstick | awk '{print $1}' | xargs docker rm -f >$redirect
+
+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 >$redirect
+
+    done
+fi
diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh
new file mode 100755 (executable)
index 0000000..3ad6b7c
--- /dev/null
@@ -0,0 +1,40 @@
+#!/bin/bash
+set -e
+[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
+
+# labconfig is used only for joid
+labconfig=""
+sshkey=""
+if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
+    instack_mac=$(sudo virsh domiflist instack | grep default | \
+                  grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
+    INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'})
+    sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
+    if [[ -n $(sudo iptables -L FORWARD |grep "REJECT"|grep "reject-with icmp-port-unreachable") ]]; then
+        #note: this happens only in opnfv-lf-pod1
+        sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable
+        sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable
+    fi
+elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then
+    # If production lab then creds may be retrieved dynamically
+    # creds are on the jumphost, always in the same folder
+    labconfig="-v $LAB_CONFIG/admin-openrc:/home/opnfv/openrc"
+    # If dev lab, credentials may not be the default ones, just provide a path to put them into docker
+    # replace the default one by the customized one provided by jenkins config
+fi
+
+opts="--privileged=true --rm"
+envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
+    -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK} \
+    -e YARDSTICK_BRANCH=${GIT_BRANCH##origin/} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO}"
+
+# Pull the latest image
+docker pull opnfv/yardstick:$DOCKER_TAG >$redirect
+
+# Run docker
+cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick \
+    run_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SUITE_NAME}"
+echo "Yardstick: Running docker cmd: ${cmd}"
+${cmd}
+
+echo "Yardstick: done!"
index f06bf70..c6f3173 100644 (file)
             # install python packages
             easy_install -U setuptools
             easy_install -U pip
-            pip install -r ci/requirements.txt
+            pip install -r tests/ci/requirements.txt
             pip install -e .
 
             # unit tests
diff --git a/jjb/yardstick/yardstick-vtcdaily.sh b/jjb/yardstick/yardstick-vtcdaily.sh
new file mode 100755 (executable)
index 0000000..737d680
--- /dev/null
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
+
+cd $WORKSPACE
+./tests/ci/apexlake-verify
index d73274c..2798db6 100644 (file)
@@ -6,6 +6,7 @@ Install:
 ```
 pip install testtools
 pip install discover
+pip install futures
 ```
 
 ## How to: