X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=1952cd3cdcb97217810a3daf9e01596c5f6a8aac;hb=3125eb2c6f1c36e5dc673239085938497437ef08;hp=bbf9fe7992e983f9ddafc594aba1b8520ba2f69f;hpb=3b124d322fcd7d9068ee7ea804aeefb94f85eff9;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index bbf9fe799..1952cd3cd 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,22 +44,34 @@ - string: name: TESTOPTIONS default: '{test-options}' - description: 'Robot command options' + description: 'Robot command options' - parameter: - name: integration-patch-git-url + name: integration-distribution-git-url parameters: - string: - name: PATCHGITURL - default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/$GERRIT_PROJECT' - description: 'Patch GIT URL (do not modify)' + 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 and using the project name as basedir +# Used by: integration-patch-test-{stream} job template - scm: name: integration-gerrit-scm scm: - git: credentials-id: '{credentials-id}' - url: '$PATCHGITURL' + url: '$GIT_BASE' basedir: '$GERRIT_PROJECT' refspec: '$GERRIT_REFSPEC' branches: @@ -67,73 +79,59 @@ 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-git-scm + name: integration-gerrit-test-scm scm: - git: credentials-id: '{credentials-id}' - basedir: 'integration' url: '$GIT_BASE' + basedir: 'test' + refspec: '$GERRIT_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: {project}-csit-* and integration-patch-test-{stream} job templates + +- scm: + name: integration-distribution-scm + scm: + - git: + credentials-id: '{credentials-id}' + 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-patch-scm +# Operation: this macro downloads a test patch that can be used to debug in the sandbox +# Used by: {project}-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/**' +- 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 test/csit/suites/{project}/** +# Used by: {project}-verify-csit-* job templates - trigger: name: integration-test-gerrit-trigger-patch-submitted @@ -142,9 +140,9 @@ 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' @@ -158,7 +156,11 @@ branch-pattern: '**/{branch}' file-paths: - compare-type: 'ANT' - pattern: 'test/csit/suites/{project}/**' + pattern: 'csit/suites/{project}/**' + +# Macro: integration-csit-gerrit-trigger-patch-submitted +# Operation: this macro sets a trigger for patch submit on test/csit/** +# Used by: integration-verify-csit-1node-{stream} job template - trigger: name: integration-csit-gerrit-trigger-patch-submitted @@ -167,9 +169,9 @@ 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' @@ -183,7 +185,11 @@ branch-pattern: '**/{branch}' file-paths: - compare-type: 'ANT' - pattern: 'test/csit/**' + pattern: 'csit/**' + +# Macro: integration-csit-gerrit-trigger-patch-merged +# Operation: this macro sets a trigger for patch merged on test/csit/** +# Used by: not used yet - trigger: name: integration-csit-gerrit-trigger-patch-merged @@ -202,7 +208,11 @@ branch-pattern: '**/{branch}' file-paths: - compare-type: 'ANT' - pattern: 'test/csit/**' + pattern: 'csit/**' + +# 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 @@ -213,7 +223,7 @@ cloud-name: 'Rackspace DFW - Integration Dynamic Lab' count: '{controller-vms}' stop-on-terminate: False - - rk-c-el6-mininet: + - '{mininet-image}': cloud-name: 'Rackspace DFW - Integration Dynamic Lab' count: '{mininet-vms}' stop-on-terminate: False @@ -222,24 +232,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: @@ -250,6 +316,10 @@ # Publishers # ############## +# Macro: integration-robot +# Operation: this macro publishes robot results +# Used by: {project}-csit-* job templates + - publisher: name: integration-robot publishers: