X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbottlenecks%2Fbottlenecks-ci-jobs.yml;h=2779e316b3d81b48cb1e417fdd4e366d1d490e82;hb=5a681846dd3c0ef0dd290384bbbcfe678683d923;hp=1c8d048afaf715b17d199efd36763d40fa706efe;hpb=6c11c324b6edcea601ec38b990ae21b0c7e087d6;p=releng.git diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml index 1c8d048af..2779e316b 100644 --- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml @@ -12,51 +12,68 @@ master: &master stream: master branch: '{stream}' + #This is used for common project file storage gs-pathname: '' - brahmaputra: &brahmaputra - stream: brahmaputra + #This is used for different test suite dependent packages storage + gs-packagepath: '/{suite}' + #docker tag used for version control + docker-tag: 'latest' + danube: &danube + stream: danube branch: 'stable/{stream}' - gs-pathname: '{stream}' + gs-pathname: '/{stream}' + gs-packagepath: '/{stream}/{suite}' + 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' + <<: *danube + - virtual: + slave-label: compass-virtual + installer: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *danube + +#-------------------------------- +# None-CI PODs #-------------------------------- + # - orange-pod2: + # slave-label: '{pod}' + # installer: joid + # auto-trigger-name: 'daily-trigger-disabled' + # <<: *danube + # - orange-pod2: + # slave-label: '{pod}' + # installer: joid + # auto-trigger-name: 'daily-trigger-disabled' + # <<: *master +#-------------------------------------------- suite: - 'rubbos' - 'vstf' + - 'posca_stress_traffic' + - 'posca_stress_ping' jobs: - 'bottlenecks-{installer}-{suite}-{pod}-daily-{stream}' @@ -67,35 +84,49 @@ - 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' + branch: '{branch}' + - '{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: '' + default: 'false' description: "Gerrit refspec for debug." + - string: + name: SUITE_NAME + default: '{suite}' + description: "test suite name." + - string: + name: DOCKER_TAG + default: '{docker-tag}' + description: "docker image tag used for version control" scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' + - git-scm builders: - - shell: | - echo "bottlenecks: this builder should be changed" - # TO DO, by now the CI job of Bottlenecks has been changed - #- 'bottlenecks-fetch-os-creds' - #- 'bottlenecks-run-{suite}' + - 'bottlenecks-env-cleanup' + - 'bottlenecks-run-suite' publishers: - email: @@ -104,99 +135,36 @@ ######################## # builder macros ######################## -#- builder: -# name: bottlenecks-fetch-os-creds -# builders: -# - shell: -# !include-raw ../../utils/fetch_os_creds.sh - -#- builder: -# name: bottlenecks-run-rubbos -# builders: -# - shell: | -# #!/bin/bash -# set -o errexit -# -# echo "Bottlenecks: rubbos running now..." -# cd $WORKSPACE -# ./ci/run.sh $GERRIT_REFSPEC_DEBUG - -#- builder: -# name: bottlenecks-run-vstf -# builders: -# - shell: | -# #!/bin/bash -# set -o errexit - -# echo "Bottlenecks: vstf running now..." -# cd $WORKSPACE -# ./ci/vstf_run.sh $GERRIT_REFSPEC_DEBUG - -######################## -# 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' +- builder: + name: bottlenecks-env-cleanup + builders: + - shell: + !include-raw: ./bottlenecks-cleanup.sh -- 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' +- builder: + name: bottlenecks-run-suite + builders: + - shell: + !include-raw: ./bottlenecks-run-suite.sh -- 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 macros +#################### - 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: @@ -204,5 +172,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'