diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 51 | ||||
| -rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 110 | ||||
| -rw-r--r-- | jjb/opnfv/installer-params.yml | 20 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 57 |
4 files changed, 118 insertions, 120 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 44221431d..f844b1631 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -20,15 +20,19 @@ #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- -# Current Mapping -#-------------------------------- -# everything runs against master branch +# brahmaputra #-------------------------------- pod: + - intel-pod5: + installer: joid + <<: *brahmaputra +#-------------------------------- +# master +#-------------------------------- - huawei-us-deploy-bare-1: installer: compass <<: *master - - intel-pod5: + - intel-pod6: installer: joid <<: *master - intel-us-deploy-virtual-2: @@ -50,45 +54,6 @@ installer: joid <<: *master #-------------------------------- -# Milestone E Mapping -# !!!DO NOT ENABLE!!! -#-------------------------------- -# brahmaputra -#-------------------------------- -# - huawei-us-deploy-bare-1: -# installer: compass -# <<: *brahmaputra -# - intel-pod5: -# installer: joid -# <<: *brahmaputra -# - opnfv-jump-1: -# installer: apex -# <<: *brahmaputra -# - opnfv-jump-2: -# installer: fuel -# <<: *brahmaputra -#-------------------------------- -# master -#-------------------------------- -# - ericsson-pod2: -# installer: fuel -# <<: *master -# - intelpod2-jumphost: -# installer: apex -# <<: *master -# - intel-pod6: -# installer: joid -# <<: *master -# - intel-pod8: -# installer: compass -# <<: *master -# - orange-test1: -# installer: fuel -# <<: *master -# - orange-pod2: -# installer: joid -# <<: *master -#-------------------------------- testsuite: - 'daily' diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index af81aacb2..e939af8df 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -23,42 +23,30 @@ #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- -# Current Mapping -#-------------------------------- -# everything runs against master branch +# brahmaputra #-------------------------------- pod: - intel-pod5: - <<: *master - - orange-pod2: - <<: *master -#-------------------------------- -# Milestone E Mapping -# !!!DO NOT ENABLE!!! -#-------------------------------- -# brahmaputra -#-------------------------------- -# - intel-pod5: -# <<: *brahmaputra + <<: *brahmaputra #-------------------------------- # master #-------------------------------- -# - intel-pod6: -# <<: *master -# - orange-pod2: -# <<: *master + - intel-pod6: + <<: *master + - orange-pod2: + <<: *master #-------------------------------- - # please check the triggers before enabling any of the controllers!!! sdn-controller: - - 'nosdn': - disabled: true - 'odl': disabled: false - - 'onos': - disabled: true - - 'opencontrail': - disabled: true +# commented out below controllers to get Arno scenario settled first +# - 'nosdn': +# disabled: true +# - 'onos': +# disabled: true +# - 'opencontrail': +# disabled: true jobs: - 'joid-{sdn-controller}-{pod}-daily-{stream}' @@ -78,10 +66,10 @@ wrappers: - build-name: - name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Feature: $OPNFV_FEATURE' + name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Scenario: $DEPLOY_SCENARIO' triggers: - - 'joid-{pod}-trigger' + - 'joid-{pod}-{sdn-controller}-trigger' parameters: - project-parameter: @@ -92,7 +80,7 @@ name: SDN_CONTROLLER default: '{sdn-controller}' - string: - name: OPNFV_FEATURE + name: DEPLOY_SCENARIO default: 'none' scm: @@ -115,7 +103,7 @@ wrappers: - build-name: - name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Feature: $OPNFV_FEATURE' + name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Scenario: $DEPLOY_SCENARIO' parameters: - project-parameter: @@ -155,6 +143,40 @@ - name: 'functest-joid-{pod}-daily-{stream}' current-parameters: true kill-phase-on: NEVER + - multijob: + name: yardstick + condition: COMPLETED + projects: + - name: 'yardstick-joid-{pod}-daily-{stream}' + current-parameters: true + kill-phase-on: NEVER +# intel-pod6 is CI POD so full CI will run on it +# deploy, functest, yardstick +- builder: + name: joid-multijob-intel-pod6-builder + builders: + - multijob: + name: deploy + condition: SUCCESSFUL + projects: + - name: 'joid-deploy-{pod}-daily-{stream}' + current-parameters: true + git-revision: true + kill-phase-on: FAILURE + - multijob: + name: functest + condition: COMPLETED + projects: + - name: 'functest-joid-{pod}-daily-{stream}' + current-parameters: true + kill-phase-on: NEVER + - multijob: + name: yardstick + condition: COMPLETED + projects: + - name: 'yardstick-joid-{pod}-daily-{stream}' + current-parameters: true + kill-phase-on: NEVER # yardstick placeholder # - multijob: # name: yardstick @@ -193,7 +215,6 @@ - shell: | #!/bin/bash echo "Running $INSTALLER_TYPE with controller $SDN_CONTROLLER" - echo "Please note that this is a quick try to see how joid deployment works" echo echo "Executing clean.sh" cd $WORKSPACE/ci @@ -206,6 +227,23 @@ ./deploy.sh -o liberty -s $SDN_CONTROLLER -t ha -l intelpod5 - builder: + name: intel-pod6-builder + builders: + - shell: | + #!/bin/bash + echo "Running $INSTALLER_TYPE with controller $SDN_CONTROLLER" + echo + echo "Executing clean.sh" + cd $WORKSPACE/ci + ./clean.sh + echo + echo "Executing 02-maasdeploy.sh intelpod6" + ./02-maasdeploy.sh intelpod6 + echo + echo "Executing deploy.sh -o liberty -s $SDN_CONTROLLER -t ha -l intelpod6" + ./deploy.sh -o liberty -s $SDN_CONTROLLER -t ha -l intelpod6 + +- builder: name: orange-pod2-builder builders: - shell: | @@ -222,12 +260,14 @@ # trigger macros ######################## - trigger: - name: 'joid-intel-pod5-trigger' + name: 'joid-intel-pod5-odl-trigger' + triggers: + - timed: '0 3 * * *' +- trigger: + name: 'joid-intel-pod6-odl-trigger' triggers: - timed: '0 3 * * *' -# timer trigger is commented out since we do not know if the automatic runs should -# be enabled on orange-pod2 - trigger: - name: 'joid-orange-pod2-trigger' + name: 'joid-orange-pod2-odl-trigger' triggers: - - timed: '#0 3 * * *' + - timed: '' diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index 8a189ece8..3e5c0ffac 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -14,9 +14,9 @@ default: 'nosdn' description: 'SDN Controller to use' - string: - name: OPNFV_FEATURE + name: DEPLOY_SCENARIO default: 'none' - description: 'OPNFV Feature to activate' + description: 'Scenario to deploy and test' - string: name: EXTERNAL_NETWORK default: 'net04_ext' @@ -38,9 +38,9 @@ default: 'nosdn' description: 'SDN Controller to use' - string: - name: OPNFV_FEATURE + name: DEPLOY_SCENARIO default: 'none' - description: 'OPNFV Feature to activate' + description: 'Scenario to deploy and test' - string: name: EXTERNAL_NETWORK default: 'ext-net' @@ -62,13 +62,9 @@ default: 'nosdn' description: 'SDN Controller to use' - string: - name: OPNFV_FEATURE - default: 'none' - description: 'OPNFV Feature to activate' - - string: name: DEPLOY_SCENARIO - default: 'test' - description: 'OPNFV Deployment Scenario' + default: 'none' + description: 'Scenario to deploy and test' - string: name: EXTERNAL_NETWORK default: 'net04_ext' @@ -90,9 +86,9 @@ default: 'nosdn' description: 'SDN Controller to use' - string: - name: OPNFV_FEATURE + name: DEPLOY_SCENARIO default: 'none' - description: 'OPNFV Feature to activate' + description: 'Scenario to deploy and test' - string: name: HA_MODE default: 'ha' diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 484f1a20b..fb05b3336 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -20,11 +20,15 @@ #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- -# Current Mapping -#-------------------------------- -# everything runs against master branch +# brahmaputra #-------------------------------- pod: + - intel-pod5: + installer: joid + <<: *brahmaputra +#-------------------------------- +# master +#-------------------------------- - opnfv-jump-2: installer: fuel <<: *master @@ -34,37 +38,13 @@ - ericsson-pod2: installer: fuel <<: *master + - intel-pod6: + installer: joid + <<: *master - huawei-us-deploy-bare-1: installer: compass <<: *master #-------------------------------- -# Milestone E Mapping -# !!!DO NOT ENABLE!!! -#-------------------------------- -# brahmaputra -#-------------------------------- -# - huawei-us-deploy-bare-1: -# installer: compass -# <<: *brahmaputra -# - intel-pod5: -# installer: joid -# <<: *brahmaputra -# - opnfv-jump-1: -# installer: apex -# <<: *brahmaputra -# - opnfv-jump-2: -# installer: fuel -# <<: *brahmaputra -#-------------------------------- -# master -#-------------------------------- -# - ericsson-pod1: -# installer: fuel -# <<: *master -# - ericsson-pod2: -# installer: fuel -# <<: *master -#-------------------------------- loop: - daily @@ -132,6 +112,7 @@ -e "INSTALLER_IP=${INSTALLER_IP}" \ -e "POD_NAME=${NODE_NAME}" \ -e "EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" \ + -e "YARDSTICK_BRANCH=${GERRIT_BRANCH}" \ opnfv/yardstick \ run_tests.sh $YARDSTICK_DB_BACKEND \ $YARDSTICK_SUITE_NAME @@ -173,6 +154,22 @@ # parameter macros ######################## - parameter: + name: 'yardstick-params-intel-pod5' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '' + description: 'Arguments to use in order to choose the backend DB' + +- parameter: + name: 'yardstick-params-intel-pod6' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '' + description: 'Arguments to use in order to choose the backend DB' + +- parameter: name: 'yardstick-params-ericsson-pod1' parameters: - string: |