X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbottlenecks%2Fbottlenecks-ci-jobs.yml;h=7f2e6bf8a036a924a9da0d7bb5e731e18d62c61b;hb=31816f33014bf05a81ca2301a634c7376927876e;hp=bfc8c131ec2de686ec12383a26b70e2434ac23cf;hpb=f976f5e87fe0058f85bbc6dee3b3cad800893756;p=releng.git diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml index bfc8c131e..7f2e6bf8a 100644 --- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml @@ -18,49 +18,57 @@ gs-packagepath: '/{suite}' #docker tag used for version control docker-tag: 'latest' - brahmaputra: &brahmaputra - stream: brahmaputra + colorado: &colorado + stream: colorado 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 - <<: *brahmaputra - - huawei-us-deploy-bare-1: +#compass CI PODs + - baremetal: + slave-label: compass-baremetal installer: compass - <<: *brahmaputra -#-------------------------------- -# master -#-------------------------------- - - ericsson-pod1: - installer: fuel - <<: *master - - ericsson-pod2: - installer: fuel - <<: *master - - intel-pod6: - installer: joid + auto-trigger-name: 'daily-trigger-disabled' <<: *master - - intel-pod8: + - virtual: + slave-label: compass-virtual installer: compass + auto-trigger-name: 'daily-trigger-disabled' <<: *master - - zte-build-1: - installer: fuel - <<: *master - - orange-pod2: - installer: joid - <<: *master + - baremetal: + slave-label: compass-baremetal + installer: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *colorado + - virtual: + slave-label: compass-virtual + installer: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *colorado + #-------------------------------- +# None-CI PODs +#-------------------------------- + # - orange-pod2: + # slave-label: '{pod}' + # installer: joid + # auto-trigger-name: 'daily-trigger-disabled' + # <<: *colorado + # - orange-pod2: + # slave-label: '{pod}' + # installer: joid + # auto-trigger-name: 'daily-trigger-disabled' + # <<: *master +#-------------------------------------------- suite: - 'rubbos' - 'vstf' @@ -74,18 +82,22 @@ - 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" @@ -114,7 +126,6 @@ builders: - 'bottlenecks-env-cleanup' - - 'bottlenecks-fetch-os-creds' - 'bottlenecks-run-suite' publishers: @@ -124,12 +135,6 @@ ######################## # builder macros ######################## -- builder: - name: bottlenecks-fetch-os-creds - builders: - - shell: - !include-raw ../../utils/fetch_os_creds.sh - - builder: name: bottlenecks-env-cleanup builders: @@ -162,88 +167,55 @@ 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}" + 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}" - cmd="sudo docker run ${opts} ${envs} opnfv/bottlenecks ${run_testsuite} >${redirect}" - echo "Bottlenecks: docker cmd running: ${cmd}" - ${cmd} + 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' - 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-huawei-us-deploy-bare-1' + 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-zte-build-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: @@ -251,5 +223,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'