X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Ffunctest%2Ffunctest.yml;h=96b770ba238b8cefbafd9b7816238706f1139959;hb=2141a17cadce1d6d451f501d4038fcacb7b52f8f;hp=6268f27d2bd9648b8d7dc023fae26f9a55fc0eea;hpb=2b1dda7443ae1f917542781444c25f92317471a4;p=releng.git diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index 6268f27d2..96b770ba2 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -9,18 +9,19 @@ node: 'opnfv-jump-2' installer_type: 'fuel' installer_ip: '10.20.0.2' - functest_repo_dir: '/home/opnfv/repos/functest' - foreman: node: 'opnfv-jump-2' installer_type: 'foreman' installer_ip: '172.30.10.73' - functest_repo_dir: '/home/opnfv/repos/functest' + - apex: + node: 'opnfv-jump-1' + installer_type: 'apex' + installer_ip: '192.168.X.X' pod: - orange-build: node: 'orange-build' installer_type: 'foreman' installer_ip: '172.30.10.73' - functest_repo_dir: '/home/opnfv/repos/functest' jobs: - 'set-functest-env-{pod}' @@ -56,8 +57,6 @@ - job-template: name: set-functest-env-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -69,13 +68,9 @@ builders: - 'set-functest-env' - - - job-template: name: clean-functest-env-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -87,12 +82,9 @@ builders: - 'functest-cleanup' - - job-template: name: set-functest-env-{installer}-{stream} - project-type: freestyle - node: '{node}' logrotate: @@ -104,12 +96,9 @@ builders: - 'set-functest-env' - - job-template: name: clean-functest-env-{installer}-{stream} - project-type: freestyle - node: '{node}' logrotate: @@ -124,8 +113,6 @@ - job-template: name: functest-openstack-bench-test-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -137,12 +124,9 @@ builders: - 'functest-rally-bench' - - job-template: name: functest-openstack-tempest-smoke-test-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -157,8 +141,6 @@ - job-template: name: functest-odl-test-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -171,12 +153,9 @@ - shell: | - 'functest-odl' - - job-template: name: functest-vping-test-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -188,17 +167,15 @@ builders: - 'functest-vping' - - job-template: name: functest-{pod} - project-type: freestyle - node: '{pod}' parameters: - project-parameter: project: '{project}' + - functest-parameter - string: name: INSTALLER_TYPE default: '{installer_type}' @@ -207,10 +184,6 @@ name: INSTALLER_IP default: '{installer_ip}' description: "Installer IP." - - string: - name: FUNCTEST_REPO_DIR - default: '{functest_repo_dir}' - description: "Directory where the root functest repo is cloned in the docker." - '{pod}' scm: @@ -226,20 +199,20 @@ artifactNumToKeep: -1 builders: + - 'functest-cleanup' + - 'set-functest-env' - 'functest-all' - 'functest-store-results' - - 'functest-cleanup' - job-template: name: functest-{installer}-{stream} - project-type: freestyle - node: '{node}' parameters: - project-parameter: project: '{project}' + - functest-parameter - string: name: INSTALLER_TYPE default: '{installer_type}' @@ -248,10 +221,6 @@ name: INSTALLER_IP default: '{installer_ip}' description: "Installer IP." - - string: - name: FUNCTEST_REPO_DIR - default: '{functest_repo_dir}' - description: "Directory where the root functest repo is cloned in the docker." - string: name: GIT_BASE default: ssh://gerrit.opnfv.org:29418/$PROJECT @@ -270,20 +239,20 @@ artifactNumToKeep: -1 builders: + - 'functest-cleanup' + - 'set-functest-env' - 'functest-all' - 'functest-store-results' - - 'functest-cleanup' - job-template: name: functest-vims-{installer}-{stream} - project-type: freestyle - node: '{node}' parameters: - project-parameter: project: '{project}' + - functest-parameter - string: name: INSTALLER_TYPE default: '{installer_type}' @@ -292,10 +261,6 @@ name: INSTALLER_IP default: '{installer_ip}' description: "Installer IP." - - string: - name: FUNCTEST_REPO_DIR - default: '{functest_repo_dir}' - description: "Directory where the root functest repo is cloned in the docker." - string: name: GIT_BASE default: ssh://gerrit.opnfv.org:29418/$PROJECT @@ -319,15 +284,12 @@ - job-template: name: 'functest-daily-{stream}' - node: master - # Job template for daily builders # # Required Variables: # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -348,10 +310,6 @@ refspec: '' branch: '{stream}' - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - triggers: - 'functest-{stream}' @@ -368,10 +326,6 @@ - job-template: name: 'functest-verify-{stream}' - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -389,10 +343,6 @@ refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - triggers: - gerrit: trigger-on: @@ -419,14 +369,10 @@ - job-template: name: 'functest-merge-{stream}' - node: master - # builder-merge job to run JJB update # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -445,10 +391,6 @@ refspec: '' choosing-strategy: 'default' - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - triggers: - gerrit: trigger-on: @@ -476,6 +418,10 @@ name: GS_PATHNAME default: '{gs-pathname}' description: "Version directory where the opnfv documents will be stored in gs repository" + - string: + name: FUNCTEST_REPO_DIR + default: "/home/opnfv/repos/functest" + description: "Directory where the Functest repository is cloned" - parameter: name: orange-build @@ -524,19 +470,10 @@ #!/bin/bash set +e - # Remove any docker containers leftovers - $ docker ps | grep opnfv/functest | awk '{print $1}' | xargs docker stop &>/dev/null - $ docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm &>/dev/null - $ docker images | grep opnfv/functest | awk '{print $3}' | xargs docker rmi &>/dev/null - - # Pull and store fresh image from Dockerhub - $ docker pull opnfv/functest - - # Run Docker and Functest tests - cmd="${FUNCTEST_REPO_DIR}/docker/start.sh" - docker run -t -e "INSTALLER_TYPE=${INSTALLER_TYPE}" \ - -e "INSTALLER_IP=${INSTALLER_IP}" opnfv/functest $cmd - + echo "Functest: running all the tests" + cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh" + container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) + docker exec $container_id $cmd - builder: name: set-functest-env @@ -544,12 +481,35 @@ - shell: | #!/bin/bash set +e - - echo "Functest: spawn Docker and run Functest suite" - cmd="${FUNCTEST_REPO_DIR}/docker/start.sh" - docker run -t -e "INSTALLER_TYPE=${INSTALLER_TYPE}" \ - -e "INSTALLER_IP=${INSTALLER_IP}" opnfv/functest $cmd - + if [[ ${INSTALLER_TYPE} == 'apex' ]]; then + INSTALLER_IP=$(cat instack /var/lib/libvirt/dnsmasq/default.leases \ + |sed 's/.*192/192/g' | sed 's/\ in.*//g') + fi + echo "Functest: Start Docker and prepare environment" + envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}" + docker pull opnfv/functest:latest_stable + echo "Functest: Running docker run command: docker run -i -e $envs opnfv/functest /bin/bash &" + docker run -i -e $envs opnfv/functest /bin/bash & + docker ps -a + sleep 5 + container_id=$(docker ps -a | grep opnfv/functest | 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 | 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: functest-vping @@ -559,10 +519,9 @@ set +e echo "Functest: run vPing" - cmd="python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing.py \ - --debug ${FUNCTEST_REPO_DIR}/ -r" - docker run -t -e "INSTALLER_TYPE=${INSTALLER_TYPE}" \ - -e "INSTALLER_IP=${INSTALLER_IP}" opnfv/functest $cmd + cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test vping" + container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) + docker exec $container_id $cmd - builder: name: functest-odl @@ -572,9 +531,9 @@ set +e echo "Functest: run ODL suite" - cmd="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/CI/start_tests.sh" - docker run -t -e "INSTALLER_TYPE=${INSTALLER_TYPE}" \ - -e "INSTALLER_IP=${INSTALLER_IP}" opnfv/functest $cmd + cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test odl" + container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) + docker exec $container_id $cmd - builder: name: functest-tempest-smoke @@ -585,11 +544,9 @@ # tempest echo "Functest: run Tempest suite" - cmd="rally verify start smoke; rally verify list;" - docker run -t -e "INSTALLER_TYPE=${INSTALLER_TYPE}" \ - -e "INSTALLER_IP=${INSTALLER_IP}" opnfv/functest $cmd - - + cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test tempest" + container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) + docker exec $container_id $cmd - builder: name: functest-rally-bench @@ -599,11 +556,9 @@ set +e echo "Functest: run Functest Rally Bench suites" - cmd="python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_rally.py \ - --debug ${FUNCTEST_REPO_DIR}/ all" - docker run -t -e "INSTALLER_TYPE=${INSTALLER_TYPE}" \ - -e "INSTALLER_IP=${INSTALLER_IP}" opnfv/functest $cmd - + cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test rally" + container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) + docker exec $container_id $cmd - builder: name: functest-vims @@ -611,12 +566,11 @@ - shell: | #!/bin/bash set +e - cmd="python ${FUNCTEST_REPO_DIR}/testcases/vIMS/CI/vIMS.py \ - --debug ${FUNCTEST_REPO_DIR}/" - docker run -t -e "INSTALLER_TYPE=${INSTALLER_TYPE}" \ - -e "INSTALLER_IP=${INSTALLER_IP}" opnfv/functest $cmd - + echo "Functest: run Functest vIMS test" + cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test vims" + container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) + docker exec $container_id $cmd - builder: name: functest-store-results @@ -629,10 +583,23 @@ builders: - shell: | #!/bin/bash - set +e - - # cleanup: remove any docker containers leftovers - $ docker ps | grep opnfv/functest | awk '{print $1}' | xargs docker stop &>/dev/null - $ docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm &>/dev/null - $ docker images | grep opnfv/functest | awk '{print $3}' | xargs docker rmi &>/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 | grep opnfv/functest | awk '{print $1}' | xargs docker stop + docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm + 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 + done + fi