diff options
Diffstat (limited to 'jjb/xci/xci-merge-jobs.yml')
| -rw-r--r-- | jjb/xci/xci-merge-jobs.yml | 145 |
1 files changed, 100 insertions, 45 deletions
diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml index 8a3a7cfbc..df2d38e5f 100644 --- a/jjb/xci/xci-merge-jobs.yml +++ b/jjb/xci/xci-merge-jobs.yml @@ -20,17 +20,6 @@ - opensuse: disabled: false # ------------------------------- - # scenarios - # ------------------------------- - scenario: - - 'os-odl-sfc': - project: sfc - # ------------------------------- - # type - # ------------------------------- - type: - - virtual - # ------------------------------- # postmerge promotion phases # ------------------------------- phase: @@ -40,19 +29,19 @@ # 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 - disabled: '{obj:disabled}' + disabled: false concurrent: false @@ -77,7 +66,22 @@ 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/**' + - project-compare-type: 'REG_EXP' + project-pattern: 'sfc|sdnvpn' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' @@ -96,6 +100,15 @@ 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' - string: @@ -107,14 +120,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 +139,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 +155,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 +171,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 +191,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}' + disabled: false - concurrent: true + concurrent: false properties: - logrotate-default @@ -215,6 +242,15 @@ 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}' - string: @@ -235,7 +271,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} @@ -252,7 +288,7 @@ 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,8 +298,9 @@ 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 @@ -277,11 +314,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 @@ -302,6 +339,9 @@ name: DISTRO default: 'ubuntu' - string: + name: CI_LOOP + default: 'merge' + - string: name: FUNCTEST_MODE default: 'tier' - string: @@ -338,7 +378,7 @@ - 'xci-merge-{phase}-macro' - job-template: - name: 'xci-{scenario}-{type}-promote-merge-{stream}' + name: 'xci-merge-promote-virtual-{stream}' disabled: false @@ -352,12 +392,27 @@ 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 description: 'Git URL to use on this Jenkins Slave' @@ -387,20 +442,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 |