diff options
author | Fatih Degirmenci <fdegir@gmail.com> | 2018-02-26 10:26:11 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-02-26 10:26:11 +0000 |
commit | 8996464765156349212131d6bfd335329fa34104 (patch) | |
tree | 33187987b803e69463c7c002a8c0216897ac23d7 /jjb/xci/xci-verify-jobs.yml | |
parent | 9146b1745bebcea1ae7c0ce76dc1cdf4f3f25bb2 (diff) | |
parent | 979cebfc6234ce0c73feb4caae6814f5ff7411b8 (diff) |
Merge "Enable verify jobs for external scenarios"
Diffstat (limited to 'jjb/xci/xci-verify-jobs.yml')
-rw-r--r-- | jjb/xci/xci-verify-jobs.yml | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml index c6b6bc43b..3e56ef4dd 100644 --- a/jjb/xci/xci-verify-jobs.yml +++ b/jjb/xci/xci-verify-jobs.yml @@ -102,7 +102,7 @@ comment-contains-value: 'reverify' projects: - project-compare-type: 'ANT' - project-pattern: '{project}' + project-pattern: 'releng-xci' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' @@ -110,6 +110,15 @@ forbidden-file-paths: - compare-type: ANT pattern: 'xci/scripts/vm/**' + - project-compare-type: 'ANT' + project-pattern: 'sfc|bgpvpn' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + disable-strict-forbidden-file-verification: 'true' + file-paths: + - compare-type: ANT + pattern: 'scenarios/**' readable-message: true custom-url: '* $JOB_NAME $BUILD_URL' skip-vote: @@ -130,12 +139,15 @@ default: 'true' - string: name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT + default: https://gerrit.opnfv.org/gerrit/releng-xci description: 'Git URL to use on this Jenkins Slave' builders: + - 'xci-verify-set-scenario-macro' + - inject: + properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/scenario.properties" - description-setter: - description: "Built on $NODE_NAME" + description: "Scenario: $DEPLOY_SCENARIO | Node: $NODE_NAME" - multijob: name: deploy condition: SUCCESSFUL @@ -221,10 +233,12 @@ default: 'osa' - string: name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT + default: https://gerrit.opnfv.org/gerrit/releng-xci description: 'Git URL to use on this Jenkins Slave' wrappers: + - inject: + properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/scenario.properties" - ssh-agent-wrapper - build-timeout: timeout: 240 @@ -235,13 +249,19 @@ builders: - description-setter: - description: "Built on $NODE_NAME" + description: "Scenario: $DEPLOY_SCENARIO | Node: $NODE_NAME" - 'xci-verify-{phase}-macro' # ------------------------------- # builder macros # ------------------------------- - builder: + name: 'xci-verify-set-scenario-macro' + builders: + - shell: + !include-raw: ./xci-set-scenario.sh + +- builder: name: 'xci-verify-deploy-macro' builders: - shell: |