X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=19f321b9e6f9d0fb8960f5595985f0129d040117;hb=e6dadb34e0f43397924893e5e872ec26f56eee88;hp=1952cd3cdcb97217810a3daf9e01596c5f6a8aac;hpb=3125eb2c6f1c36e5dc673239085938497437ef08;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 1952cd3cd..19f321b9e 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -14,6 +14,14 @@ default: '{bundleurl}' description: 'URL to karaf distribution zip' +- parameter: + name: integration-jdk-version + parameters: + - string: + name: JDKVERSION + default: '{jdkversion}' + description: 'Parameter to indicate JAVA Version' + - parameter: name: integration-controller-scope parameters: @@ -63,8 +71,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 +80,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 +89,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,29 +103,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 test/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 + name: integration-trigger-patch-submitted triggers: - gerrit: server-name: 'OpenDaylight' @@ -148,6 +122,9 @@ comment-contains-value: 'recheck' - comment-added-contains-event: comment-contains-value: 'reverify' + override-votes: true + gerrit-build-unstable-verified-value: +1 + gerrit-build-unstable-codereview-value: 0 projects: - project-compare-type: 'ANT' project-pattern: '{name}' @@ -156,27 +133,21 @@ branch-pattern: '**/{branch}' file-paths: - compare-type: 'ANT' - pattern: 'csit/suites/{project}/**' + pattern: '{pattern}' -# 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 +# 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-submitted + name: integration-trigger-patch-merged 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' + - change-merged-event - comment-added-contains-event: - comment-contains-value: 'reverify' + comment-contains-value: 'remerge' projects: - project-compare-type: 'ANT' project-pattern: '{name}' @@ -185,30 +156,27 @@ branch-pattern: '**/{branch}' file-paths: - compare-type: 'ANT' - pattern: 'csit/**' + pattern: '{pattern}' -# Macro: integration-csit-gerrit-trigger-patch-merged -# Operation: this macro sets a trigger for patch merged on test/csit/** -# Used by: not used yet +# Macro: integration-csit-only +# Operation: this macro sets a trigger on reverse job list +# Used by: csit -only- job templates - trigger: - name: integration-csit-gerrit-trigger-patch-merged + name: integration-csit-only 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: 'csit/**' + - reverse: + jobs: '{jobs}' + result: 'success' + +# Macro: integration-csit-all +# Operation: this macro sets a periodic trigger +# Used by: csit -all- job teamplates + +- trigger: + name: integration-csit-all + triggers: + - timed: 'H H * * *' # Macro: integration-jclouds-controller-mininet # Operation: this macro will spin the controller and mininet vms @@ -219,12 +187,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 @@ -240,7 +208,8 @@ name: integration-get-slave-addresses builders: - shell: - !include-raw include-raw-integration-get-slave-addresses.sh + !include-raw: + - include-raw-integration-get-slave-addresses.sh # Macro: integration-get-bundle-vars # Operation: this macro gets all bundle related variables @@ -250,17 +219,41 @@ name: integration-get-bundle-vars builders: - shell: - !include-raw include-raw-integration-get-bundle-vars.sh + !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: name: integration-deploy-controller-run-test builders: - shell: - !include-raw include-raw-integration-deploy-controller-run-test.sh + !include-raw: + - include-raw-integration-deploy-controller-run-test.sh # Macro: integration-deploy-controller # Operation: this macro prepares 3-node cluster controller @@ -270,7 +263,8 @@ name: integration-deploy-controller builders: - shell: - !include-raw include-raw-integration-deploy-controller.sh + !include-raw: + - include-raw-integration-deploy-controller.sh # Macro: integration-configure-clustering # Operation: this macro configures the clustering @@ -280,7 +274,8 @@ name: integration-configure-clustering builders: - shell: - !include-raw include-raw-integration-configure-clustering.sh + !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 @@ -290,27 +285,85 @@ name: integration-start-cluster-run-test builders: - shell: - !include-raw include-raw-integration-start-cluster-run-test.sh + !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-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 + +# Macro: integration-rebase-patch +# Operation: For cloned project, rebase checked-out Gerrit patch onto $BRANCH. +# Used by: integration-patch-distribution-* job template + +- builder: + name: integration-rebase-gerrit-patch builders: - shell: - !include-raw include-raw-integration-get-bundle-url.sh + !include-raw: + - include-raw-integration-rebase-gerrit-patch.sh ############## # Publishers #