X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=bd34eae001aec17c92bcc4efc804c46f091ec954;hb=476a8ee1380ba4f1061ce676469a01da22bc50f0;hp=e9c8d10bbcbffd194fedd2bec3f7c57c0f4cda07;hpb=93b08701f1549ad48e2c8c80042a8b4e5427f10f;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index e9c8d10bb..bd34eae00 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -63,8 +63,8 @@ description: 'Integration Patch Refspec' # Macro: integration-gerrit-scm -# Operation: this macro downloads a project gerrit and using the project name as basedir -# Used by: integration-patch-test-{stream} job template +# Operation: this macro downloads a project gerrit +# Used by: all csit jobs - scm: name: integration-gerrit-scm @@ -72,25 +72,8 @@ - git: credentials-id: '{credentials-id}' url: '$GIT_BASE' - basedir: '$GERRIT_PROJECT' - refspec: '$GERRIT_REFSPEC' - branches: - - 'origin/{branch}' - skip-tag: true - choosing-strategy: 'gerrit' - -# Macro: integration-gerrit-test-scm -# Operation: this macro downloads an integration/test gerrit using test as basedir -# Used by: {project}-verify-csit-* job templates - -- scm: - name: integration-gerrit-test-scm - scm: - - git: - credentials-id: '{credentials-id}' - url: '$GIT_BASE' - basedir: 'test' - refspec: '$GERRIT_REFSPEC' + basedir: '{basedir}' + refspec: '{refspec}' branches: - 'origin/{branch}' skip-tag: true @@ -98,7 +81,7 @@ # Macro: integration-distribution-scm # Operation: this macro downloads the integration/distribution repo using distribution as basedir -# Used by: {project}-csit-* and integration-patch-test-{stream} job templates +# Used by: integration-patch-test-{stream} job template - scm: name: integration-distribution-scm @@ -112,58 +95,12 @@ - 'origin/{branch}' skip-tag: true -# Macro: integration-patch-scm -# Operation: this macro downloads a test patch that can be used to debug in the sandbox -# Used by: {project}-csit-* job templates - -- scm: - name: integration-test-scm - scm: - - git: - credentials-id: '{credentials-id}' - basedir: 'test' - url: '$GIT_BASE' - refspec: '$PATCHREFSPEC' - branches: - - 'origin/{branch}' - skip-tag: true - choosing-strategy: 'gerrit' - -# Macro: integration-test-gerrit-trigger-patch-submitted -# Operation: this macro sets a trigger for patch submit on csit/suites/{project}/** +# Macro: integration-trigger-patch-submitted +# Operation: this macro sets a trigger for patch submitted on a path pattern # Used by: {project}-verify-csit-* job templates - trigger: - name: integration-test-gerrit-trigger-patch-submitted - triggers: - - gerrit: - server-name: 'OpenDaylight' - trigger-on: - - patchset-created-event: - exclude-drafts: 'true' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'true' - - draft-published-event - - comment-added-contains-event: - comment-contains-value: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' - projects: - - project-compare-type: 'ANT' - project-pattern: '{name}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: 'ANT' - pattern: 'csit/suites/{project}/**' - -# Macro: integration-csit-gerrit-trigger-patch-submitted -# Operation: this macro sets a trigger for patch submit on csit/libraries -# Used by: integration-verify-csit-1node-{stream} job template - -- trigger: - name: integration-csit-gerrit-trigger-patch-submitted + name: integration-trigger-patch-submitted triggers: - gerrit: server-name: 'OpenDaylight' @@ -177,6 +114,7 @@ comment-contains-value: 'recheck' - comment-added-contains-event: comment-contains-value: 'reverify' + gerrit-build-unstable-verified-value: +1 projects: - project-compare-type: 'ANT' project-pattern: '{name}' @@ -185,14 +123,14 @@ branch-pattern: '**/{branch}' file-paths: - compare-type: 'ANT' - pattern: 'csit/libraries/*' + pattern: '{pattern}' -# Macro: integration-csit-gerrit-trigger-patch-merged -# Operation: this macro sets a trigger for patch merged on csit/** +# Macro: integration-trigger-patch-merged +# Operation: this macro sets a trigger for patch merged on a path pattern # Used by: not used yet - trigger: - name: integration-csit-gerrit-trigger-patch-merged + name: integration-trigger-patch-merged triggers: - gerrit: server-name: 'OpenDaylight' @@ -208,7 +146,7 @@ branch-pattern: '**/{branch}' file-paths: - compare-type: 'ANT' - pattern: 'csit/**' + pattern: '{pattern}' # Macro: integration-jclouds-controller-mininet # Operation: this macro will spin the controller and mininet vms @@ -219,12 +157,12 @@ wrappers: - jclouds: instances: - - rk-c-el6-java: + - rk-c7-java: cloud-name: 'Rackspace DFW - Integration Dynamic Lab' count: '{controller-vms}' stop-on-terminate: False - '{mininet-image}': - cloud-name: 'Rackspace DFW - Integration Dynamic Lab' + cloud-name: '{mininet-cloud-name}' count: '{mininet-vms}' stop-on-terminate: False @@ -252,8 +190,28 @@ - shell: !include-raw include-raw-integration-get-bundle-vars.sh +# Macro: integration-deploy-controller-verify +# Operation: this macro deploys the controller with all fetures +# Used by: integration-distrbution-deploy-{stream} job template + +- builder: + name: integration-deploy-controller-verify + builders: + - shell: + !include-raw include-raw-integration-deploy-controller-verify.sh + +# Macro: integration-deploy-controller-offline +# Operation: this macro deploys the controller with no external repo configuration +# Used by: integration-distrbution-offline-{stream} job template + +- builder: + name: integration-deploy-controller-offline + builders: + - shell: + !include-raw include-raw-integration-deploy-controller-offline.sh + # Macro: integration-deply-controller-run-test -# Operation: this macro deployes single contoller and runs test +# Operation: this macro deploys single contoller and runs test # Used by: {project}-csit-1node-* job templates - builder: @@ -292,25 +250,65 @@ - shell: !include-raw include-raw-integration-start-cluster-run-test.sh -# Macro: integration-deploy-controller-offline -# Operation: this macro deployes the controller with no external repo configuration -# Used by: integration-distrbution-offline-{stream} job template +# Macro: integration-get-bundle-url +# Operation: this macro gets the job generated distribution URL from distribution pom.xml +# Used by: integration-patch-test-{stream} job template - builder: - name: integration-deploy-controller-offline + name: integration-get-bundle-url builders: - shell: - !include-raw include-raw-integration-deploy-controller-offline.sh + !include-raw include-raw-integration-get-bundle-url.sh -# Macro: integration-get-bundle-url -# Operation: this macro gets the distribution bundle URL -# Used by: integration-patch-test-{stream} job template +# Macro: integration-get-bundle-url-root +# Operation: this macro gets the job generated distribution URL from root pom.xml +# Used by: integration-distribution-verify-{stream} job template - builder: - name: integration-get-bundle-url + name: integration-get-bundle-url-root builders: - shell: - !include-raw include-raw-integration-get-bundle-url.sh + !include-raw include-raw-integration-get-bundle-url-root.sh + +# Macro: integration-install-robotframework +# Operation: Installs robotframework using pip to a virtualenv +# Used by: {project}-csit-* job templates + +- builder: + name: integration-install-robotframework + builders: + - shell: + !include-raw include-raw-integration-install-robotframework.sh + +# Macro: integration-cleanup-tmp +# Operation: Cleans up temporary files created by build +# Used by: {project}-csit-* job templates + +- builder: + name: integration-cleanup-tmp + builders: + - shell: + !include-raw include-raw-integration-cleanup-tmp.sh + +# Macro: integration-multipatch-builder +# Operation: checks out multiple patches and builds custom distribution +# Used by: integration-multipatch-test-* job templates + +- builder: + name: integration-multipatch-builder + builders: + - shell: + !include-raw include-raw-integration-multipatch-distribution-test.sh + +# Macro: integration-cleanup-worspace +# Operation: Cleans up files possibly left there by the previous build +# Used by: {project}-csit-* job templates + +- builder: + name: integration-cleanup-workspace + builders: + - shell: + !include-raw include-raw-integration-cleanup-workspace.sh ############## # Publishers #