X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=cd2c83ff5f2f67297fc87207c3c5aa2f5fcc47bf;hb=43b38aa729b269b98e5ad38dc6385b5ff3139c53;hp=b17eb4dabf36e76f01a43df1ea6b551340b147d6;hpb=a3fa2afc49b75096aaad8260727df3047d6cbe41;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index b17eb4dab..cd2c83ff5 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -4,7 +4,7 @@ - string: name: BRANCH default: '{branch}' - description: 'GIT branch' + description: 'Distribution GIT branch' - parameter: name: integration-bundleurl @@ -36,7 +36,7 @@ - string: name: TESTPLAN default: '{test-plan}' - description: 'Test plan we will run' + description: 'Test plan we will run' - parameter: name: integration-test-options @@ -44,99 +44,71 @@ - string: name: TESTOPTIONS default: '{test-options}' - description: 'Robot command options' + description: 'Robot command options' + +- parameter: + name: integration-distribution-git-url + parameters: + - string: + name: DISTROGITURL + default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/integration/distribution' + description: 'Distribution GIT URL (do not modify)' + +- parameter: + name: integration-patch-refspec + parameters: + - string: + name: PATCHREFSPEC + default: '{branch}' + description: 'Integration Patch Refspec' + +# Macro: integration-gerrit-scm +# Operation: this macro downloads a project gerrit +# Used by: all csit jobs - scm: name: integration-gerrit-scm scm: - git: credentials-id: '{credentials-id}' - url: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/$GERRIT_PROJECT' - basedir: '$GERRIT_PROJECT' - refspec: '$GERRIT_REFSPEC' + url: '$GIT_BASE' + basedir: '{basedir}' + refspec: '{refspec}' branches: - 'origin/{branch}' skip-tag: true choosing-strategy: 'gerrit' +# Macro: integration-distribution-scm +# Operation: this macro downloads the integration/distribution repo using distribution as basedir +# Used by: integration-patch-test-{stream} job template + - scm: - name: integration-git-scm + name: integration-distribution-scm scm: - git: credentials-id: '{credentials-id}' - basedir: 'integration' - url: '$GIT_BASE' + basedir: 'distribution' + url: '$DISTROGITURL' refspec: '' branches: - 'origin/{branch}' skip-tag: true -- trigger: - name: integration-distribution-gerrit-trigger-patch-submitted - triggers: - - gerrit: - server-name: 'OpenDaylight' - trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - 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: 'pom.xml' - - compare-type: 'ANT' - pattern: 'distributions/**' - - compare-type: 'ANT' - pattern: 'features/**' - - compare-type: 'ANT' - pattern: 'feature-selector/**' +# 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-distribution-gerrit-trigger-patch-merged - triggers: - - gerrit: - server-name: 'OpenDaylight' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: '{name}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: 'ANT' - pattern: 'pom.xml' - - compare-type: 'ANT' - pattern: 'distributions/**' - - compare-type: 'ANT' - pattern: 'features/**' - - compare-type: 'ANT' - pattern: 'feature-selector/**' - -- trigger: - name: integration-test-gerrit-trigger-patch-submitted + name: integration-trigger-patch-submitted triggers: - gerrit: server-name: 'OpenDaylight' trigger-on: - patchset-created-event: - exclude-drafts: 'false' + exclude-drafts: 'true' exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' + exclude-no-code-change: 'true' - draft-published-event - comment-added-contains-event: comment-contains-value: 'recheck' @@ -150,35 +122,14 @@ branch-pattern: '**/{branch}' file-paths: - compare-type: 'ANT' - pattern: 'test/csit/suites/{project}/**' + pattern: '{pattern}' -- trigger: - name: integration-csit-gerrit-trigger-patch-submitted - triggers: - - gerrit: - server-name: 'OpenDaylight' - trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - 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: 'test/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' @@ -194,19 +145,23 @@ branch-pattern: '**/{branch}' file-paths: - compare-type: 'ANT' - pattern: 'test/csit/**' + pattern: '{pattern}' + +# Macro: integration-jclouds-controller-mininet +# Operation: this macro will spin the controller and mininet vms +# Used by: {project}-csit-* job templates - wrapper: name: integration-jclouds-controller-mininet wrappers: - jclouds: instances: - - rk-c-el6-java: + - rk-c7-java: cloud-name: 'Rackspace DFW - Integration Dynamic Lab' count: '{controller-vms}' stop-on-terminate: False - - rk-c-el6-mininet: - cloud-name: 'Rackspace DFW - Integration Dynamic Lab' + - '{mininet-image}': + cloud-name: '{mininet-cloud-name}' count: '{mininet-vms}' stop-on-terminate: False @@ -214,24 +169,80 @@ # Shell Scripts # ################# +# Macro: integration-get-slave-addresses +# Operation: this macro gets the IP addresses of the dynamic vms +# Used by: {project}-csit-* job templates + - builder: name: integration-get-slave-addresses builders: - shell: !include-raw include-raw-integration-get-slave-addresses.sh +# Macro: integration-get-bundle-vars +# Operation: this macro gets all bundle related variables +# Used by: {project}-csit-3node-* job templates + +- builder: + name: integration-get-bundle-vars + builders: + - shell: + !include-raw include-raw-integration-get-bundle-vars.sh + +# Macro: integration-deply-controller-run-test +# Operation: this macro deployes single contoller and runs test +# Used by: {project}-csit-1node-* job templates + - builder: name: integration-deploy-controller-run-test builders: - shell: !include-raw include-raw-integration-deploy-controller-run-test.sh +# Macro: integration-deploy-controller +# Operation: this macro prepares 3-node cluster controller +# Used by: {project}-csit-3node-* job templates + +- builder: + name: integration-deploy-controller + builders: + - shell: + !include-raw include-raw-integration-deploy-controller.sh + +# Macro: integration-configure-clustering +# Operation: this macro configures the clustering +# Used by: {project}-csit-3node-* job templates + +- builder: + name: integration-configure-clustering + builders: + - shell: + !include-raw include-raw-integration-configure-clustering.sh + +# Macro: integration-start-cluster-run-test +# Operation: this macro starts the 3-node cluster and runs test +# Used by: {project}-csit-3node-* job templates + +- builder: + name: integration-start-cluster-run-test + builders: + - 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 + - builder: name: integration-deploy-controller-offline builders: - shell: !include-raw include-raw-integration-deploy-controller-offline.sh +# Macro: integration-get-bundle-url +# Operation: this macro gets the distribution bundle URL +# Used by: integration-patch-test-{stream} job template + - builder: name: integration-get-bundle-url builders: @@ -242,6 +253,10 @@ # Publishers # ############## +# Macro: integration-robot +# Operation: this macro publishes robot results +# Used by: {project}-csit-* job templates + - publisher: name: integration-robot publishers: