X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=3ebdc7d55a36b42b7adfaa944c6d2382adec756c;hb=2d3990043987678c89e67a77b3d17029ac16cd35;hp=875872dd487101bab1004df9705809c6905a7aef;hpb=29cba5f1b7b11d580ee4ad587f5ccc04a605297b;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 875872dd4..3ebdc7d55 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -18,6 +18,7 @@ stream: - nitrogen: branch: 'master' + karaf-version: karaf3 jre: 'openjdk8' csit-list: '{csit-list-nitrogen}' csit-sanity-list: '{csit-sanity-list-nitrogen}' @@ -28,6 +29,7 @@ - carbon: branch: 'stable/carbon' + karaf-version: karaf3 jdk: 'openjdk8' jre: 'openjdk8' csit-list: '{csit-list-carbon}' @@ -39,6 +41,7 @@ - boron: branch: 'stable/boron' + karaf-version: karaf3 jdk: 'openjdk8' jre: 'openjdk8' csit-list: '{csit-list-boron}' @@ -50,6 +53,7 @@ - beryllium: branch: 'stable/beryllium' + karaf-version: karaf3 jdk: 'openjdk7' jre: 'openjdk7' csit-list: '{csit-list-beryllium}' @@ -91,11 +95,11 @@ refspec: 'refs/heads/{test-branch}' artifacts: '{archive-artifacts}' - integration-distribution-branch: - branch: '{branch}' + branch: '{verify-branch}' - integration-distribution-stream: - stream: '{dist-stream}' - - integration-bundleurl: - bundleurl: '{bundleurl}' + stream: '{verify-stream}' + - integration-bundle-url: + bundle-url: '{bundle-url}' - integration-controller-scope: controller-scope: '{scope}' - integration-controller-features: @@ -111,13 +115,15 @@ - integration-test-options: test-options: '-v TIMEOUT_BUG_4220:10s -v USE_NETCONF_CONNECTOR:True' - integration-stream-test-plan: - stream-test-plan: 'test-libraries-{dist-stream}.txt' + stream-test-plan: 'test-libraries-{verify-stream}.txt' - integration-test-plan: test-plan: 'test-libraries.txt' - integration-patch-refspec: branch: '$GERRIT_REFSPEC' - integration-jdk-version: jdkversion: '{jre}' + - distribution-karaf-version: + karaf-version: '{verify-karaf-version}' scm: - integration-gerrit-scm: @@ -151,9 +157,7 @@ - integration-get-slave-addresses - inject: properties-file: 'slave_addresses.txt' - - integration-get-bundle-vars - - inject: - properties-file: 'bundle_vars.txt' + - integration-detect-variables - integration-deploy-controller-run-test - integration-cleanup-tmp @@ -183,17 +187,15 @@ build-days-to-keep: '{build-days-to-keep}' parameters: - - integration-bundleurl: - bundleurl: '{bundleurl}' - - integration-jdk-version: - jdkversion: '{jre}' + - integration-bundle-url: + bundle-url: '{bundle-url}' builders: - trigger-builds: - project: '{csit-list}' block: true predefined-parameters: - BUNDLEURL=$BUNDLEURL + BUNDLE_URL=$BUNDLE_URL publishers: - email-notification: @@ -215,17 +217,15 @@ build-days-to-keep: '{build-days-to-keep}' parameters: - - integration-bundleurl: - bundleurl: '{bundleurl}' - - integration-jdk-version: - jdkversion: '{jre}' + - integration-bundle-url: + bundle-url: '{bundle-url}' builders: - trigger-builds: - project: '{csit-sanity-list}' block: true predefined-parameters: - BUNDLEURL=$BUNDLEURL + BUNDLE_URL=$BUNDLE_URL publishers: - email-notification: @@ -242,7 +242,6 @@ project-type: freestyle node: centos7-java-builder-2c-8g - jdk: '{jdk}' properties: - opendaylight-infra-properties: @@ -257,6 +256,8 @@ artifacts: '{archive-artifacts} **/dependency_tree.txt' - integration-distribution-branch: branch: '{branch}' + - distribution-karaf-version: + karaf-version: '{karaf-version}' - integration-distribution-git-url: git-url: '{git-url}' - maven-exec: @@ -324,13 +325,14 @@ settings-type: cfp global-settings: odl-global-settings global-settings-type: cfp - - distribution-check-deploy-distribution: + - integration-upload-distribution: dist-pom: distribution/pom.xml - trigger-builds: - project: '{csit-list}' block: true - predefined-parameters: - BUNDLEURL=$BUNDLE_URL + predefined-parameters: | + BUNDLE_URL=$BUNDLE_URL + KARAF_VERSION=$KARAF_VERSION publishers: - opendaylight-infra-shiplogs: @@ -360,8 +362,8 @@ # 8. Start the job with your parameters, see https://wiki.opendaylight.org/view/Integration/Test/Running_System_Tests#Running_System_Tests_Using_Custom_Distribution_Built_From_Multiple_Patches # 9. The multipatch job waits for the csit job to finish, so abort csit if you see something went wrong. # 10. Navigate to Sandbox page of the csit job, click the run triggered from multipatch. - # 11. Click Parameters and copy the long value of BUNDLEURL field to clipboard. - # 12. Run the same csit job woth different patchset or test options, or other csit jobs, with this BUNDLEURL value + # 11. Click Parameters and copy the long value of BUNDLE_URL field to clipboard. + # 12. Run the same csit job woth different patchset or test options, or other csit jobs, with this BUNDLE_URL value # so you do not have to wait for multipatch build. Repeat step 12. # 13. Currently, the .zip lasts 24 hours (?) so you may need to jump to step 2 (or 0) after some time. @@ -380,6 +382,8 @@ run-test: 'false' - integration-distribution-branch: branch: '{branch}' + - distribution-karaf-version: + karaf-version: '{karaf-version}' - opendaylight-infra-parameters: os-cloud: '{os-cloud}' project: 'integration/distribution' @@ -414,7 +418,7 @@ settings-type: cfp global-settings: odl-global-settings global-settings-type: cfp - - distribution-check-deploy-distribution: + - integration-upload-distribution: dist-pom: patch_tester/distribution/pom.xml - conditional-step: condition-kind: boolean-expression @@ -423,8 +427,9 @@ - trigger-builds: - project: '{csit-list}' block: true - predefined-parameters: - BUNDLEURL=$BUNDLE_URL + predefined-parameters: | + BUNDLE_URL=$BUNDLE_URL + KARAF_VERSION=$KARAF_VERSION publishers: - opendaylight-infra-shiplogs: @@ -444,10 +449,8 @@ build-days-to-keep: '{build-days-to-keep}' parameters: - - integration-bundleurl: - bundleurl: '{bundleurl}' - - integration-jdk-version: - jdkversion: '{jre}' + - integration-bundle-url: + bundle-url: '{bundle-url}' triggers: - timed: '{schedule-weekly}' @@ -457,7 +460,7 @@ - project: '{csit-weekly-list}' block: true predefined-parameters: - BUNDLEURL=$BUNDLEURL + BUNDLE_URL=$BUNDLE_URL publishers: - email-notification: @@ -475,8 +478,8 @@ build-days-to-keep: '{build-days-to-keep}' parameters: - - integration-bundleurl: - bundleurl: '{bundleurl}' + - integration-bundle-url: + bundle-url: '{bundle-url}' - integration-jdk-version: jdkversion: '{jre}' @@ -488,7 +491,7 @@ - project: '{csit-high-frequency-list}' block: true predefined-parameters: - BUNDLEURL=$BUNDLEURL + BUNDLE_URL=$BUNDLE_URL publishers: - email-notification: