X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=b71eea9d5514b5e34a8d7c887c5819717d26fa86;hb=5d4341b46a6d1875befc576ebc63d385ebd48181;hp=69795b620d8094e1e944960c3b9bd6bfa17a818f;hpb=4b83ecbf0a1eb4f2bf88bb36473d98de28ff8da5;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 69795b620..b71eea9d5 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -15,7 +15,7 @@ # opendaylight-infra-parameters: main project integration/test ($PROJECT) # jre: (openjdk7 or openjdk8) Java runtime environment to use when launching ODL # integration-distribution-branch: distribution branch ($DISTROBRANCH) -# integration-controller-bundleurl: distribution URL ($BUNDLEURL) +# integration-controller-bundle-url: distribution URL ($BUNDLE_URL) # integration-controller-scope: only or all features ($CONTROLLERSCOPE) # integration-controller-features: features under test ($CONTROLLER FEATURES) # integration-test-options: robot options ($TESTOPTIONS) @@ -48,8 +48,8 @@ branch: '{verify-branch}' - integration-distribution-stream: stream: '{verify-stream}' - - integration-bundleurl: - bundleurl: '{bundleurl}' + - integration-bundle-url: + bundle-url: '{bundle-url}' - integration-controller-scope: controller-scope: 'only' - integration-controller-features: @@ -62,6 +62,8 @@ test-plan: '{project}-{functionality}.txt' - integration-jdk-version: jdkversion: '{verify-jdkversion}' + - distribution-karaf-version: + karaf-version: '{verify-karaf-version}' scm: - integration-gerrit-scm: @@ -95,9 +97,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 @@ -114,6 +114,7 @@ - job-template: name: '{project}-csit-1node-{functionality}-{install}-{stream}' + # Keep synchronized with *-csit4-*-carbon please. disabled: false project-type: freestyle @@ -134,8 +135,8 @@ branch: '{branch}' - integration-distribution-stream: stream: '{stream}' - - integration-bundleurl: - bundleurl: '{bundleurl}' + - integration-bundle-url: + bundle-url: '{bundle-url}' - integration-controller-scope: controller-scope: '{scope}' - integration-controller-features: @@ -150,6 +151,8 @@ branch: 'master' - integration-jdk-version: jdkversion: '{jre}' + - distribution-karaf-version: + karaf-version: '{karaf-version}' scm: - integration-gerrit-scm: @@ -176,9 +179,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 @@ -244,8 +245,8 @@ branch: '{branch}' - integration-distribution-stream: stream: '{stream}' - - integration-bundleurl: - bundleurl: '{bundleurl}' + - integration-bundle-url: + bundle-url: '{bundle-url}' - integration-controller-scope: controller-scope: '{scope}' - integration-controller-features: @@ -260,6 +261,8 @@ branch: 'master' - integration-jdk-version: jdkversion: '{jre}' + - distribution-karaf-version: + karaf-version: '{karaf-version}' scm: - integration-gerrit-scm: @@ -286,9 +289,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 @@ -466,8 +467,8 @@ branch: '{verify-branch}' - integration-distribution-stream: stream: '{verify-stream}' - - integration-bundleurl: - bundleurl: '{bundleurl}' + - integration-bundle-url: + bundle-url: '{bundle-url}' - integration-controller-scope: controller-scope: 'only' - integration-controller-features: @@ -480,6 +481,8 @@ test-plan: '{project}-{functionality}.txt' - integration-jdk-version: jdkversion: '{verify-jdkversion}' + - distribution-karaf-version: + karaf-version: '{verify-karaf-version}' scm: - integration-gerrit-scm: @@ -513,9 +516,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-configure-clustering - integration-start-cluster-run-test - integration-cleanup-tmp @@ -553,8 +554,8 @@ branch: '{branch}' - integration-distribution-stream: stream: '{stream}' - - integration-bundleurl: - bundleurl: '{bundleurl}' + - integration-bundle-url: + bundle-url: '{bundle-url}' - integration-controller-scope: controller-scope: '{scope}' - integration-controller-features: @@ -569,6 +570,8 @@ branch: 'master' - integration-jdk-version: jdkversion: '{jre}' + - distribution-karaf-version: + karaf-version: '{karaf-version}' scm: - integration-gerrit-scm: @@ -595,9 +598,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-configure-clustering - integration-start-cluster-run-test - integration-cleanup-tmp @@ -662,8 +663,8 @@ branch: '{branch}' - integration-distribution-stream: stream: '{stream}' - - integration-bundleurl: - bundleurl: '{bundleurl}' + - integration-bundle-url: + bundle-url: '{bundle-url}' - integration-controller-scope: controller-scope: '{scope}' - integration-controller-features: @@ -678,6 +679,8 @@ branch: 'master' - integration-jdk-version: jdkversion: '{jre}' + - distribution-karaf-version: + karaf-version: '{karaf-version}' scm: - integration-gerrit-scm: @@ -704,9 +707,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-configure-clustering - integration-start-cluster-run-test - integration-cleanup-tmp @@ -773,8 +774,8 @@ branch: '{branch}' - integration-distribution-stream: stream: '{stream}' - - integration-bundleurl: - bundleurl: '{bundleurl}' + - integration-bundle-url: + bundle-url: '{bundle-url}' - integration-controller-scope: controller-scope: '{scope}' - integration-controller-features: @@ -789,6 +790,8 @@ branch: 'master' - integration-jdk-version: jdkversion: '{jre}' + - distribution-karaf-version: + karaf-version: '{karaf-version}' scm: - integration-gerrit-scm: @@ -815,9 +818,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-configure-clustering - integration-start-cluster-run-test - integration-cleanup-tmp @@ -997,8 +998,8 @@ branch: '{branch}' - integration-distribution-stream: stream: '{stream}' - - integration-bundleurl: - bundleurl: '{bundleurl}' + - integration-bundle-url: + bundle-url: '{bundle-url}' - integration-controller-features: controller-features: '{install-features}' - integration-test-options: @@ -1009,6 +1010,8 @@ branch: 'master' - integration-jdk-version: jdkversion: '{jre}' + - distribution-karaf-version: + karaf-version: '{karaf-version}' - string: name: OPENSTACK_BRANCH default: '{openstack-branch}' @@ -1038,6 +1041,10 @@ name: DEVSTACK_LBAAS_PLUGIN_REPO default: '{devstack-lbaas-plugin-repo}' description: 'URL to fetch neutron-lbaas devstack plugin' + - string: + name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO + default: '{devstack-networking-sfc-plugin-repo}' + description: 'URL to fetch neutron-lbaas devstack plugin' - string: name: ODL_ENABLE_L3_FWD default: '{odl-enable-l3}' @@ -1086,10 +1093,6 @@ name: NETWORKING_L2GW_DRIVER default: '{networking-l2gw-repo}' description: 'URL to fetch networking-l2gw driver' - - string: - name: DISABLE_ODL_L3_PLUGIN - default: '{disable-odl-l3-service-plugin}' - description: 'Disable odl l3 service plugin' - string: name: CREATE_INITIAL_NETWORKS default: '{create-initial-networks}' @@ -1099,6 +1102,14 @@ default: '{lbaas-service-provider}' description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using neutron-lbaas' + - string: + name: ODL_SFC_DRIVER + default: '{odl-sfc-driver}' + description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc' + - string: + name: ODL_SNAT_MODE + default: '{odl-snat-mode}' + description: 'The SNAT mode to be configured - options are conntrack/controller.' scm: - integration-gerrit-scm: basedir: 'test' @@ -1129,9 +1140,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-deploy-openstack-run-test - integration-cleanup-tmp @@ -1170,8 +1179,8 @@ branch: '{branch}' - integration-distribution-stream: stream: '{stream}' - - integration-bundleurl: - bundleurl: '{bundleurl}' + - integration-bundle-url: + bundle-url: '{bundle-url}' - integration-controller-features: controller-features: '{install-features}' - integration-test-options: @@ -1182,6 +1191,8 @@ branch: 'master' - integration-jdk-version: jdkversion: '{jre}' + - distribution-karaf-version: + karaf-version: '{karaf-version}' - string: name: OPENSTACK_BRANCH default: '{openstack-branch}' @@ -1211,6 +1222,10 @@ name: DEVSTACK_LBAAS_PLUGIN_REPO default: '{devstack-lbaas-plugin-repo}' description: 'URL to fetch neutron-lbaas devstack plugin' + - string: + name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO + default: '{devstack-networking-sfc-plugin-repo}' + description: 'URL to fetch neutron-lbaas devstack plugin' - string: name: ODL_ENABLE_L3_FWD default: '{odl-enable-l3}' @@ -1259,10 +1274,6 @@ name: NETWORKING_L2GW_DRIVER default: '{networking-l2gw-repo}' description: 'URL to fetch networking-l2gw driver' - - string: - name: DISABLE_ODL_L3_PLUGIN - default: '{disable-odl-l3-service-plugin}' - description: 'Disable odl l3 service plugin' - string: name: CREATE_INITIAL_NETWORKS default: '{create-initial-networks}' @@ -1272,6 +1283,19 @@ default: '{lbaas-service-provider}' description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using neutron-lbaas' + - string: + name: NUM_OPENSTACK_SITES + default: '{num-openstack-sites}' + description: 'Number of openstack sites' + - string: + name: ODL_SFC_DRIVER + default: '{odl-sfc-driver}' + description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc' + - string: + name: ODL_SNAT_MODE + default: '{odl-snat-mode}' + description: 'The SNAT mode to be configured - options are conntrack/controller.' + scm: - integration-gerrit-scm: basedir: 'test' @@ -1300,9 +1324,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-deploy-openstack-run-test - integration-cleanup-tmp @@ -1326,7 +1348,7 @@ - job-template: name: '{project}-patch-test-{feature}-{stream}' - project-type: maven + project-type: freestyle node: centos7-java-builder-2c-8g concurrent: true jdk: '{jdk}' @@ -1340,16 +1362,20 @@ os-cloud: '{os-cloud}' project: '{project}' branch: '{branch}' - refspec: '$GERRIT_REFSPEC' + refspec: 'refs/heads/{branch}' artifacts: '{archive-artifacts}' - integration-distribution-branch: branch: '{branch}' + - distribution-karaf-version: + karaf-version: 'karaf3' - integration-distribution-git-url: git-url: '{git-url}' - string: name: feature default: 'all' description: 'Specific feature test for patch' + - maven-exec: + maven-version: mvn33 scm: - integration-gerrit-scm: @@ -1383,56 +1409,47 @@ unstable: true notbuilt: true - prebuilders: + builders: - integration-rebase-gerrit-patch - - integration-get-bundle-url - - inject: - properties-file: 'bundle.txt' - wipe-org-opendaylight-repo - - provide-maven-settings: - global-settings-file: 'odl-global-settings' - settings-file: 'integration-settings' - maven-target: - maven-version: 'mvn33' + maven-version: mvn33 pom: '{project}/pom.xml' - goals: > + goals: | clean install dependency:tree - -V -B -Pq + -Pq -Dgitid.skip=false - -Djenkins -DgenerateReports=false - -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream} + {opendaylight-infra-mvn-opts} java-opts: - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - settings: 'integration-settings' + settings: integration-settings settings-type: cfp - global-settings: 'odl-global-settings' + global-settings: odl-global-settings global-settings-type: cfp - - maven: - maven-name: 'mvn33' - root-pom: 'distribution/pom.xml' - goals: > - clean install dependency:tree - -V -B -Pq - -Dgitid.skip=false - -Djenkins - -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r - maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - settings: 'integration-settings' - settings-type: cfp - global-settings: 'odl-global-settings' - global-settings-type: cfp - ignore-upstream-changes: true - post-step-run-condition: 'SUCCESS' - - postbuilders: + - maven-target: + maven-version: mvn33 + pom: distribution/pom.xml + goals: | + clean install dependency:tree + -Pq + -Dgitid.skip=false + {opendaylight-infra-mvn-opts} + java-opts: + - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + settings: integration-settings + settings-type: cfp + global-settings: odl-global-settings + global-settings-type: cfp + - integration-upload-distribution: + dist-pom: distribution/pom.xml - trigger-builds: - project: '{csit-list}' block: true - predefined-parameters: - BUNDLEURL=$BUNDLEURL + predefined-parameters: | + BUNDLE_URL=$BUNDLE_URL + KARAF_VERSION=$KARAF_VERSION publishers: - email-notification: