X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fxci%2Fxci-merge-jobs.yml;h=e4e5705a7acbcbd2bfaaa8cccd918ff9976e576f;hb=fea07336516a44b3216f8c95e231a6acf8c099e0;hp=8a3a7cfbcef51cba093aee61d49f5f0ee364f9a1;hpb=5d96264c472215f346e4e7cf44ba3ea6a51d76d6;p=releng.git diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml index 8a3a7cfbc..e4e5705a7 100644 --- a/jjb/xci/xci-merge-jobs.yml +++ b/jjb/xci/xci-merge-jobs.yml @@ -9,27 +9,23 @@ stream: - master: branch: '{stream}' + disabled: false # ------------------------------- # distros # ------------------------------- distro: - ubuntu: disabled: false + kill-phase-on: FAILURE + abort-all-job: true - centos: - disabled: false + disabled: true + kill-phase-on: NEVER + abort-all-job: false - opensuse: disabled: false - # ------------------------------- - # scenarios - # ------------------------------- - scenario: - - 'os-odl-sfc': - project: sfc - # ------------------------------- - # type - # ------------------------------- - type: - - virtual + kill-phase-on: FAILURE + abort-all-job: true # ------------------------------- # postmerge promotion phases # ------------------------------- @@ -40,15 +36,15 @@ # jobs # ------------------------------- jobs: - - 'xci-{scenario}-{type}-merge-{stream}' - - 'xci-{scenario}-{type}-promote-merge-{stream}' - - 'xci-merge-{distro}-{type}-{stream}' - - 'xci-merge-{distro}-{phase}-{type}-{stream}' + - 'xci-merge-virtual-{stream}' + - 'xci-merge-promote-virtual-{stream}' + - 'xci-merge-{distro}-virtual-{stream}' + - 'xci-merge-{distro}-{phase}-virtual-{stream}' # ------------------------------- # job templates # ------------------------------- - job-template: - name: 'xci-{scenario}-{type}-merge-{stream}' + name: 'xci-merge-virtual-{stream}' project-type: multijob @@ -77,7 +73,24 @@ comment-contains-value: 'remerge' projects: - project-compare-type: 'ANT' - project-pattern: '{obj:project}' + project-pattern: 'releng-xci' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + disable-strict-forbidden-file-verification: 'false' + forbidden-file-paths: + - compare-type: ANT + pattern: 'xci/scripts/vm/**' + - compare-type: ANT + pattern: 'docs/**' + - compare-type: ANT + pattern: 'prototypes/**' + - compare-type: ANT + pattern: 'upstream/**' + - compare-type: ANT + pattern: 'INFO.yaml' + - project-compare-type: 'REG_EXP' + project-pattern: 'sfc|sdnvpn' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' @@ -95,6 +108,15 @@ - label: name: SLAVE_LABEL default: 'xci-virtual' + - string: + name: CI_LOOP + default: 'merge' + - string: + name: FUNCTEST_MODE + default: 'tier' + - string: + name: FUNCTEST_SUITE_NAME + default: 'healthcheck' - string: name: DISTRO default: 'all' @@ -107,14 +129,16 @@ description: 'Git URL to use on this Jenkins Slave' builders: - - description-setter: - description: "Node: $NODE_NAME" - 'xci-merge-set-scenario-macro' + - inject: + properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties" + - description-setter: + description: "Scenario: $DEPLOY_SCENARIO | Node: $NODE_NAME" - multijob: name: deploy and test condition: SUCCESSFUL projects: - - name: 'xci-merge-opensuse-{type}-{stream}' + - name: 'xci-merge-opensuse-virtual-{stream}' current-parameters: false predefined-parameters: | DISTRO=opensuse @@ -124,10 +148,13 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + CI_LOOP=$CI_LOOP + FUNCTEST_MODE=$FUNCTEST_MODE + FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME node-parameters: false kill-phase-on: FAILURE abort-all-job: true - - name: 'xci-merge-ubuntu-{type}-{stream}' + - name: 'xci-merge-ubuntu-virtual-{stream}' current-parameters: false predefined-parameters: | DISTRO=ubuntu @@ -137,10 +164,13 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + CI_LOOP=$CI_LOOP + FUNCTEST_MODE=$FUNCTEST_MODE + FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME node-parameters: false kill-phase-on: FAILURE abort-all-job: true - - name: 'xci-merge-centos-{type}-{stream}' + - name: 'xci-merge-centos-virtual-{stream}' current-parameters: false predefined-parameters: | DISTRO=centos @@ -150,16 +180,19 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + CI_LOOP=$CI_LOOP + FUNCTEST_MODE=$FUNCTEST_MODE + FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME node-parameters: false - kill-phase-on: FAILURE - abort-all-job: true + kill-phase-on: NEVER + abort-all-job: false - inject: properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties" - multijob: name: promote condition: SUCCESSFUL projects: - - name: 'xci-{scenario}-{type}-promote-merge-{stream}' + - name: 'xci-merge-promote-virtual-{stream}' current-parameters: true predefined-parameters: | GERRIT_PROJECT=$GERRIT_PROJECT @@ -167,18 +200,21 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + CI_LOOP=$CI_LOOP + FUNCTEST_MODE=$FUNCTEST_MODE + FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME node-parameters: true kill-phase-on: NEVER abort-all-job: true - job-template: - name: 'xci-merge-{distro}-{type}-{stream}' + name: 'xci-merge-{distro}-virtual-{stream}' project-type: multijob disabled: '{obj:disabled}' - concurrent: true + concurrent: false properties: - logrotate-default @@ -214,6 +250,15 @@ - label: name: SLAVE_LABEL default: 'xci-virtual' + - string: + name: CI_LOOP + default: 'merge' + - string: + name: FUNCTEST_MODE + default: 'tier' + - string: + name: FUNCTEST_SUITE_NAME + default: 'healthcheck' - string: name: DISTRO default: '{distro}' @@ -235,7 +280,7 @@ name: deploy condition: SUCCESSFUL projects: - - name: 'xci-merge-{distro}-deploy-{type}-{stream}' + - name: 'xci-merge-{distro}-deploy-virtual-{stream}' current-parameters: true predefined-parameters: | DISTRO={distro} @@ -246,13 +291,13 @@ GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE node-parameters: true - kill-phase-on: FAILURE - abort-all-job: true + kill-phase-on: '{kill-phase-on}' + abort-all-job: '{abort-all-job}' - multijob: name: healthcheck condition: SUCCESSFUL projects: - - name: 'xci-merge-{distro}-healthcheck-{type}-{stream}' + - name: 'xci-merge-{distro}-healthcheck-virtual-{stream}' current-parameters: true predefined-parameters: | DISTRO={distro} @@ -262,11 +307,12 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - FUNCTEST_MODE=tier - FUNCTEST_TIER=healthcheck + CI_LOOP=$CI_LOOP + FUNCTEST_MODE=$FUNCTEST_MODE + FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME node-parameters: true - kill-phase-on: NEVER - abort-all-job: true + kill-phase-on: '{kill-phase-on}' + abort-all-job: '{abort-all-job}' publishers: - postbuildscript: @@ -277,11 +323,11 @@ !include-raw: ./xci-cleanup.sh - job-template: - name: 'xci-merge-{distro}-{phase}-{type}-{stream}' + name: 'xci-merge-{distro}-{phase}-virtual-{stream}' disabled: false - concurrent: true + concurrent: false properties: - logrotate-default @@ -301,6 +347,9 @@ - string: name: DISTRO default: 'ubuntu' + - string: + name: CI_LOOP + default: 'merge' - string: name: FUNCTEST_MODE default: 'tier' @@ -338,7 +387,7 @@ - 'xci-merge-{phase}-macro' - job-template: - name: 'xci-{scenario}-{type}-promote-merge-{stream}' + name: 'xci-merge-promote-virtual-{stream}' disabled: false @@ -351,12 +400,27 @@ - string: name: PROJECT default: $GERRIT_PROJECT + - string: + name: CI_LOOP + default: 'merge' + - string: + name: FUNCTEST_MODE + default: 'tier' + - string: + name: FUNCTEST_SUITE_NAME + default: 'healthcheck' - string: name: DISTRO default: 'all' - string: name: OPNFV_RELENG_DEV_PATH default: $WORKSPACE/ + - string: + name: LOCAL_PROMOTION_METADATA_FILE + default: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties" + - string: + name: REMOTE_PROMOTION_METADATA_FILE + default: "gs://artifacts.opnfv.org/xci/pipeline/merge/$DEPLOY_SCENARIO.properties" - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -387,20 +451,20 @@ - builder: name: 'xci-merge-deploy-macro' builders: - - shell: | - #!/bin/bash - echo "Hello World" + - shell: + !include-raw: ./xci-start-new-vm.sh + + - shell: + !include-raw: ./xci-start-deployment.sh - builder: name: 'xci-merge-healthcheck-macro' builders: - - shell: | - #!/bin/bash - echo "Hello World" + - shell: + !include-raw: ./xci-run-functest.sh - builder: name: 'xci-merge-promote-macro' builders: - - shell: | - #!/bin/bash - echo "Hello World" + - shell: + !include-raw: ./xci-promote.sh