diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yml | 256 | ||||
| -rw-r--r-- | jjb/global/releng-macros.yml | 2 | ||||
| -rw-r--r-- | jjb/pharos/pharos.yml | 16 | ||||
| -rwxr-xr-x | jjb/xci/bifrost-verify.sh | 2 | ||||
| -rwxr-xr-x | jjb/xci/xci-start-new-vm.sh | 2 |
5 files changed, 233 insertions, 45 deletions
diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml index 099d01a59..0f1ac351d 100644 --- a/jjb/functest/functest-daily-jobs.yml +++ b/jjb/functest/functest-daily-jobs.yml @@ -193,22 +193,107 @@ # <<: *master # ------------------------------- - testsuite: - - 'suite': - job-timeout: 60 - - 'daily': - job-timeout: 300 - - 'arm-daily': - job-timeout: 300 + functest-tier: + - 'healthcheck': + job-timeout: 20 + - 'smoke': + job-timeout: 180 + - 'components': + job-timeout: 240 + - 'vnf': + job-timeout: 240 - jobs: - - 'functest-{installer}-{pod}-{testsuite}-{stream}' + features-suite: + - 'doctor-notification' + - 'promise' + - 'bgpvpn' + - 'functest-odl-sfc' + - 'domino-multinode' + - 'fds' + - 'barometercollectd' + + exclude: + - features-suite: 'promise' + stream: 'master' + - features-suite: 'domino-multinode' + stream: 'master' + - features-suite: 'fds' + stream: 'euphrates' + + build-job-settings: &build-job-settings + current-parameter: false + git-revision: true + node-parameters: false + kill-phase-on: FAILURE + abort-all-jobs: false + predefined-parameters: | + FUNCTEST_MODE=$FUNCTEST_MODE + FUNCTEST_TIER=$FUNCTEST_TIER + + features-job-settings: &features-job-settings + current-parameter: false + git-revision: true + node-parameters: false + kill-phase-on: FAILURE + abort-all-jobs: false + predefined-parameters: | + FUNCTEST_MODE=$FUNCTEST_MODE + FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME + jobs: + - 'functest-{installer}-{pod}-suite-{stream}' + - 'functest-{installer}-{pod}-daily-{stream}' + - 'functest-{installer}-{pod}-daily-{functest-tier}-{stream}' + - 'functest-{installer}-{pod}-daily-features-{features-suite}-{stream}' ################################ # job template ################################ - job-template: - name: 'functest-{installer}-{pod}-{testsuite}-{stream}' + + name: 'functest-{installer}-{pod}-daily-{stream}' + + project-type: multijob + + disabled: '{obj:disabled}' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - '{installer}-defaults' + - '{slave-label}-defaults' + - functest-parameter: + gs-pathname: '{gs-pathname}' + + builders: + - multijob: + name: 'Run functest tests' + execution-type: SEQUENTIAL + projects: + - name: 'functest-{installer}-{pod}-daily-healthcheck-{stream}' + <<: *build-job-settings + - name: 'functest-{installer}-{pod}-daily-smoke-{stream}' + <<: *build-job-settings + - name: 'functest-{installer}-{pod}-daily-vnf-{stream}' + <<: *build-job-settings + - name: 'functest-{installer}-{pod}-daily-features-doctor-notification-{stream}' + <<: *features-job-settings + - name: 'functest-{installer}-{pod}-daily-features-bgpvpn-{stream}' + <<: *features-job-settings + - name: 'functest-{installer}-{pod}-daily-features-functest-odl-sfc-{stream}' + <<: *features-job-settings + - name: 'functest-{installer}-{pod}-daily-features-barometercollectd-{stream}' + <<: *features-job-settings + - name: 'functest-{installer}-{pod}-daily-features-fds-{stream}' + <<: *features-job-settings + - name: 'functest-{installer}-{pod}-daily-features-promise-{stream}' + <<: *features-job-settings + - name: 'functest-{installer}-{pod}-daily-features-domino-multinode-{stream}' + <<: *features-job-settings + +- job-template: &functest-installer-tier-job + + name: 'functest-{installer}-{pod}-daily-{functest-tier}-{stream}' concurrent: true @@ -232,10 +317,15 @@ branch: '{branch}' - '{installer}-defaults' - '{slave-label}-defaults' - - 'functest-{testsuite}-parameter' + - string: + name: FUNCTEST_MODE + default: 'tier' + - string: + name: FUNCTEST_TIER + default: '{functest-tier}' - string: name: DEPLOY_SCENARIO - default: 'os-odl_l2-nofeature-ha' + default: 'os-nosdn-nofeature-noha' - string: name: CLEAN_DOCKER_IMAGES default: 'false' @@ -249,7 +339,93 @@ builders: - description-setter: description: "Built on $NODE_NAME" - - 'functest-{testsuite}-builder' + - 'functest-daily-builder' + + publishers: + - 'functest-recipients' + - 'fuel-recipients' + +- job-template: + + name: 'functest-{installer}-{pod}-suite-{stream}' + <<: *functest-installer-tier-job + + wrappers: + - build-name: + name: '$BUILD_NUMBER Suite: $FUNCTEST_MODE Scenario: $DEPLOY_SCENARIO' + - timeout: + timeout: '60' + abort: true + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - '{installer}-defaults' + - '{slave-label}-defaults' + - 'functest-suite-parameter' + - string: + name: DEPLOY_SCENARIO + default: 'os-nosdn-nofeature-noha' + - string: + name: CLEAN_DOCKER_IMAGES + default: 'false' + description: 'Remove downloaded docker images (opnfv/functest*:*)' + - functest-parameter: + gs-pathname: '{gs-pathname}' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - 'functest-suite-builder' + +- job-template: + + name: 'functest-{installer}-{pod}-daily-features-{features-suite}-{stream}' + concurrent: true + properties: + - logrotate-default + - throttle: + enabled: true + max-per-node: 1 + option: 'project' + wrappers: + - build-name: + name: '$BUILD_NUMBER Suite: $FUNCTEST_MODE Scenario: $DEPLOY_SCENARIO' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - '{installer}-defaults' + - '{slave-label}-defaults' + - string: + name: FUNCTEST_MODE + default: 'testcase' + - string: + name: FUNCTEST_SUITE_NAME + default: '{features-suite}' + - string: + name: DEPLOY_SCENARIO + default: 'os-nosdn-nofeature-noha' + - string: + name: CLEAN_DOCKER_IMAGES + default: 'false' + description: 'Remove downloaded docker images (opnfv/functest*:*)' + - functest-parameter: + gs-pathname: '{gs-pathname}' + + scm: + - git-scm + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - 'functest-daily-builder' + + publishers: + - 'functest-features-recipients' + - 'functest-recipients' + - 'fuel-recipients' ######################## @@ -264,14 +440,6 @@ description: "Daily suite name to run" - parameter: - name: functest-arm-daily-parameter - parameters: - - string: - name: FUNCTEST_MODE - default: 'arm-daily' - description: "Daily suite name (Aarch64) to run" - -- parameter: name: functest-suite-parameter parameters: - choice: @@ -364,14 +532,6 @@ - 'functest-exit' - builder: - name: functest-arm-daily-builder - builders: - - 'functest-cleanup' - - 'functest-arm-daily' - - 'functest-store-results' - - 'functest-exit' - -- builder: name: functest-suite-builder builders: - 'functest-cleanup' @@ -405,17 +565,6 @@ # yamllint enable rule:indentation - builder: - name: functest-arm-daily - builders: - # yamllint disable rule:indentation - - shell: - !include-raw: - - ./functest-env-presetup.sh - - ../../utils/fetch_os_creds.sh - - ./functest-alpine.sh - -# yamllint enable rule:indentation -- builder: name: functest-store-results builders: - shell: @@ -432,3 +581,30 @@ builders: - shell: !include-raw: ./functest-exit.sh + + +- publisher: + name: 'functest-features-recipients' + publishers: + - email: + recipients: + +- publisher: + name: 'functest-recipients' + publishers: + - email: + recipients: > + jalausuch@suse.com morgan.richomme@orange.com + cedric.ollivier@orange.com feng.xiaowei@zte.com.cn + juha.kosonen@nokia.com wangwulin@huawei.com + delia.popescu@enea.com cristina.pauna@enea.com + valentin.boucher@kontron.com + - email-jenkins-admins-on-failure + +- publisher: + name: 'fuel-recipients' + publishers: + - email: + recipients: > + peter.barabas@ericsson.com mpolenchuck@mirantis.com + alexandru.avadanii@enea.com guillermo.herrero@enea.com diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml index 3d03f33b7..e58e1cfee 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yml @@ -903,7 +903,7 @@ - email-ext: <<: *email_ptl_defaults recipients: > - ManuelBuilmbuil@suse.com + mbuil@suse.com - publisher: name: 'email-snaps-ptl' diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml index acf14885e..c1bb1ba0e 100644 --- a/jjb/pharos/pharos.yml +++ b/jjb/pharos/pharos.yml @@ -11,7 +11,8 @@ jobs: - '{project}-verify-basic' - 'backup-pharos-dashboard' - - 'deploy-pharos-dashboard' + - 'deploy-pharos-dashboard': + disabled: true - job-template: name: 'backup-pharos-dashboard' @@ -52,7 +53,16 @@ - 'pharos-dashboard-defaults' scm: - - git-scm-gerrit + - git: + choosing-strategy: 'gerrit' + refspec: '$GERRIT_REFSPEC' + branches: + - 'origin/$BRANCH' + timeout: 15 + credentials-id: '$SSH_CREDENTIAL_ID' + url: '$GIT_BASE' + skip-tag: true + wipe-workspace: false triggers: - gerrit: @@ -71,6 +81,8 @@ builders: - shell: | cp $HOME/config.env $WORKSPACE/dashboard + cp $HOME/rsa.pub $WORKSPACE/dashboard + cp $HOME/rsa.pem $WORKSPACE/dashboard cd $WORKSPACE/dashboard sudo docker-compose build sudo docker-compose up -d diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh index 451f33b4b..d3a37ce8a 100755 --- a/jjb/xci/bifrost-verify.sh +++ b/jjb/xci/bifrost-verify.sh @@ -28,7 +28,7 @@ set -o pipefail cd ~/bifrost # provision 3 VMs; xcimaster, controller, and compute -./scripts/bifrost-provision.sh +./scripts/bifrost-provision.sh | ts sudo -H -E virsh list EOF diff --git a/jjb/xci/xci-start-new-vm.sh b/jjb/xci/xci-start-new-vm.sh index b72c33920..2c6ec3fad 100755 --- a/jjb/xci/xci-start-new-vm.sh +++ b/jjb/xci/xci-start-new-vm.sh @@ -53,7 +53,7 @@ if [[ ! -z ${WORKSPACE+x} && $GERRIT_PROJECT != "releng-xci" ]]; then fi cd xci -./xci-deploy.sh +./xci-deploy.sh | ts EOF chmod a+x xci_test.sh |