X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-ci-jobs.yml;h=1ccaa1b1052ae2793f6fda25a4ecab093d6515a8;hb=refs%2Fchanges%2F81%2F14681%2F1;hp=ba5cfec83c7a53175eb86db271d3be0af9341fad;hpb=470566662dc0a1abe800cc5d09c8a2d0d3d14f6c;p=releng.git

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index ba5cfec83..1ccaa1b10 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -18,76 +18,123 @@
         stream: brahmaputra
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
-        docker-tag: 'brahmaputra.1.0'
+        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-1:
-            installer: apex
-            <<: *brahmaputra
-        - intel-pod5:
-            installer: joid
-            <<: *brahmaputra
-        - orange-pod2:
-            installer: joid
-            <<: *brahmaputra
-        - huawei-us-deploy-bare-1:
-            installer: compass
-            <<: *brahmaputra
-        - ericsson-pod1:
+        - baremetal:
+            slave-label: fuel-baremetal
             installer: fuel
-            <<: *brahmaputra
-        - ericsson-pod2:
+            <<: *master
+        - virtual:
+            slave-label: fuel-virtual
             installer: fuel
-            <<: *brahmaputra
-        - opnfv-jump-2:
+            <<: *master
+        - baremetal:
+            slave-label: fuel-baremetal
             installer: fuel
             <<: *brahmaputra
         - virtual:
+            slave-label: fuel-virtual
             installer: fuel
             <<: *brahmaputra
-        - huawei-virtual:
+
+# just in case if things go wrong
+        - lf-pod2:
+            slave-label: fuel-baremetal
+            installer: fuel
+            <<: *master
+#--------------------------------
+#    Installers not using labels
+#            CI PODs
+# This section should only contain the installers
+# that have not been switched using labels for slaves
+#--------------------------------
+        - intel-pod7:
+            slave-label: '{pod}'
+            installer: apex
+            <<: *master
+        - lf-pod1:
+            slave-label: '{pod}'
+            installer: apex
+            <<: *brahmaputra
+        - intel-pod8:
+            slave-label: '{pod}'
+            installer: compass
+            <<: *master
+        - huawei-pod1:
+            slave-label: '{pod}'
             installer: compass
             <<: *brahmaputra
-        - virtual:
+        - intel-pod6:
+            slave-label: '{pod}'
+            installer: joid
+            <<: *master
+        - intel-pod5:
+            slave-label: '{pod}'
             installer: joid
             <<: *brahmaputra
 #--------------------------------
-#        master
+#        None-CI PODs
 #--------------------------------
-        - opnfv-jump-2:
+        - orange-pod2:
+            slave-label: '{pod}'
+            installer: joid
+            <<: *brahmaputra
+        - orange-pod5:
+            slave-label: '{pod}'
             installer: fuel
             <<: *master
-        - intel-pod6:
+        - orange-pod2:
+            slave-label: '{pod}'
             installer: joid
             <<: *master
-        - intel-pod8:
+        - huawei-virtual:
+            slave-label: '{pod}'
+            installer: compass
+            <<: *master
+        - virtual:
+            slave-label: '{pod}'
+            installer: joid
+            <<: *master
+        - huawei-pod2:
+            slave-label: '{pod}'
+            installer: compass
+            <<: *master
+        - huawei-pod1:
+            slave-label: '{pod}'
             installer: compass
             <<: *master
-        - opnfv-jump-1:
+        - nokia-pod1:
+            slave-label: '{pod}'
             installer: apex
             <<: *master
-        - ericsson-pod1:
+        - arm-pod1:
+            slave-label: '{pod}'
             installer: fuel
             <<: *master
-        - orange-test1:
+        - zte-pod1:
+            slave-label: '{pod}'
             installer: fuel
             <<: *master
-        - orange-pod2:
-            installer: joid
-            <<: *master
-        - virtual:
+        - arm-pod1:
+            slave-label: '{pod}'
             installer: fuel
-            <<: *master
+            <<: *brahmaputra
         - huawei-virtual:
+            slave-label: '{pod}'
             installer: compass
-            <<: *master
+            <<: *brahmaputra
         - virtual:
+            slave-label: '{pod}'
             installer: joid
-            <<: *master
+            <<: *brahmaputra
 #--------------------------------
 
     testsuite:
@@ -120,7 +167,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - '{pod}-defaults'
+        - '{slave-label}-defaults'
         - '{installer}-defaults'
         - 'functest-{testsuite}-parameter'
         - string:
@@ -166,7 +213,8 @@
                 - 'promise'
                 - 'doctor'
                 - 'vims'
-                - 'vping'
+                - 'vping_userdata'
+                - 'vping_ssh'
 - parameter:
     name: functest-parameter
     parameters:
@@ -184,7 +232,7 @@
             description: "Push the results of all the tests to the resultDB"
         - string:
             name: CI_DEBUG
-            default: 'false'
+            default: 'true'
             description: "Show debug output information"
 ########################
 # trigger macros
@@ -202,95 +250,34 @@
     builders:
         - 'functest-cleanup'
         - 'set-functest-env'
-        - 'functest-all'
+        - 'functest-daily'
         - 'functest-store-results'
 
 - builder:
     name: functest-suite-builder
     builders:
-        - shell: |
-            #!/bin/bash
-            set +e
-            flag=""
-            if [ "${PUSH_RESULTS_TO_DB}" == "true" ]; then
-                flag="-r"
-            fi
-            echo "Functest: run $FUNCTEST_SUITE_NAME"
-            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME ${flag}"
-            container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
-            docker exec $container_id $cmd
+        - 'functest-cleanup'
+        - 'set-functest-env'
+        - 'functest-suite'
+
 
 - builder:
-    name: functest-all
+    name: functest-suite
     builders:
-        - shell: |
-            #!/bin/bash
-            set +e
-            flag=""
-            if [ "${PUSH_RESULTS_TO_DB}" == "true" ]; then
-                flag="-r"
-            fi
-            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh ${flag}"
-            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: set-functest-env
+    name: functest-daily
     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
-                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"
-                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
-            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"
+        - shell:
+            !include-raw: ./functest-daily.sh
 
-            docker pull opnfv/functest:$DOCKER_TAG >$redirect
-            cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest /bin/bash"
-            echo "Functest: Running docker run command: ${cmd}"
-            ${cmd}
-            docker ps -a
-            sleep 5
-            container_id=$(docker ps | grep 'opnfv/functest:latest' | 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
-            if [ $(docker ps | grep 'opnfv/functest:latest' | wc -l) == 0 ]; then
-                echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
-                exit 1
-            fi
-            cmd="${FUNCTEST_REPO_DIR}/docker/prepare_env.sh"
-            echo "Executing command inside the docker: ${cmd}"
-            docker exec ${container_id} ${cmd}
+- builder:
+    name: set-functest-env
+    builders:
+        - shell:
+            !include-raw: ./set-functest-env.sh
 
 - builder:
     name: functest-store-results
@@ -301,24 +288,5 @@
 - 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
-                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 >$redirect
-                done
-            fi
+        - shell:
+            !include-raw: ./functest-cleanup.sh