Merge "Update Ubuntu 14.04 image"
authorAndrew Grimberg <agrimberg@linuxfoundation.org>
Thu, 10 May 2018 23:10:36 +0000 (23:10 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 10 May 2018 23:10:36 +0000 (23:10 +0000)
175 files changed:
docs/jenkins.rst
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-csit-keystone.yaml
jjb/aaa/aaa-csit-tls.yaml
jjb/aaa/aaa-patch-test.yaml
jjb/aaa/aaa.yaml
jjb/atrium/atrium.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/compare-autorelease-projects.sh
jjb/autorelease/prepare-release.sh
jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-userfeatures.yaml
jjb/bgpcep/bgpcep-patch-test.yaml
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier-csit-basic.yaml
jjb/bier/bier.yaml
jjb/capwap/capwap-csit-ac.yaml
jjb/capwap/capwap.yaml
jjb/cardinal/cardinal.yaml
jjb/centinel/centinel-csit-basic.yaml
jjb/centinel/centinel.yaml
jjb/coe/coe.yaml
jjb/controller/controller-csit-akka1.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-cs-chasing-leader.yaml
jjb/controller/controller-csit-cs-partnheal.yaml
jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
jjb/controller/controller-csit-dnb-noloss.yaml
jjb/controller/controller-csit-drb-partnheal.yaml
jjb/controller/controller-csit-drb-precedence.yaml
jjb/controller/controller-csit-dsbenchmark-cluster.yaml
jjb/controller/controller-csit-dsbenchmark.yaml
jjb/controller/controller-csit-rest-cars-perf.yaml
jjb/controller/controller-csit-rest-clust-cars-perf.yaml
jjb/controller/controller.yaml
jjb/coretutorials/coretutorials.yaml
jjb/didm/didm-csit-discovery.yaml
jjb/didm/didm.yaml
jjb/dlux/dlux.yaml
jjb/docs/docs-rtd.yaml
jjb/eman/eman.yaml
jjb/faas/faas.yaml
jjb/federation/federation.yaml
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius-patch-test.yaml
jjb/genius/genius.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/infrautils/infrautils-patch-test.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/distribution/distribution-check-bootup.sh
jjb/integration/distribution/distribution-deploy-offline.sh [deleted file]
jjb/integration/distribution/distribution-deploy-verify.sh [deleted file]
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/distribution/distribution-macros.yaml
jjb/integration/distribution/distribution-templates.yaml
jjb/integration/distribution/distribution.yaml [deleted file]
jjb/integration/integration-compare-distributions.sh
jjb/integration/integration-configure-clustering.sh
jjb/integration/integration-deploy-controller-run-test.sh
jjb/integration/integration-deploy-openstack-run-test.sh
jjb/integration/integration-detect-variables.sh
jjb/integration/integration-macros.yaml
jjb/integration/integration-set-variables.sh
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/integration/integration-upload-distribution.sh
jjb/integration/multipatch-distribution.sh
jjb/iotdm/iotdm-csit-basic.yaml
jjb/iotdm/iotdm.yaml
jjb/jsonrpc/jsonrpc-csit-basic.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch-patch-test.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp-csit-lacp.yaml
jjb/lacp/lacp.yaml
jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal-csit-bindingv1.yaml
jjb/mdsal/mdsal.yaml
jjb/messaging4transport/messaging4transport-csit-basic.yaml
jjb/messaging4transport/messaging4transport.yaml
jjb/natapp/natapp-csit-basic.yaml [deleted file]
jjb/natapp/natapp.yaml
jjb/nemo/nemo-csit-engine.yaml
jjb/nemo/nemo.yaml
jjb/netide/netide-csit-basic.yaml
jjb/netide/netide.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-full-integration.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron.yaml
jjb/next/next.yaml
jjb/nic/nic-csit-basic.yaml
jjb/nic/nic.yaml
jjb/ocpplugin/ocpplugin-csit-basic.yaml
jjb/ocpplugin/ocpplugin-csit-scalability.yaml
jjb/ocpplugin/ocpplugin.yaml
jjb/odlparent/odlparent.yaml
jjb/of-config/of-config-csit-basic.yaml
jjb/of-config/of-config.yaml
jjb/ofextensions/circuitsw/circuitsw.yaml
jjb/openflowjava/openflowjava.yaml
jjb/opflex/opflex-custom.yaml
jjb/opflex/opflex-thirdparty-dependencies.yaml
jjb/opflex/opflex.yaml
jjb/ovsdb/ovsdb-csit-clustering.yaml
jjb/ovsdb/ovsdb-csit-southbound.yaml
jjb/ovsdb/ovsdb-patch-test.yaml
jjb/ovsdb/ovsdb.yaml
jjb/packetcable/packetcable-csit-pcmm.yaml
jjb/packetcable/packetcable.yaml
jjb/persistence/persistence.yaml
jjb/releng-defaults.yaml
jjb/releng-jobs.yaml
jjb/releng-macros.yaml
jjb/reservation/reservation.yaml
jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/sfc/sfc-csit-full-deploy.yaml
jjb/sfc/sfc-csit-rest-basic.yaml
jjb/sfc/sfc-patch-test.yaml
jjb/sfc/sfc-python.yaml
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp-csit-basic.yaml
jjb/sxp/sxp-csit-cluster-routing.yaml
jjb/sxp/sxp-csit-clustering.yaml
jjb/sxp/sxp-csit-filtering.yaml
jjb/sxp/sxp-csit-performance.yaml
jjb/sxp/sxp-csit-topology.yaml
jjb/sxp/sxp.yaml
jjb/systemmetrics/systemmetrics.yaml
jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
jjb/topoprocessing/topoprocessing.yaml
jjb/transportpce/transportpce.yaml
jjb/tsdr/tsdr-csit-cassandra.yaml
jjb/tsdr/tsdr-csit-elasticsearch.yaml
jjb/tsdr/tsdr-csit-hbase.yaml
jjb/tsdr/tsdr-csit-hsqldb.yaml
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.yaml
jjb/unimgr/unimgr-csit-basic.yaml
jjb/unimgr/unimgr-csit-legato.yaml
jjb/unimgr/unimgr.yaml
jjb/usc/usc-csit-channel.yaml
jjb/usc/usc-csit-tcp.yaml
jjb/usc/usc.yaml
jjb/usecplugin/usecplugin-csit-basic.yaml
jjb/usecplugin/usecplugin.yaml
jjb/yang-push/yang-push.yaml
jjb/yangide/yangide.yaml
jjb/yangtools/yangtools-csit-system.yaml
jjb/yangtools/yangtools.yaml

index 93c5bdf6eec32550604a5c9699e90c6a157af901..25e5370f922310a886152e8906f3009194590286 100644 (file)
@@ -805,6 +805,11 @@ TODO: Document test-{project}-{feature} and test-{project}-all.
           cherry-pick 59/60259/17 and build netvirt, finally it will checkout latest distribution
           code and build a distribution. The resulting distribution is stored in Nexus and the URL
           is stored in a variable called BUNDLE_URL visible in the job console.
+          This job also accepts a gerrit topic, for example: multipatch-build:topic=binding-tlc-rpc,
+          in this case the job will find all patches in the topic binding-tlc-rpc for the projects
+          specified in the BUILD_ORDER parameter and will build all projects from the first a patch
+          has been found, for successive projects the branch HEAD is used if no patch is found.
+          The job uses patch numbers to sort patches in the same project.
           Use multipatch-build-fast (vs multipatch-build) for building projects fast (-Pq).
           This job should not alter Gerrit votes for a given patch, nor will do anything with the
           given patch unless the patch is added to the build list.
index 1360004a598f190b47cac7cc292863c48b65e886..c085faa4fd207e8c4fbbc8bb82fce7c7e4a4054a 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 1be27c06ebfe72f9a740d469ad7afc5bdbb11831..8d0f33daf96e684b39b40b754d7cb623f05da58d 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index c557db0bb4ab501d5aeeae1352e0985184365399..5d6d1acb78d8b61685a1b44ce481631af658f19c 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index d630199be426fe47cd91fe978780a0a57c521398..2930bd0fbd14b521f223f78c309ec5d78608479c 100644 (file)
@@ -15,9 +15,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     feature:
       - authn:
index f4e71ff3d92a1964e146a5acf0316d279282e303..129604754080692f4c89a586ef41ef1af58e2511 100644 (file)
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
 
-- project:
-    name: aaa-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'aaa'
-    project-name: 'aaa'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'aaa-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 9318cf3c82c33
-
 - project:
     name: aaa-sonar
     jobs:
index 56db31b84f5155f3c8f42b6400153ed0a3a800ef..774cb25760ac6d8e4944dcc6fece52b1a14fcb62 100644 (file)
     # Used by the release job
     staging-profile-id: 9324f12310e6a
 
-- project:
-    name: atrium-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'atrium'
-    project-name: 'atrium'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'atrium-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[atrium]'
-
-    # Used by the release job
-    staging-profile-id: 9324f12310e6a
-
 - project:
     name: atrium-sonar
     jobs:
index 4c8bef7b4f68758e4fcfb2b4b5922fa7f6ed8bcb..4873455ff893e1b228646b2b0b5941a2eec8e765 100644 (file)
       - '{project-name}-validate-autorelease-{stream}'
       - gerrit-tox-verify
 
-    # todo: After Carbon EOL remove next-release-tag and directy pass
-    # '{stream}' to autorelease-release-tag parameter
     stream:
       - fluorine:
-          next-release-tag: '{stream}'
           branch: 'master'
           integration-test: fluorine
           extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
       - oxygen:
           # Run once a week (Sunday) until Nitrogen-SR3 is out.
           cron: 'H 12 * * 6'
-          next-release-tag: '{stream}'
           branch: 'stable/oxygen'
           integration-test: oxygen
           extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
       - nitrogen:
-          next-release-tag: '{stream}'
           branch: 'stable/nitrogen'
           integration-test: nitrogen
           extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
index 7e5138f08f15b3032967a02ffc3b32c5ad125e0e..b528cf1216b6318f4e0e00add3dc7c4aab2a536a 100644 (file)
@@ -87,7 +87,7 @@
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - autorelease-release-tag:
-          release-tag: '{next-release-tag}'
+          release-tag: '{stream}'
       - string:
           name: EXTRA_MVN_OPTS
           default: '{extra-mvn-opts}'
           - project: 'integration-distribution-test-{integration-test}'
             condition: FAILED
             trigger-with-no-params: true
-          - project: 'integration-sanity-test-{integration-test}'
-            condition: UNSTABLE_OR_BETTER
-            property-file: variables.jenkins-trigger
-            fail-on-missing: true
-          - project: 'integration-sanity-test-{integration-test}'
-            condition: FAILED
-            trigger-with-no-params: true
           - project: 'packaging-build-rpm-{stream}'
             condition: UNSTABLE_OR_BETTER
             predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
     builders:
       - autorelease-update-project-views
       - autorelease-update-validate-projects
-      - opendaylight-infra-push-gerrit-patch:
-          project: 'releng/builder'
+      - lf-infra-push-gerrit-patch:
+          project: '{project}'
+          gerrit-user: 'jenkins-$SILO'
+          gerrit-host: 'git.opendaylight.org'
           gerrit-topic: 'autorelease-update-validate-jobs-{stream}'
           gerrit-commit-message: |
-              Update validate autorelease projects for {stream}
+              'Update validate autorelease projects for {stream}'
+          reviewers-email: 'release@lists.opendaylight.org'
 
     publishers:
       - lf-infra-publish
           lftools-version: '{lftools-version}'
       - string:
           name: RELEASE_TAG
-          default: '{next-release-tag}'
+          default: '{stream}'
           description: |
               Release that is being version bumped.
               Eg. Lithium, Beryllium, Boron, Carbon, Carbon-SR1, Carbon-SR2...
index dfcd933ffccc391683a234c96bd7f67629275135..9458429a760395c70ed05fe6f699ce9017f4f2ae 100644 (file)
@@ -16,8 +16,8 @@ echo "---> compare-autorelease-projects.sh"
 # are equal to the list of projects in integration/distribution.
 
 # Note: int/dist pom files uses templates only since Oxygen release.
-# Todo: Remove this check after Carbon and Nitrogen EOL
-if [[ $STREAM =~ carbon ]] || [[ $STREAM =~ nitrogen ]]; then
+# Todo: Remove this check after Nitrogen EOL
+if [[ $STREAM =~ nitrogen ]]; then
     exit 0
 fi
 
index ca3174cb56044c0237d47977ca1670cfc703e96e..a2b8abc3dc93694b2bb5e36cfd220a2c0acc0ef3 100644 (file)
@@ -37,17 +37,8 @@ git submodule foreach "echo \$path \$(git rev-parse --verify HEAD) ${RELEASE_TAG
     | tee -a $PATCH_DIR/taglist.log"
 
 echo "$RELEASE_TAG"
-# Remove this case statement when Carbon is no longer supported.
-# Nitrogen onwards we do not want to use the release tag so simply need to
-# strip xml files of -SNAPSHOT tags.
-case "$RELEASE_TAG" in
-    Carbon*)
-        lftools version release "$RELEASE_TAG"
-        ;;
-    *)
-        find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//'
-        ;;
-esac
+find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//'
+
 git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true"
 git commit -am "Release $RELEASE_TAG"
 
index 14ec6d49e14ad5b599d30cd84fe91e0ab17922dd..210728107287a07bdc16078cacea12f5e0d91e75 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 761ce78093fe1b202bcf68e6728a865af22aebfe..4519cfad54a2d72830ffd97e1a34486dd5966c5f 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index ad009f9f6ef675e350dab5d7593c6a9ed3bf3e07..145040d3747fb6d46a3f8c7389ad4ea80dcabec2 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
@@ -48,4 +45,3 @@
 
     # Controller configuration
     odl_system_flavor: odl-standard-4
-
index 137abb967c639bcbf853476298f40e0f43a60b9b..c2cf626640e4024cdeb66a88cd72e6b04102be46 100644 (file)
               odl-restconf,
               odl-bgpcep-bgp,
               odl-bgpcep-bgp-config-example
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-bgp,
-              odl-bgpcep-bgp-config-example
 
     install:
       - only:
index ee8e9d37a0d7a6404ad57cc415145b5121bab98b..bc8c1941f0772fdbdd6bc93725e8294ee427eb54 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index 1c2d76d71d900432331eeaa4bc53620586c3ce0b..7fdae26ebe920fcb1001a824fb14ee98e1a79f93 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 904d097ed2efca47920ed018f087fdbb8bbe7a41..da17fd3588ad48edb133265efe0a083bbb1ebdd2 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index f2e183547dec69e66d29d0ce86c70305148c7134..23b665162ec849e3beee06757f6741043b58a157 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index a0316bfedc92278bf7d85bdf6bdadb9f32199c42..dfb6adbfefdff1dccca8548e519bfd5c92564dbc 100644 (file)
@@ -21,9 +21,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index f1e6f274ae7b108e1d5c10b7b35384578e0f039b..5e8d35d69825a3a64add49293c80f68a874b75e7 100644 (file)
@@ -15,9 +15,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     feature:
       - bgp:
index a05817ddb899d389d791e37a554ee097b249dad1..412da001366bd4d6e11dc1a7d5eb5ec7a5c4eb50 100644 (file)
     # Used by the release job
     staging-profile-id: 9427a05049030
 
-- project:
-    name: bgpcep-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'bgpcep'
-    project-name: 'bgpcep'
-    build-node: centos7-builder-8c-8g
-    build-timeout: 120
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'bgpcep-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        mdsal-merge-{stream},
-        tcpmd5-merge-{stream}
-    email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
-
-    # Used by the release job
-    staging-profile-id: 9427a05049030
-
 - project:
     name: bgpcep-sonar
     jobs:
index afeed6b873acf596a3fe88cefcce485cb479bbd8..66b7c414376cb6e1cf0c83acd628063de703d004 100644 (file)
@@ -23,9 +23,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: 'karaf3'
 
     verify-stream: 'nitrogen'
     verify-branch: 'stable/nitrogen'
index b0c17783ee8beb3a39bfbc8abb8302585ebdc60c..ba53880bf4d9e5dea545da13c6bc2c6da2751f5e 100644 (file)
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
 
-- project:
-    name: bier-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'bier'
-    project-name: 'bier'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[bier]'
-
-    # Used by the release job
-    staging-profile-id: 942a8075b1f2a
-
 - project:
     name: bier-sonar
     jobs:
index 023718a5c970bd8188606bf682a5f65d048519a7..46f26c564934d431d9f324ae565e1cb7d327c245 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index d01c735b1f26a78c8ada9fac04cf78ef44339e95..7c684484aad339b6c7d99b75be10bdd48e9104b2 100644 (file)
     # Used by the release job
     staging-profile-id: 96bd6b5bf86e3
 
-- project:
-    name: capwap-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'capwap'
-    project-name: 'capwap'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'capwap-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[capwap]'
-
-    # Used by the release job
-    staging-profile-id: 96bd6b5bf86e3
-
 - project:
     name: capwap
     jobs:
index 3db33a8229583bff49d0630952d8ba5ba6f4c933..c2fe7cdfb3c10aade7c3fa2b85ecd4f4a5267fff 100644 (file)
     # Used by the release job
     staging-profile-id: 96be20348f0f2
 
-- project:
-    name: cardinal-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'cardinal'
-    project-name: 'cardinal'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'cardinal-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
-    email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
-
-    # Used by the release job
-    staging-profile-id: 96be20348f0f2
-
 - project:
     name: cardinal-sonar
     jobs:
index 7a4a45f52deafc7fe9dc049b54f74884c08522b9..709290183280f30e7b0347f3f5520bb5d0d73f41 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 71d0b5cedeaf6b1e9e3b307c04c7aaa79a274e88..5d8da824d08f129d9d4fddbbd0b8431232022819 100644 (file)
     # Used by the release job
     staging-profile-id: 96bf9b3fefd8a
 
-- project:
-    name: centinel-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'centinel'
-    project-name: 'centinel'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'centinel-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[centinel]'
-
-    # Used by the release job
-    staging-profile-id: 96bf9b3fefd8a
-
 - project:
     name: centinel-sonar
     jobs:
index 117d2be80bdc75b121121ca1136521dbb07f3b2b..6e27ebc45080b7858b88ac5f413031f69174ca39 100644 (file)
     # Used by the release job
     staging-profile-id: 96c0be46aac33
 
-- project:
-    name: coe-carbon
-    jobs:
-      - odl-maven-jobs
-
-    project: 'coe'
-    project-name: 'coe'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'coe-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96c0be46aac33
-
 - project:
     name: coe-sonar
     jobs:
index eb580fda54e04d67b1ae7b065ea2ad6dbda4354d..74f10a05999651faa5ab3f63e727b9d45e8b6316 100644 (file)
@@ -17,9 +17,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 23ffa331c93e34f33487d29ccfe5da99049b58b9..5123bc3884446853d97ab12edcb1296761cbce47 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index a6bd7ac4d1543d8c6e70da791cdcd0b0d0bcf5b3..5cff7f2cba21878e91a544636791aaa5adf2c116 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index a5130abf9e8c8450fe87e3f6edb13b1bbad54419..541a5dcd57616c4465b5182382e354c939fdbeba 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index 88a8e0c12bc2028f896dbd30f380438ebe5d9640..3d0d698879f7cbba3a7abbb87879c33e794e23cb 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index a95fdb06ca81346577aa4e926f701d59c4d0a3c5..a11f406427766618fcf2b046a1773e50556a22a8 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index 1743f1b1a9b1066fc6caeb168c8e535a232e6136..156522b5faca43faf34ace936545262af71b09ee 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index e79ebef997eca6e4fda445c19989e90310a82767..cb0ade8ab8a80583e9131d3efce90a5841a5259f 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index 41169c5ac3635068703a31d0e923a82dff67ea3a..f64faeddee20f51b7bd18d8fdffad30207c20492 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 344ebb88f777fe7e39866ccf1c8271b463f55db5..6edd8890945e39b1c7f7f2ab19935342a724a496 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 0c2b0fdfd27b826f851b7e5fc7dcf5cf5c07c43c..25ae2554579379e773955b474cbe6a90b88ea736 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 6cf7ecfeaf6ec650756cdfe04deb6cc4bab8c813..616bee0eebfd5a86d79bc1905fd2b5b141111290 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index 025a9e9a75d4b54d612dca89ba3fec384d73e7c2..ed072791dddcb0bb7284e633261eb45403e77963 100644 (file)
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
 
-- project:
-    name: controller-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'controller'
-    project-name: 'controller'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-    build-node: centos7-builder-8c-8g
-    build-timeout: 90
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: 96c1c9177efdd
-
 - project:
     name: controller-sonar
     jobs:
index 67d5754d2698c520eb808ef75ee1173b0afd98d4..78b683e7158f426724091dba686929fe0646f9bb 100644 (file)
     # Used by the release job
     staging-profile-id: 96cd299563ec6
 
-- project:
-    name: coretutorials-carbon
-    jobs:
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'coretutorials'
-    project-name: 'coretutorials'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'coretutorials-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[coretutorials]'
-    build-timeout: 120
-
-    # Used by the release job
-    staging-profile-id: 96cd299563ec6
-
 - project:
     name: coretutorials-sonar
     jobs:
index 4732b9b1c3c5a6ab432e61f47ec8faccd0d66033..ef01af1a4ed30241f64bec4af3f0c598f4f28183 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index fae22b5b67ac90e9f48d8301e5b2b82ef8d0df97..30fd8f6d5108b3a7227cbc2ab00adaabeaeb9837 100644 (file)
     # Used by the release job
     staging-profile-id: 96e6338c870f5
 
-- project:
-    name: didm-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'didm'
-    project-name: 'didm'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'didm-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[didm]'
-
-    # Used by the release job
-    staging-profile-id: 96e6338c870f5
-
 - project:
     name: didm-sonar
     jobs:
index 6356d44132fec9b28287e2a1be2b39637236ba25..e878163c46131ad9719990d7ab6058d4e3930bff 100644 (file)
     # Used by the release job
     staging-profile-id: 96e6a0327484f
 
-- project:
-    name: dlux-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: 96e6a0327484f
-
 - project:
     name: dlux-sonar
     jobs:
index 5e4639a097dcaa1a2f6a0104bed5684a5ed8b0be..1a8287d823d1a2474e749a87b0ecc1b8cc40533b 100644 (file)
@@ -12,8 +12,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
 
     project: docs
     project-name: docs
index c5fd3112e2a946f25f213719f128851d1539a8ec..31d0eba08fd4d7311cdf420e3d2e278f425d054a 100644 (file)
     # Used by the release job
     staging-profile-id: 96e9352979521
 
-- project:
-    name: eman-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'eman'
-    project-name: 'eman'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'eman-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[eman]'
-    build-node: centos7-builder-4c-16g
-
-    # Used by the release job
-    staging-profile-id: 96e9352979521
-
 - project:
     name: eman-sonar
     jobs:
index c01098b30185d68bd511cd74c01c014f0876592d..39bef773b45e026000bbc1062e700d0412beb123 100644 (file)
     # Used by the release job
     staging-profile-id: 96f5ac591d858
 
-- project:
-    name: faas-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'faas'
-    project-name: 'faas'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'faas-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[faas]'
-
-    # Used by the release job
-    staging-profile-id: 96f5ac591d858
-
 - project:
     name: faas-sonar
     jobs:
index a0ded3310c10d20536a0b33d6cd4eff34cfddb64..30fa052fa9236a3d496826e4e9191a47357c01c5 100644 (file)
     # Used by the release job
     staging-profile-id: 96f78c7a40a24
 
-- project:
-    name: federation-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    project: 'federation'
-    project-name: 'federation'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'federation-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[federation] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96f78c7a40a24
-
 - project:
     name: federation-sonar
     jobs:
index c46ed7ed0aca412423aa41acec79cf348a751600..7fcab6c0bf70406fea718ae63b19856c3071a37a 100644 (file)
@@ -43,9 +43,6 @@
     stream:
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     testplan: 'genius-carbon-nitrogen.txt'
 
index 5b0ee7f92a9c0526c50dbd2db5aaad3471d39e3d..64c7817bfd3310d625ef8614f8622df99f37f12d 100644 (file)
       - nitrogen:
           branch: 'stable/nitrogen'
           os-branch: 'pike'
-      - carbon:
-          branch: 'stable/carbon'
-          os-branch: 'ocata'
-          karaf-version: karaf3
 
     jdk: 'openjdk8'
 
index e70e2fa96974eecc9c826225c4d5e52c33db201c..bd092cc1ca7360af63a477236b2977ef68ee26dc 100644 (file)
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
 
-- project:
-    name: genius-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream}
-    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-
-    # Used by the release job
-    staging-profile-id: 96fb4b6d9d1ee
-
 - project:
     name: genius-sonar
     jobs:
index a8442ad784172b632586b52d80c283d7c85fd273..c71f008464c44231066f3d2435a2db44a380ff52 100644 (file)
       - nitrogen:
           branch: 'stable/nitrogen'
           install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-          install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf'
 
     openstack:
       - ocata:
index 53b6f757856918bd395d7fc548f3fff9eb922957..4467a8f6d0aa0032e4991439cf4c3b60ffcc1f0a 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 1444524aa5ce9c6129b6c29df215c69782590107..6c160b554ee743717ca02a8b1a65299384a35b02 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 675fdf0c257563573cfe5fa8c93b58b2cba54812..75c71ffbee854a41dab9c49e4b51419ed0af680d 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index be355c2fc5965d6de18f24d26196f8073e6a7a61..f193d5e311e68fe648462fe08015d7ac9518fe55 100644 (file)
@@ -17,9 +17,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index 678ed3629509f7c11e4484f663283358d83bd88b..f7cdd20571eac7db12b7815cdb36ac21289b07bb 100644 (file)
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
 
-- project:
-    name: groupbasedpolicy-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'groupbasedpolicy'
-    project-name: 'groupbasedpolicy'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream},
-        sfc-merge-{stream},
-        ovsdb-merge-{stream}
-    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
-
-    # Used by the release job
-    staging-profile-id: 96fbb93f95a76
-
 - project:
     name: groupbasedpolicy-sonar
     jobs:
index 90cb5157447e96fd6eeb19ccd2cb977c1f0e22d3..ec193bb095994a1efec9e1bf61fd81eac49649dd 100644 (file)
     # Used by the release job
     staging-profile-id: 96fc362c36862
 
-- project:
-    name: vbd-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'honeycomb/vbd'
-    project-name: 'vbd'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'honeycomb-vbd-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[vbd]'
-
-    # Used by the release job
-    staging-profile-id: 96fc362c36862
-
 - project:
     name: vbd-sonar
     jobs:
index 7eceb9a3799749a2af8550de5c0de7a39d606557..34a5f96907343905536423cafbaa521ae40e040b 100644 (file)
       - nitrogen:
           branch: 'stable/nitrogen'
           os-branch: 'pike'
-      - carbon:
-          branch: 'stable/carbon'
-          os-branch: 'ocata'
-          karaf-version: karaf3
 
     jdk: 'openjdk8'
 
index bfec7c881d6e37611f9eae0f3fa4c18cb2ef0eb7..0390cc3a0eb3d2e239589e54ca72a2535edbf67c 100644 (file)
     # Used by the release job
     staging-profile-id: 96fca0367756c
 
-- project:
-    name: infrautils-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'infrautils'
-    project-name: 'infrautils'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'infrautils-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[infrautils] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: 96fca0367756c
-
 - project:
     name: infrautils-sonar
     jobs:
index 35076e1fc09ad550a9f0feae86a256a093cd2522..ece342a28a590b228a267f0f3649adc61dcca2fe 100644 (file)
@@ -1,10 +1,9 @@
-
 CONTROLLERMEM="3072m"
 ACTUALFEATURES="odl-integration-all"
-BUNDLEVERSION="$(xpath distribution/pom.xml '/project/version/text()' 2> /dev/null)"
-BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}"
-BUNDLE="${BUNDLEFOLDER}.zip"
-BUNDLE_PATH="/tmp/r/org/opendaylight/integration/${KARAF_ARTIFACT}/${BUNDLEVERSION}/${BUNDLE}"
+
+if [[ ! -z "${CONTROLLERFEATURES}" ]]; then
+    ACTUALFEATURES="odl-integration-all,${CONTROLLERFEATURES}"
+fi
 
 echo "Kill any controller running"
 ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
@@ -12,20 +11,28 @@ ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
 echo "Clean Existing distribution"
 rm -rf ${BUNDLEFOLDER}
 
-echo "Copying the distribution..."
-cp "${BUNDLE_PATH}" .
+echo "Fetch the distribution..."
+if  [[ -z "${BUNDLE_PATH}" ]]; then
+    wget --progress=dot:mega  "${ACTUAL_BUNDLE_URL}"
+else
+    cp "${BUNDLE_PATH}" .
+fi
 
 echo "Extracting the new controller..."
 unzip -q "${BUNDLE}"
 
 echo "Configuring the startup features..."
 FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
-FEATURE_TEST_STRING="features-integration-test"
-if [[ "$KARAF_VERSION" == "karaf4" ]]; then
-    FEATURE_TEST_STRING="features-test"
+FEATURE_TEST_STRING="features-test"
+if [[ "$KARAF_VERSION" == "karaf3" ]]; then
+    FEATURE_TEST_STRING="features-integration-test"
 fi
 
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF}
+sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,%g" ${FEATURESCONF}
+
+if [[ ! -z "${REPO_URL}" ]]; then
+   sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
+fi
 
 # Add actual boot features.
 sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}"
@@ -44,10 +51,6 @@ cat "${MEMCONF}"
 echo "Listing all open ports on controller system"
 netstat -pnatu
 
-echo "redirected karaf console output to karaf_console.log"
-export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
-mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log
-
 if [ "${JDKVERSION}" == 'openjdk8' ]; then
     echo "Setting the JRE Version to 8"
     # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
@@ -70,9 +73,6 @@ mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log
 echo "Starting controller..."
 ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
 
-# No need for verbose printing during repeating operations.
-set +x
-
 function dump_log_and_exit {
     echo "Dumping first 500K bytes of karaf log..."
     head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
@@ -117,8 +117,6 @@ else
     done
 fi
 
-set -x
-
 # echo "Checking OSGi bundles..."
 # sshpass seems to fail with new karaf version
 # sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf 'bundle:list'
@@ -140,6 +138,7 @@ function exit_on_log_file_message {
     fi
 }
 
+exit_on_log_file_message 'Error installing boot feature repository'
 exit_on_log_file_message 'BindException: Address already in use'
 exit_on_log_file_message 'server is unhealthy'
 
diff --git a/jjb/integration/distribution/distribution-deploy-offline.sh b/jjb/integration/distribution/distribution-deploy-offline.sh
deleted file mode 100644 (file)
index e7920b5..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-CONTROLLERMEM="3072m"
-ACTUALFEATURES="odl-integration-all"
-
-echo "Kill any controller running"
-ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
-
-echo "Clean workspace"
-rm -rf *
-
-echo "Downloading the distribution..."
-wget --progress=dot:mega "${ACTUAL_BUNDLE_URL}"
-
-echo "Extracting the new controller..."
-unzip -q "${BUNDLE}"
-
-echo "Configuring the startup features..."
-FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
-FEATURE_TEST_STRING="features-integration-test"
-if [[ "$KARAF_VERSION" == "karaf4" ]]; then
-    FEATURE_TEST_STRING="features-test"
-fi
-
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF}
-
-# Feature is instaled later.
-cat "${FEATURESCONF}"
-
-echo "Configuring the log..."
-LOGCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg"
-sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' "${LOGCONF}"
-# FIXME: Make log size limit configurable from build parameter.
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=30GB/g' "${LOGCONF}"
-cat "${LOGCONF}"
-
-echo "Configure the repos..."
-REPOCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg"
-sed -ie '/http/d' "${REPOCONF}"
-sed -ie '$s/...$//' "${REPOCONF}"
-cat "${REPOCONF}"
-
-echo "Configure max memory..."
-MEMCONF="${WORKSPACE}/${BUNDLEFOLDER}/bin/setenv"
-sed -ie "s/2048m/${CONTROLLERMEM}/g" "${MEMCONF}"
-cat "${MEMCONF}"
-
-if [ "${JDKVERSION}" == 'openjdk8' ]; then
-    echo "Setting the JRE Version to 8"
-    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
-    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME='/usr/lib/jvm/java-1.8.0'
-elif [ "${JDKVERSION}" == 'openjdk7' ]; then
-    echo "Setting the JRE Version to 7"
-    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
-    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME='/usr/lib/jvm/java-1.7.0'
-fi
-readlink -e "${JAVA_HOME}/bin/java"
-echo "Default JDK Version, JAVA_HOME should override"
-java -version
-
-echo "Redirecting karaf console output to karaf_console.log"
-export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
-mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log
-
-echo "Starting controller..."
-${WORKSPACE}/${BUNDLEFOLDER}/bin/start
-
-echo "Waiting for controller to come up..."
-# Silence the chatty output during the loop.
-set +x
-COUNT=0
-# Bug 9044 workaround: use bin/client instead of Linux ssh command.
-CLIENT="${WORKSPACE}/${BUNDLEFOLDER}/bin/client"
-while true; do
-    # Is there a way to both print output and store RC without manipulating the e flag?
-    set +e
-    ${CLIENT} "feature:list -i"
-    RC="$?"
-    set -e
-    if [[ "${RC}" == "0" ]]; then
-        echo Karaf is UP
-        break
-    elif (( "${COUNT}" > 600 )); then
-        echo Timeout Karaf DOWN
-        echo "Dumping Karaf log..."
-        cat "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
-        echo "Listing all open ports on controller system"
-        netstat -pnatu
-        exit 1
-    else
-        echo "${RC}"
-        COUNT=$(( ${COUNT} + 1 ))
-        sleep 1
-        if [[ $(($COUNT % 5)) == 0 ]]; then
-            echo already waited ${COUNT} seconds...
-        fi
-    fi
-done
-# Un-silence the chatty output.
-set -x
-
-echo "Installing all features..."
-$CLIENT feature:install ${ACTUALFEATURES} || echo $? > "${WORKSPACE}/error.txt"
-
-echo "killing karaf process..."
-ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
-sleep 5
-
-echo "Fetching Karaf logs"
-# TODO: Move instead of copy? Gzip?
-cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
-cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
-
-echo "Exit if error"
-if [ -f "${WORKSPACE}/error.txt" ]; then
-    echo "Failed to deploy offline"
-    exit 1
-else
-    echo "Offline test: PASS"
-fi
-
-# vim: ts=4 sw=4 sts=4 et ft=sh :
diff --git a/jjb/integration/distribution/distribution-deploy-verify.sh b/jjb/integration/distribution/distribution-deploy-verify.sh
deleted file mode 100644 (file)
index ba28c7f..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-CONTROLLERMEM="3072m"
-ACTUALFEATURES="odl-integration-all"
-
-echo "Kill any controller running"
-ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
-
-echo "Clean workspace"
-rm -rf *
-
-echo "Downloading the distribution..."
-wget --progress=dot:mega  "${ACTUAL_BUNDLE_URL}"
-
-echo "Extracting the new controller..."
-unzip -q "${BUNDLE}"
-
-echo "Configuring the startup features..."
-FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
-FEATURE_TEST_STRING="features-integration-test"
-if [[ "$KARAF_VERSION" == "karaf4" ]]; then
-    FEATURE_TEST_STRING="features-test"
-fi
-
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF}
-
-# Add actual boot features.
-sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}"
-cat "${FEATURESCONF}"
-
-echo "Configuring the log..."
-LOGCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg"
-sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=20MB/g' "${LOGCONF}"
-cat "${LOGCONF}"
-
-echo "Configure max memory..."
-MEMCONF="${WORKSPACE}/${BUNDLEFOLDER}/bin/setenv"
-sed -ie "s/2048m/${CONTROLLERMEM}/g" "${MEMCONF}"
-cat "${MEMCONF}"
-
-echo "Listing all open ports on controller system"
-netstat -pnatu
-
-if [ "${JDKVERSION}" == 'openjdk8' ]; then
-    echo "Setting the JRE Version to 8"
-    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
-    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME='/usr/lib/jvm/java-1.8.0'
-elif [ "${JDKVERSION}" == 'openjdk7' ]; then
-    echo "Setting the JRE Version to 7"
-    # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.
-    # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java
-    export JAVA_HOME='/usr/lib/jvm/java-1.7.0'
-fi
-readlink -e "${JAVA_HOME}/bin/java"
-echo "Default JDK Version, JAVA_HOME should override"
-java -version
-
-echo "Redirecting karaf console output to karaf_console.log"
-export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
-mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log
-
-echo "Starting controller..."
-${WORKSPACE}/${BUNDLEFOLDER}/bin/start
-
-function dump_log_and_exit {
-    echo "Dumping first 500K bytes of karaf log..."
-    head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
-    echo "Dumping last 500K bytes of karaf log..."
-    tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
-    cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
-    cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
-    exit 1
-}
-
-echo "Waiting up to 5 minutes for controller to come up, checking every 5 seconds..."
-if [ "${DISTROSTREAM}" == "carbon" ] || [ "${DISTROSTREAM}" == "nitrogen" ]; then
-    # Only oxygen and above have the infrautils.ready feature, so using REST API to determine if the controller is ready.
-    COUNT="0"
-    while true; do
-        COUNT=$(( ${COUNT} + 5 ))
-        sleep 5
-        echo "already waited ${COUNT} seconds..."
-        RESP="$(curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null || true)"
-        echo ${RESP}
-        if [[ ${RESP} == *"200"* ]]; then
-            echo "Controller is UP"
-            break
-        elif (( "${COUNT}" > "300" )); then
-            echo "Timeout Controller DOWN"
-            dump_log_and_exit
-        fi
-    done
-else
-    COUNT="0"
-    while true; do
-        COUNT=$(( ${COUNT} + 5 ))
-        sleep 5
-        echo "already waited ${COUNT} seconds..."
-        if grep --quiet 'org.opendaylight.infrautils.ready-impl.*System ready' "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
-            echo "Controller is UP"
-            break
-        elif (( "${COUNT}" > "300" )); then
-            echo "Timeout Controller DOWN"
-            dump_log_and_exit
-        fi
-    done
-fi
-
-# echo "Checking OSGi bundles..."
-# sshpass seems to fail with new karaf version
-# sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf 'bundle:list'
-
-echo "Listing all open ports on controller system"
-netstat -pnatu
-
-function exit_on_log_file_message {
-    echo "looking for \"$1\" in karaf.log file"
-    if grep --quiet "$1" "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
-        echo ABORTING: found "$1"
-        dump_log_and_exit
-    fi
-
-    echo "looking for \"$1\" in karaf_console.log file"
-    if grep --quiet "$1" "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"; then
-        echo ABORTING: found "$1"
-        dump_log_and_exit
-    fi
-}
-
-exit_on_log_file_message 'BindException: Address already in use'
-exit_on_log_file_message 'server is unhealthy'
-
-echo "Fetching Karaf logs"
-# TODO: Move instead of copy? Gzip?
-cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
-cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
-
-echo "Kill controller"
-ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
-
-echo "Bug 4628: Detecting misplaced config files"
-pushd "${WORKSPACE}/${BUNDLEFOLDER}" || exit
-XMLS_FOUND=`echo *.xml`
-popd || exit
-if [ "$XMLS_FOUND" != "*.xml" ]; then
-    echo "Bug 4628 confirmed."
-    ## TODO: Uncomment the following when ODL is fixed, to guard against regression.
-    # exit 1
-else
-    echo "Bug 4628 not detected."
-fi
-
-# vim: ts=4 sw=4 sts=4 et ft=sh :
index 78ba3a4b6d012c4f2dc123b42f0c296fa934b8db..b9eaf1a2de892eabbe317693feebd32812e0471a 100644 (file)
@@ -1,4 +1,56 @@
 ---
+- project:
+    name: distribution
+    jobs:
+      # gerrit- is generic template, distribution- is project specific.
+      - 'distribution-merge-{stream}'
+      - 'distribution-verify-{stream}'
+      - 'distribution-check-{stream}'
+      - 'distribution-sanity-{stream}'
+      - gerrit-maven-clm
+      - gerrit-maven-verify-dependencies
+      - gerrit-tox-verify
+      - '{project-name}-rtd-jobs':
+          project-pattern: integration/distribution
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-distribution/34591/
+          rtd-token: 6247e7a21158a20b207470b8bf7719c676ff8944
+
+    project: integration/distribution
+    project-name: distribution
+    mvn-settings: integration-distribution-settings
+    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[int/dist]'
+
+    stream:
+      - fluorine:
+          branch: 'master'
+          karaf-version: odl
+          # Self-Managed projects repos and features:
+          sm-repos: >
+              mvn:org.opendaylight.sxp/features-sxp//xml/features
+          sm-features: >
+              odl-sxp-controller
+      - oxygen:
+          branch: 'stable/oxygen'
+          karaf-version: karaf4
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          karaf-version: karaf4
+
+- project:
+    name: distribution-sonar
+    jobs:
+      - gerrit-maven-sonar
+
+    project: integration/distribution
+    project-name: distribution
+    branch: master
+    mvn-settings: integration-distribution-settings
+    mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
 - job-template:
     name: 'distribution-verify-{stream}'
 
 
     builders:
       - distribution-check-wipe
+      - inject:
+          properties-file: 'allowed_projects.txt'
       - distribution-check-build-project:
           pom: 'distribution/pom.xml'
           mvn-opts: '{opendaylight-infra-mvn-opts}'
       - lf-infra-publish
 
 - job-template:
-    name: 'distribution-deploy-{stream}'
+    name: 'distribution-sanity-{stream}'
     # Goal: Verify distribution starts with no issues when all features are loaded.
-    # Operation: This job deploys the controller installing odl-integration-all.
-    # FIXME: List required variables.
+    # Operation: This job deploys odl-integration-all + list of UM features.
+    # This jobs works for both managed & self-managed distro.
 
     project-type: freestyle
     node: centos7-builder-4c-4g
           branch: '{branch}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{sm-repos}'
+      - integration-controller-features:
+          controller-features: '{sm-features}'
       - integration-jdk-version:
           jdkversion: '{jre}'
       - distribution-karaf-version:
       - opendaylight-infra-wrappers:
           build-timeout: '{build-timeout}'
 
-    # TODO: Trigger from sanity (instead of weekly) when this job is stable for {stream}.
-
     builders:
-      - distribution-deploy-verify
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
-      - integration-csit-archive-build
-      - lf-infra-publish
-
-- job-template:
-    name: 'distribution-offline-{stream}'
-    # Goal: Verify distribution can start with no internet connection.
-    # Operation: This job deploys the controller removing any external repository definition.
-    # FIXME: List required variables.
-
-    project-type: freestyle
-    node: centos7-builder-4c-4g
-    concurrent: false
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - integration-distribution-branch:
-          branch: '{branch}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-jdk-version:
-          jdkversion: '{jre}'
-      - distribution-karaf-version:
-          karaf-version: '{karaf-version}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    # TODO: Trigger from sanity (instead of weekly) when this job is stable for {stream}.
-
-    builders:
-      - distribution-deploy-offline
+      - integration-detect-variables
+      - distribution-check-bootup
 
     publishers:
       - email-notification:
index bd835f21f8dc53933f1b6d5131a66f888a898b6c..2e3ba043b449673ddaed4363ea73f5e29eae1515 100644 (file)
@@ -1,26 +1,5 @@
 # JJB macros specific to Integration/Distribution ODL project
 ---
-
-- builder:
-    name: distribution-deploy-verify
-    # Operation: Deploy ODL with all fetures and check it is not broken.
-    # Required bash variables:
-    #   KARAF_VERSION: 'karaf4' or 'karaf3'.
-    #     Use distribution-karaf-version macro to customize.
-    builders:
-      - integration-detect-variables
-      - shell: !include-raw: distribution-deploy-verify.sh
-
-- builder:
-    name: distribution-deploy-offline
-    # Operation: Deploys ODL on the current system, with no external repo configuration, check it works.
-    # Required bash variables:
-    #   KARAF_VERSION: 'karaf4' or 'karaf3'.
-    #     Use distribution-karaf-version macro to customize.
-    builders:
-      - integration-detect-variables
-      - shell: !include-raw: distribution-deploy-offline.sh
-
 - builder:
     name: distribution-check-wipe
     # Step zero: Wipe file repositories up front.
           rm -rfv /tmp/t
           echo "create n: multithreaded execution might fail at creating it."
           mkdir /tmp/n
+          echo "detecting distribution allowed projects"
+          # Some allowed projects cannot be detected in distribution because they do not produce features.
+          ALLOW_PROJECTS=(yangtools mdsal openflowjava)
+          ALLOW_PROJECTS+=(`grep '<groupId>org.opendaylight.' -Rh distribution \
+          | sed -e 's%^[ \t]*<groupId>org.opendaylight.%%' \
+          | sed -e 's%</groupId>%%' | sort -u`)
+          echo "Allowed projects are ${ALLOW_PROJECTS[@]}"
+          echo "ALLOW_PROJECTS=${ALLOW_PROJECTS[@]}" > allowed_projects.txt
 
 - builder:
     name: distribution-check-build-project
@@ -48,7 +35,7 @@
           goals: |
               clean deploy
               dependency:tree -DoutputFile=dependency_tree.txt
-              -Pq
+              -Pq -Pmanaged -Punmanaged
               -DaltDeploymentRepository=fake-nexus::default::file:///tmp/n/
               {mvn-opts}
           java-opts:
     #   gerrit-project: Project name as nexus URI part. Typically '$GERRIT_PROJECT'.
     builders:
       - shell: |
+          echo "These are allowed projects: $ALLOW_PROJECTS"
+          echo "These are distribution pulled projects:"
+          EXIT_CODE="0"
+          for PROJECT in `ls /tmp/r/org/opendaylight`; do
+          echo "checking $PROJECT"
+          if [[ "$ALLOW_PROJECTS" != *"$PROJECT"* ]]; then
+          echo "ERROR: Not allowed project $PROJECT pulled"
+          EXIT_CODE="1"
+          fi
+          done
+          exit $EXIT_CODE
+          echo "verify project groupId"
           mkdir -p /tmp/t/org/opendaylight/{gerrit-project}
           mv /tmp/n/org/opendaylight/{gerrit-project}/* /tmp/t/org/opendaylight/{gerrit-project}/
           test -z "`find /tmp/n/ -type f`" || ( echo "ERROR: Mismatched groupId detected (see above)." && false )
@@ -88,7 +87,7 @@
           goals: |
               clean install
               dependency:tree -DoutputFile=dependency_tree.txt
-              -Pq
+              -Pq -Pmanaged -Punmanaged
               {mvn-opts}
           java-opts:
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
               clean install
               dependency:tree -DoutputFile=dependency_tree.txt
               -s fake_remotes.xml
-              -Pq
+              -Pq -Pmanaged -Punmanaged
               {mvn-opts}
           java-opts:
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
               clean install
               dependency:tree -DoutputFile=dependency_tree.txt
               -s fake_remotes.xml
-              -Pq
+              -Pq -Pmananaged -Punmanaged
               -Dsft.heap.max=4g
               -DskipTests=false
               {mvn-opts}
index dc2f73aa66006f495b762a99c7ebd89488f677f3..45fda0b3218e3e9445a5490e8cea136b51214b83 100644 (file)
@@ -72,6 +72,8 @@
 
     builders:
       - distribution-check-wipe
+      - inject:
+          properties-file: 'allowed_projects.txt'
       - distribution-check-build-project:
           pom: '$GERRIT_PROJECT/pom.xml'
           mvn-opts: '{opendaylight-infra-mvn-opts}'
diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
deleted file mode 100644 (file)
index 1ae14cc..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: distribution
-    jobs:
-      # gerrit- is generic template, distribution- is project specific.
-      - 'distribution-merge-{stream}'
-      - 'distribution-verify-{stream}'
-      - 'distribution-deploy-{stream}'
-      - 'distribution-offline-{stream}'
-      - 'distribution-check-{stream}'
-      - gerrit-maven-clm
-      - gerrit-maven-verify-dependencies
-      - gerrit-tox-verify
-      - '{project-name}-rtd-jobs':
-          project-pattern: integration/distribution
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-distribution/34591/
-          rtd-token: 6247e7a21158a20b207470b8bf7719c676ff8944
-
-    project: integration/distribution
-    project-name: distribution
-    mvn-settings: integration-distribution-settings
-    mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[int/dist]'
-
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-
-- project:
-    name: distribution-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: integration/distribution
-    project-name: distribution
-    branch: master
-    mvn-settings: integration-distribution-settings
-    mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index a7b3827eca45d9ab885ec38e73b80ac4713d3500..b02b568027b806c7e372df4c23c3621ca2b3a981 100644 (file)
@@ -12,12 +12,12 @@ DISTROBRANCH=${DISTROBRANCH:-$GERRIT_BRANCH}
 
 # Obtain current pom.xml of integration/distribution, correct branch.
 wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
-# Extract the BUNDLEVERSION from the pom.xml
-BUNDLEVERSION=$(xpath pom.xml '/project/version/text()' 2> /dev/null)
-echo "Bundle version is ${BUNDLEVERSION}"
+# Extract the BUNDLE_VERSION from the pom.xml
+BUNDLE_VERSION=$(xpath pom.xml '/project/version/text()' 2> /dev/null)
+echo "Bundle version is ${BUNDLE_VERSION}"
 # Acquire the timestamp information from maven-metadata.xml
 NEXUSPATH="${NEXUSURL_PREFIX}/${ODL_NEXUS_REPO}/org/opendaylight/integration/${KARAF_ARTIFACT}"
-wget ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml
+wget ${NEXUSPATH}/${BUNDLE_VERSION}/maven-metadata.xml
 
 if [ $? -ne 0 ]; then
   echo "unable to find maven-metadata.xml. no need to continue..."
@@ -27,9 +27,9 @@ fi
 less maven-metadata.xml
 TIMESTAMP=$(xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null)
 echo "Nexus timestamp is ${TIMESTAMP}"
-BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}"
+BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}"
 BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"
-ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
+ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLE_VERSION}/${BUNDLE}"
 
 wget --progress=dot:mega $ACTUAL_BUNDLE_URL
 echo "Extracting the last distribution found on nexus..."
index f0ba1efc4129f64e729f092ddb405c296460729f..42a2d8696633655f6e63c6db275f771967fae490 100644 (file)
@@ -80,7 +80,7 @@ if [[ "$KARAF_VERSION" == "karaf4" ]]; then
     FEATURE_TEST_STRING="features-test"
 fi
 
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
+sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
 if [[ ! -z "${REPO_URL}" ]]; then
    sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
 fi
index f4d56ac2def12c4b64bbc8790608a04188dba5a2..9af8ca7edd11f50532e0a507b3ff6df36741f458 100644 (file)
@@ -69,7 +69,7 @@ if [[ "$KARAF_VERSION" == "karaf4" ]]; then
     FEATURE_TEST_STRING="features-test"
 fi
 
-sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
+sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
 if [[ ! -z "${REPO_URL}" ]]; then
    sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
 fi
index 2862d190e254c1db4e32510179b953f082d33855..586378b7348d065123bd8d129899a370188de538 100644 (file)
@@ -152,14 +152,14 @@ function is_openstack_feature_enabled() {
     echo 0
 }
 
-function fix_libvirt_version_n_cpu_ocata() {
+function fix_libvirt_version_n_cpu_pike() {
     local ip=$1
     ${SSH} ${ip} "
         cd /opt/stack;
         git clone https://git.openstack.org/openstack/requirements;
         cd requirements;
-        git checkout stable/ocata;
-        sed -i s/libvirt-python===2.5.0/libvirt-python===3.2.0/ upper-constraints.txt
+        git checkout stable/pike;
+        sed -i s/libvirt-python===3.5.0/libvirt-python===4.2.0/ upper-constraints.txt
    "
 }
 
@@ -177,10 +177,6 @@ function install_rdo_release() {
           ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-queens/rdo-release-queens-1.noarch.rpm"
           ;;
 
-       *ocata*)
-          ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-ocata/rdo-release-ocata-3.noarch.rpm"
-          ;;
-
        master)
           ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-queens/rdo-release-queens-1.noarch.rpm"
           ;;
@@ -873,12 +869,7 @@ function is_rabbitmq_ready() {
     local -r ip=${1}
     local grepfor="nova_cell1"
     rm -f rabbit.txt
-    if [ "${OPENSTACK_BRANCH}" == "stable/ocata" ]; then
-        ${SSH} ${ip} "sudo rabbitmqctl status" > rabbit.txt
-        grepfor="pid"
-    else
-        ${SSH} ${ip} "sudo rabbitmqctl list_vhosts" > rabbit.txt
-    fi
+    ${SSH} ${ip} "sudo rabbitmqctl list_vhosts" > rabbit.txt
     grep ${grepfor} rabbit.txt
 }
 
@@ -1065,12 +1056,6 @@ for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
        ssh ${!CONTROLIP} "sed -i 's/flat_networks public/flat_networks public,physnet1/' /opt/stack/devstack/lib/neutron"
        ssh ${!CONTROLIP} "sed -i '186i iniset \$NEUTRON_CORE_PLUGIN_CONF ml2_type_vlan network_vlan_ranges public:1:4094,physnet1:1:4094' /opt/stack/devstack/lib/neutron"
     fi
-    if [[ "${ODL_ML2_BRANCH}" == "stable/ocata" && "$(is_openstack_feature_enabled n-cpu)" == "1" ]]; then
-        echo "Updating requirements for ${ODL_ML2_BRANCH}"
-        echo "Workaround for https://review.openstack.org/#/c/491032/"
-        echo "Modify upper-constraints to use libvirt-python 3.2.0"
-        fix_libvirt_version_n_cpu_ocata ${!CONTROLIP}
-    fi
     create_control_node_local_conf ${!CONTROLIP} ${ODLMGRIP[$i]} "${ODL_OVS_MGRS[$i]}"
     scp ${WORKSPACE}/local.conf_control_${!CONTROLIP} ${!CONTROLIP}:/opt/stack/devstack/local.conf
     echo "Install rdo release to avoid incompatible Package versions"
@@ -1122,11 +1107,11 @@ for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
     scp ${WORKSPACE}/hosts_file ${!COMPUTEIP}:/tmp/hosts
     scp ${WORKSPACE}/get_devstack.sh  ${!COMPUTEIP}:/tmp
     ${SSH} ${!COMPUTEIP} "bash /tmp/get_devstack.sh > /tmp/get_devstack.sh.txt 2>&1"
-    if [ "${ODL_ML2_BRANCH}" == "stable/ocata" ]; then
+    if [ "${ODL_ML2_BRANCH}" == "stable/pike" ]; then
         echo "Updating requirements for ${ODL_ML2_BRANCH}"
-        echo "Workaround for https://review.openstack.org/#/c/491032/"
-        echo "Modify upper-constraints to use libvirt-python 3.2.0"
-        fix_libvirt_version_n_cpu_ocata ${!COMPUTEIP}
+        echo "Workaround for libvirt-python failing installation"
+        echo "Modify upper-constraints to use libvirt-python 4.2.0"
+        fix_libvirt_version_n_cpu_pike ${!COMPUTEIP}
     fi
     create_compute_node_local_conf ${!COMPUTEIP} ${!CONTROLIP} ${ODLMGRIP[$SITE_INDEX]} "${ODL_OVS_MGRS[$SITE_INDEX]}"
     scp ${WORKSPACE}/local.conf_compute_${!COMPUTEIP} ${!COMPUTEIP}:/opt/stack/devstack/local.conf
@@ -1213,13 +1198,6 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do
 
     echo "sleep for 60s and print hypervisor-list"
     sleep 60
-    # In Ocata if we do not enable the n-cpu in control node then
-    # we need to discover hosts manually and ensure that they are mapped to cells.
-    # reference: https://ask.openstack.org/en/question/102256/how-to-configure-placement-service-for-compute-node-on-ocata/
-    if [ "${OPENSTACK_BRANCH}" == "stable/ocata" ]; then
-        scp ${WORKSPACE}/setup_host_cell_mapping.sh  ${!CONTROLIP}:/tmp
-        ${SSH} ${!CONTROLIP} "sudo bash /tmp/setup_host_cell_mapping.sh"
-    fi
     ${SSH} ${!CONTROLIP} "cd /opt/stack/devstack; source openrc admin admin; nova hypervisor-list"
     # in the case that we are doing openstack (control + compute) all in one node, then the number of hypervisors
     # will be the same as the number of openstack systems. However, if we are doing multinode openstack then the
index f28711cd8b736bf32b786c9500b0135639842280..542b0dcc1eac95dfd097cf2c68a0ef78328f5cbe 100644 (file)
@@ -8,29 +8,29 @@ DISTROBRANCH="${DISTROBRANCH:-$GERRIT_BRANCH}"
 if [ ${BUNDLE_URL} == 'last' ]; then
     # Obtain current pom.xml of integration/distribution, correct branch.
     wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
-    # Extract the BUNDLEVERSION from the pom.xml
-    BUNDLEVERSION="$(xpath pom.xml '/project/version/text()' 2> /dev/null)"
-    echo "Bundle version is ${BUNDLEVERSION}"
+    # Extract the BUNDLE_VERSION from the pom.xml
+    BUNDLE_VERSION="$(xpath pom.xml '/project/version/text()' 2> /dev/null)"
+    echo "Bundle version is ${BUNDLE_VERSION}"
     # Acquire the timestamp information from maven-metadata.xml
     NEXUSPATH="${NEXUSURL_PREFIX}/${ODL_NEXUS_REPO}/org/opendaylight/integration/${KARAF_ARTIFACT}"
-    wget "${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml"
+    wget "${NEXUSPATH}/${BUNDLE_VERSION}/maven-metadata.xml"
     less "maven-metadata.xml"
     TIMESTAMP="$(xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null)"
     echo "Nexus timestamp is ${TIMESTAMP}"
-    BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}"
+    BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}"
     BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"
-    ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
+    ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLE_VERSION}/${BUNDLE}"
 else
     ACTUAL_BUNDLE_URL="${BUNDLE_URL}"
     BUNDLE="${BUNDLE_URL##*/}"
     ARTIFACT="$(basename "$(dirname "$(dirname "${BUNDLE_URL}")")")"
-    BUNDLEVERSION="$(basename "$(dirname "${BUNDLE_URL}")")"
-    BUNDLEFOLDER="${ARTIFACT}-${BUNDLEVERSION}"
+    BUNDLE_VERSION="$(basename "$(dirname "${BUNDLE_URL}")")"
+    BUNDLEFOLDER="${ARTIFACT}-${BUNDLE_VERSION}"
 fi
 
 echo "Distribution bundle URL is ${ACTUAL_BUNDLE_URL}"
 echo "Distribution bundle is ${BUNDLE}"
-echo "Distribution bundle version is ${BUNDLEVERSION}"
+echo "Distribution bundle version is ${BUNDLE_VERSION}"
 echo "Distribution folder is ${BUNDLEFOLDER}"
 echo "Nexus prefix is ${NEXUSURL_PREFIX}"
 
@@ -38,7 +38,7 @@ echo "Nexus prefix is ${NEXUSURL_PREFIX}"
 cat > "${WORKSPACE}/detect_variables.env" <<EOF
 ACTUAL_BUNDLE_URL=${ACTUAL_BUNDLE_URL}
 BUNDLE=${BUNDLE}
-BUNDLEVERSION=${BUNDLEVERSION}
+BUNDLE_VERSION=${BUNDLE_VERSION}
 BUNDLEFOLDER=${BUNDLEFOLDER}
 NEXUSURL_PREFIX=${NEXUSURL_PREFIX}
 EOF
index 3933b0cd989e42049a612d199baf83f0da891530..366e4f2ec77b0347398df3477240d2b04e3325fb 100644 (file)
@@ -17,7 +17,7 @@
       - string:
           name: KARAF_VERSION
           default: '{karaf-version}'
-          description: 'karaf3 or karaf4, affects ODL deploy scripts'
+          description: 'karaf3, karaf4, odl, affects ODL deploy scripts'
 
 - parameter:
     name: integration-bundle-url
index 90210ebb3527653bd68da5b3566a09f8d1d020ae..93cd0eb99537f42d0dc0843d20915cb8b354d765 100644 (file)
@@ -1,5 +1,7 @@
 
-if [[ "$KARAF_VERSION" == "karaf3" ]]; then
+if [[ "$KARAF_VERSION" == "odl" ]]; then
+    KARAF_ARTIFACT="opendaylight"
+elif [[ "$KARAF_VERSION" == "karaf3" ]]; then
     KARAF_ARTIFACT="distribution-karaf"
 else
     KARAF_ARTIFACT="karaf"
index 7bc5e1e0068c416e661a3053f09c637c71bb18f4..74fb386fa2dc30dac9b4680a34da99533b9d0192 100644 (file)
 - job-template:
     name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
     id: inttest-csit-1node
-    # Keep synchronized with *-csit4-*-carbon please.
     disabled: false
 
     project-type: freestyle
index dc435ad8c0b85ca1433cd77497faf28e181adce1..15aa436b89e18cb219867d2aa591b1caadf391c9 100644 (file)
@@ -3,15 +3,9 @@
     name: integration-test
     project: integration/test
     project-name: integration-test
-    test-branch: master
     jobs:
-      - 'integration-distribution-test-{stream}'
-      - 'integration-sanity-test-{stream}'
       - 'integration-patch-test-{stream}'
       - 'integration-multipatch-test-{stream}'
-      - 'integration-distribution-weekly-test-trigger-{stream}'
-      - 'integration-distribution-high-frequency-test-trigger-{stream}'
-      - 'integration-update-csit-tests-{stream}'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: integration/test
           branch: master
           stream: master
 
+    # CSIT Lists in releng-defaults.yaml
+    stream:
+      - fluorine:
+          branch: 'master'
+          mvn-version: 'mvn35'
+          csit-list: !include: csit-jobs-fluorine.lst
+          build-order: >
+              infrautils mdsal controller aaa netconf daexim bgpcep ovsdb neutron
+              lispflowmapping openflowplugin coe genius sfc netvirt
+
+      - oxygen:
+          branch: 'stable/oxygen'
+          mvn-version: 'mvn35'
+          csit-list: !include: csit-jobs-oxygen.lst
+          build-order: >
+              infrautils mdsal controller aaa netconf daexim bgpcep ovsdb neutron
+              lispflowmapping openflowplugin coe genius sfc netvirt
+
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          mvn-version: 'mvn35'
+          csit-list: !include: csit-jobs-nitrogen.lst
+          build-order: >
+              infrautils mdsal controller aaa netconf daexim bgpcep ovsdb neutron
+              lispflowmapping openflowplugin coe genius sfc netvirt
+
+- project:
+    name: integration-distribution
+    project: integration/test
+    project-name: integration-test
+    jobs:
+      - 'integration-distribution-test-{stream}'
+      - 'integration-distribution-weekly-test-trigger-{stream}'
+      - 'integration-distribution-high-frequency-test-trigger-{stream}'
+      - 'integration-update-csit-tests-{stream}'
+
     # CSIT Lists in releng-defaults.yaml
     stream:
       - fluorine:
               l2switch messaging4transport nemo netide nic ocpplugin of-config p4plugin packetcable
               sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd wip
           csit-list: !include: csit-jobs-fluorine.lst
-          csit-sanity-list: '{csit-sanity-list-fluorine}'
           csit-weekly-list: '{csit-weekly-list-fluorine}'
           csit-high-frequency-list: '{csit-high-frequency-list-fluorine}'
-          mvn-version: 'mvn35'
       - oxygen:
           branch: 'stable/oxygen'
           csit-blacklist: >
               capwap centinel coe didm iotdm jsonrpc lacp messaging4transport netide nic
               ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd wip
           csit-list: !include: csit-jobs-oxygen.lst
-          csit-sanity-list: '{csit-sanity-list-oxygen}'
           csit-weekly-list: '{csit-weekly-list-oxygen}'
           csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
-          mvn-version: 'mvn35'
 
       - nitrogen:
           branch: 'stable/nitrogen'
           csit-blacklist: capwap centinel coe didm iotdm jsonrpc lacp netide tsdr gate longevity sanity tdd wip
           csit-list: !include: csit-jobs-nitrogen.lst
-          csit-sanity-list: '{csit-sanity-list-nitrogen}'
           csit-weekly-list: '{csit-weekly-list-nitrogen}'
           csit-high-frequency-list: '{csit-high-frequency-list-nitrogen}'
-          mvn-version: 'mvn35'
 
-    # tools system image
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
+- project:
+    name: integration-sanity
+    project: integration/test
+    project-name: integration-test
+    jobs:
+      - 'integration-sanity-test-{stream}'
 
-# Template: integration-distribution-test-{stream}
-# Goal: Verify a distribution through all system test available
-# Operation: This template takes a distribution and passes all available system test
+    stream:
+      - fluorine:
+          branch: 'master'
+          karaf-version: odl
+          csit-sanity-list: '{csit-sanity-list-fluorine}'
+      - oxygen:
+          branch: 'stable/oxygen'
+          karaf-version: karaf4
+          csit-sanity-list: '{csit-sanity-list-oxygen}'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          karaf-version: karaf4
+          csit-sanity-list: '{csit-sanity-list-nitrogen}'
 
 - job-template:
     name: 'integration-distribution-test-{stream}'
+    # Goal: Verify a distribution through all system test available
+    # Operation: This template takes a distribution and passes all available system test
 
     project-type: freestyle
     node: queue-disttest-2c-1g
           email-prefix: '[integration]'
       - lf-infra-publish
 
-# Template: integration-sanity-test-{stream}
-# Goal: Verify a distribution through sanity test
-# Operation: This template takes a distribution and passes sanity test
-
 - job-template:
     name: 'integration-sanity-test-{stream}'
+    # Goal: Verify a distribution through sanity test
+    # Operation: This template takes a distribution and passes sanity test
+    # This jobs works for both managed & unmanaged distro.
 
     project-type: freestyle
     node: queue-intque-2c-1g
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
 
+    triggers:
+      - timed: '{schedule-daily}'
+
     builders:
       - trigger-builds:
           - project: '{csit-sanity-list}'
           email-recipients: '{email-recipients}'
           email-prefix: '[integration]'
 
-# Template: integration-patch-test-{stream}
-# Goal: Build a patch and run all available system test on a distribution containing the change
-# Operation: This job template builds a patch, creates a distribution containing the patch, and
-# triggers the distribution test when test-integration is used in gerrit comments
-
 - job-template:
     name: 'integration-patch-test-{stream}'
+    # Template: integration-patch-test-{stream}
+    # Goal: Build a patch and run all available system test on a distribution containing the change
+    # Operation: This job template builds a patch, creates a distribution containing the patch, and
+    # triggers the distribution test when test-integration is used in gerrit comments
 
     project-type: freestyle
     node: centos7-builder-2c-8g
     parameters:
       - patches-to-build-parameter:
           patches_to_build: '$PATCHES_TO_BUILD'
-      - run-test-parameter:
-          run-test: 'false'
+      - build-order-parameter:
+          build-order: '{build-order}'
       - build-fast-parameter:
           build-fast: 'false'
+      - run-test-parameter:
+          run-test: 'false'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
       - shell: |
           git status
           git add jjb/integration/*.lst
-      - opendaylight-infra-push-gerrit-patch:
-          project: "releng/builder"
-          gerrit-topic: "auto-update-csit-jobs-{stream}"
-          gerrit-commit-message: "Auto Update CSIT Jobs to run for {stream}"
+      - lf-infra-push-gerrit-patch:
+          project: 'releng/builder'
+          gerrit-user: 'jenkins-$SILO'
+          gerrit-host: 'git.opendaylight.org'
+          gerrit-topic: 'auto-update-csit-jobs-{stream}'
+          gerrit-commit-message: 'Auto Update CSIT Jobs to run for {stream}'
+          reviewers-email: 'integration-dev@lists.opendaylight.org'
 
     publishers:
       - lf-infra-publish
index 39cdbeca55cd1f1a9bf5ebf0810f3086a42cf8ca..073db0ebdc0baa10fb20f25ea28d4fc048138e77 100644 (file)
@@ -2,16 +2,17 @@
 set -xeu -o pipefail
 
 BUNDLE_VERSION=$(xpath "${BUNDLE_POM}" '/project/version/text()' 2> /dev/null)
-BUNDLE="${KARAF_ARTIFACT}-${BUNDLE_VERSION}.zip"
-BUNDLE_FILEPATH="/tmp/r/org/opendaylight/integration/${KARAF_ARTIFACT}/${BUNDLE_VERSION}/${BUNDLE}"
-ls -l "${BUNDLE_FILEPATH}"
+BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}"
+BUNDLE="${BUNDLEFOLDER}.zip"
+BUNDLE_PATH="/tmp/r/org/opendaylight/integration/${KARAF_ARTIFACT}/${BUNDLE_VERSION}/${BUNDLE}"
+ls -l "${BUNDLE_PATH}"
 LOG_FILE='integration-upload-distribution.log'
 echo "Uploading distribution to Nexus..."
 "$MVN" deploy:deploy-file \
     --log-file ${LOG_FILE} \
     --global-settings "$GLOBAL_SETTINGS_FILE" \
     --settings "$SETTINGS_FILE" \
-    -Dfile="${BUNDLE_FILEPATH}" \
+    -Dfile="${BUNDLE_PATH}" \
     -DrepositoryId=opendaylight-snapshot \
     -Durl="$ODLNEXUSPROXY/content/repositories/opendaylight.snapshot/" \
     -DgroupId="org.opendaylight.integration.${GERRIT_PROJECT//\//.}" \
@@ -28,4 +29,8 @@ echo "Bundle uploaded to ${BUNDLE_URL}"
 # Re-inject the new BUNDLE_URL for downstream jobs to pull from Nexus
 cat > "${WORKSPACE}/integration-upload-distribution.env" <<EOF
 BUNDLE_URL=${BUNDLE_URL}
+BUNDLE_VERSION=${BUNDLE_VERSION}
+BUNDLEFOLDER=${BUNDLEFOLDER}
+BUNDLE=${BUNDLE}
+BUNDLE_PATH=${BUNDLE_PATH}
 EOF
index 6fbdcfd6e02603ca84aa238de7b0c40d309ee745..ae9791d7446c7ff0c94f35b7d5cb7d66b32b6fa6 100644 (file)
@@ -43,6 +43,44 @@ if ${BUILD_FAST}; then
 else
     fast_option=""
 fi
+# check if topic exists, e.g. topic=binding-tlc-rpc
+if [[ "${PATCHES_TO_BUILD}" == *topic* ]]; then
+    TOPIC="${PATCHES_TO_BUILD#*=}"
+    echo "Create topic ${TOPIC} patch list"
+    PATCHES_TO_BUILD=""
+    read -ra PROJECT_LIST <<< "${BUILD_ORDER}"
+    for PROJECT in "${PROJECT_LIST[@]}"; do
+        # get all patches number for a topic for a given project
+        IFS=$'\n' read -rd '' -a GERRIT_PATCH_LIST <<< "$(ssh -p 29418 jenkins-$SILO@git.opendaylight.org gerrit query status:open topic:${TOPIC} project:${PROJECT} \
+        | grep 'number:' | awk '{{ print $2 }}')" || true
+        echo "Add ${PROJECT}:${GERRIT_PATCH_LIST[*]}"
+        # add project if it is the first with patches or it is not the first
+        if [[ -z "${PATCHES_TO_BUILD}" && ! -z "${GERRIT_PATCH_LIST[*]}" ]]; then
+            PATCHES_TO_BUILD="${PROJECT}"
+        elif [[ ! -z "${PATCHES_TO_BUILD}" ]]; then
+            PATCHES_TO_BUILD="${PATCHES_TO_BUILD},${PROJECT}"
+        fi
+        # sort project patches
+        if [[ ! -z "${GERRIT_PATCH_LIST[*]}" ]]; then
+            REF_LIST=()
+            # create reference list with patch number-refspec
+            for PATCH in "${GERRIT_PATCH_LIST[@]}"; do
+                REFSPEC=$(ssh -p 29418 jenkins-$SILO@git.opendaylight.org gerrit query change:${PATCH} --current-patch-set \
+                | grep 'ref:' | awk '{{ print $2 }}')
+                REF_LIST+=("${PATCH}-${REFSPEC/refs\/changes\/}")
+            done
+            # sort reference list by patch number
+            IFS=$'\n' SORT_REF=$(sort <<<"${REF_LIST[*]}") && unset IFS
+            read -rd '' -a SORT_REF_LIST <<< "${SORT_REF[*]}" || true
+            # add refspec to patches to build list
+            for PATCH in "${SORT_REF_LIST[@]}"; do
+                PATCHES_TO_BUILD="${PATCHES_TO_BUILD}:${PATCH/*-/}"
+            done
+        fi
+    done
+fi
+
+echo "Patches to build: ${PATCHES_TO_BUILD}"
 IFS=',' read -ra PATCHES <<< "${PATCHES_TO_BUILD}"
 
 # For each patch:
index fcbaa7eef52a4e0c21905f8650657f7d33f1c921..d703d35a762c34d5fa60affa763bcb08f4964001 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 3a29a05cafa30e88b667f458a1f1dedbb20f3346..00d7b9769f4d00fa45e56533f60f8d34d006d26e 100644 (file)
     # Used by the release job
     staging-profile-id: 96fd6e9453970
 
-- project:
-    name: iotdm-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'iotdm'
-    project-name: 'iotdm'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'iotdm-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'aaa-merge-{stream}'
-    email-upstream: '[iotdm] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: 96fd6e9453970
-
 - project:
     name: iotdm-sonar
     jobs:
index 5612eab04da57355a85b8f5e5637c380eae1fc5f..c83d90cb8ea77aac820f78baa0a75328ff8bd7d6 100644 (file)
           karaf-version: karaf3
           # yamllint disable-line rule:line-length
           bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-nitrogen/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.1.0-SNAPSHOT/jsonrpc-karaf-1.1.0-SNAPSHOT.zip'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-          # yamllint disable-line rule:line-length
-          bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-carbon/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.0.0-SNAPSHOT/jsonrpc-karaf-1.0.0-SNAPSHOT.zip'
-
 
     install:
       - only:
index 1eaa52fb678d2a5cdf5459177da435b4aa6fb280..168fa943b8074721b15c7cb2d3e98c1f1dbf31dd 100644 (file)
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
-- project:
-    name: jsonrpc-carbon
-    jobs:
-      - odl-maven-jobs
-
-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'jsonrpc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
-
-    # Used by the release job
-    staging-profile-id: 96fdf4408765d
-
 - project:
     name: jsonrpc-sonar
     jobs:
index 63be624c0097db7ffe7e0a597fa62b8345630ef2..8509c013974a76f26f5da48c92a7fc1e65b3f937 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index f5657336913f6ed019f6b5e1083a5d798c6b36d5..c85c9f64deda3d6d17a3b84f8fa1d342a082f1b9 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 54fb5958c1085a387fddc75018103305167bb5e5..62e8620c0a38de91e1f974476beb9390eb79eb73 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index fd3e64984569a54c09f736cfcdc2fce44c8f9c7f..b3a3a205d0ab23ac484970284c847b214a67e429 100644 (file)
@@ -15,9 +15,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     feature:
       - all:
index 3792df73364a4a909e27c85f1bb1436048c046ab..c55bb6ced91892e54a1b4f2906b885f60ce66b77 100644 (file)
     # Used by the release job
     staging-profile-id: 96fee85953ca0
 
-- project:
-    name: l2switch-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: 96fee85953ca0
-
 - project:
     name: l2switch-sonar
     jobs:
index 1cf3cabbd4f3fa54964ad8d4e51fc6004bf92840..53fee1754fdb6424df9944eb73427ca38681d75b 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 850c4a52438f7d4c44859ec8e9e94caee319c0db..792f5ddb91495dff4b3bbb18512e3988e04920e4 100644 (file)
     # Used by the release job
     staging-profile-id: 96ff6c0ff6ab1
 
-- project:
-    name: lacp-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'lacp'
-    project-name: 'lacp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'lacp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
-    email-upstream: '[lacp] [openflowjava] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: 96ff6c0ff6ab1
-
 - project:
     name: lacp-sonar
     jobs:
index fb0a4f21b21dd1bec866e2cb056117a59e633355..0067ee76a90651a1b7719118fc7e530ac82fb74d 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index e9a27a52a02908e2c60efa21b82a9401412cf4bb..9a8a7b434dc1f9ef265f8d3676310756c253979d 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index d3fc860f95a0d0cf8a9743b3799b39e643718f75..5fa2f1e67bce1c591ab001759fbd216fe843d1b4 100644 (file)
     # Used by the release job
     staging-profile-id: 96fff2503b766
 
-- project:
-    name: lispflowmapping-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'lispflowmapping'
-    project-name: 'lispflowmapping'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
-    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
-    email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
-    build-node: centos7-builder-8c-8g
-
-    # Used by the release job
-    staging-profile-id: 96fff2503b766
-
 - project:
     name: lispflowmapping-sonar
     jobs:
index 6a6cb9b2ef5bdba66c05916b4bd8abe3515fbf1e..8fd766fd6aedfe1306810a01caa89552e8fd551c 100644 (file)
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-          robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
 
     install:
       - only:
index dd0a04631e5f205ec79094e35f8bd74f4189bb8e..86cb2c3efde11765f82bdbb524c2b3c5db977404 100644 (file)
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
-- project:
-    name: mdsal-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'mdsal'
-    project-name: 'mdsal'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-8c-8g
-    karaf-version: karaf3
-    mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[mdsal] [odlparent] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a674173c7b29d
-
 - project:
     name: mdsal-sonar
     jobs:
index c6afc49a0d87f7e560c37a4e75b30ce2744c775e..df3049ed028f33008e08db6684a37d810c3d3793 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index e9c9b085837e0ef46df0b646dc0c9bacef690ec3..aba72d8c29fb9df2e8e6ad769285bb0cd37d31ce 100644 (file)
     # Used by the release job
     staging-profile-id: a677283157db4
 
-- project:
-    name: messaging4transport-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'messaging4transport'
-    project-name: 'messaging4transport'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'messaging4transport-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[messaging4transport]'
-
-    # Used by the release job
-    staging-profile-id: a677283157db4
-
 - project:
     name: messaging4transport-sonar
     jobs:
diff --git a/jjb/natapp/natapp-csit-basic.yaml b/jjb/natapp/natapp-csit-basic.yaml
deleted file mode 100644 (file)
index cf27001..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- project:
-    name: natapp-csit-basic
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'natapp'
-
-    # The functionality under test
-    functionality: 'basic'
-
-    # Project branches
-    stream:
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf, odl-natapp'
-
-    # Robot custom options
-    robot-options: ''
index b0d5a86296c443e24db5c1d76c9ff61c39f5a17f..4b0235ec409a20bad19c9c6e6f4dc71727a3d506 100644 (file)
     # Used by the release job
     staging-profile-id: a679c0f4f08a8
 
-- project:
-    name: natapp-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'natapp'
-    project-name: 'natapp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'natapp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream}'
-    email-upstream: '[natapp] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: a679c0f4f08a8
-
 - project:
     name: natapp-sonar
     jobs:
index 8ffa8fd78ff6248e0fef3342b0281e2789b6178a..ea5003956d0a392971f0b4f44a16a73ed3ab3170 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 61564eb05cef802a56ac681f8ffd5a36d9f642ce..eefa87c6e41d054953ca0de7042a9fdba2fa32a1 100644 (file)
     # Used by the release job
     staging-profile-id: a67a9890f6202
 
-- project:
-    name: nemo-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'nemo'
-    project-name: 'nemo'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'nemo-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[nemo]'
-
-    # Used by the release job
-    staging-profile-id: a67a9890f6202
-
 - project:
     name: nemo-sonar
     jobs:
index c45a2ca2a87de3cd996504733c8c7e08d4970196..0ce1d8122861597eff92e5041f80977ae9966517 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 38965fcfcb73b1d211d6e968d3c305fa9a45a6aa..3599f849aed23ad086b4d079fea105b91e0102f0 100644 (file)
     # Used by the release job
     staging-profile-id: a67bab3755815
 
-- project:
-    name: netide-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'netide'
-    project-name: 'netide'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'netide-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream}'
-    email-upstream: '[netide] [openflowjava]'
-
-    # Used by the release job
-    staging-profile-id: a67bab3755815
-
 - project:
     name: netide-sonar
     jobs:
index ad9aefa2c9968dd6c8bb2827e60fa1632f366763..e2130df801e0a5a66ab096f2913636e7aeb848ab 100644 (file)
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
-
-- project:
-    name: netvirt-csit-hwvtep-openstack-integration-carbon
-    jobs:
-      - inttest-csit-hwvtep-openstack
-
-    project: 'netvirt'
-    stream: 'carbon'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-standard-8
-    openstack_system_flavor: odl-standard-8
-    openstack_system2_flavor: odl-standard-4
-    tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
-
-    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: 'yes'
-
-    topology:
-      - 1node:
-          openstack_system2_count: 1
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-      - 3node:
-          openstack_system2_count: 1
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    functionality:
-      - upstream-stateful
-      - gate-stateful
-
-    openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: '{openstack_system_image_ocata}'
-          openstack_system2_image: '{openstack_system_image_ocata}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
-      - pike:
-          openstack-branch: 'stable/pike'
-          odl-ml2-branch: 'stable/pike'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_pike}'
-          openstack_system2_image: '{openstack_system_image_pike}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
index 02475d741d793ed0b7799d9af5b7e687d900bab4..89f48409f888fe8816cd5f32178e3620c1a25ac7 100644 (file)
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
 
-- project:
-    name: netvirt-csit-openstack-integration-carbon
-    jobs:
-      - inttest-csit-openstack
-
-    project: 'netvirt'
-    stream: 'carbon'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    testplan: '{project}-{topology}-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: 'stateful'
-    odl_system_flavor: odl-standard-8
-    openstack_system_flavor: odl-standard-8
-    openstack_system2_flavor: odl-standard-4
-
-    topology:
-      - 1node:
-          openstack_system2_count: 2
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    functionality:
-      - upstream-stateful:
-          schedule: '@daily'
-      - upstream-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-          schedule: '@daily'
-      - gate-stateful
-      - gate-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-
-    openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          openstack_system_image: '{openstack_system_image_ocata}'
-          openstack_system2_image: '{openstack_system_image_ocata}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
-      - pike:
-          openstack-branch: 'stable/pike'
-          odl-ml2-branch: 'stable/pike'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_pike}'
-          openstack_system2_image: '{openstack_system_image_pike}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
-
 - project:
     name: netvirt-csit-sfc-openstack-integration
     jobs:
index bb4852f00fe9e2c15e731ef1213654d9ffd1275a..8cf106f8837c77fc3c00813402df58e71e900594 100644 (file)
@@ -11,9 +11,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     project: 'netvirt'
     archive-artifacts: '*.log **/target/surefire-reports/*.txt'
index 73b3adb169d08726512b4bf6a1a4e8e9312fbee4..194d2d69b6d50fcfbcad0cae4d24bc009f2e8ae1 100644 (file)
       - nitrogen:
           branch: 'stable/nitrogen'
           os-branch: 'pike'
-      - carbon:
-          branch: 'stable/carbon'
-          os-branch: 'ocata'
-          karaf-version: karaf3
 
     jdk: 'openjdk8'
 
index 8a00e9b51ce6b8fc70c17bc2c57f17689cb82381..6f83a6b8131b20b2739e126bbf05aa222dded35f 100644 (file)
@@ -20,9 +20,7 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+
     project: 'netvirt'
     project-name: 'netvirt'
     mvn-settings: 'netvirt-settings'
index 766bd81c7ce2459e277a6572619e1253efb89013..b51ce7ad241f2e393528e736886ab23fbdf87ad9 100644 (file)
     # Used by the release job
     staging-profile-id: a67e1b40d7419
 
-- project:
-    name: neutron-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'neutron'
-    project-name: 'neutron'
-    build-timeout: 60
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'neutron-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
-    email-upstream: '[neutron] [odlparent] [aaa]'
-
-    # Used by the release job
-    staging-profile-id: a67e1b40d7419
-
 - project:
     name: neutron-sonar
     jobs:
index 7303620545f5abb5ae9a8ed6f6465dc35e561965..c3025ee070b9966f4584a516c763c1cc0a96b11f 100644 (file)
     # Used by the release job
     staging-profile-id: a67e7c516f385
 
-- project:
-    name: next-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'next'
-    project-name: 'next'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'next-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[next]'
-
-    # Used by the release job
-    staging-profile-id: a67e7c516f385
-
 - project:
     name: next-sonar
     jobs:
index 6d21673ae47dea74c73f1a4689a9fee080dc2a95..59b60a8fd0b9b21bf80d269e9e18b5cf3e5bb1c3 100644 (file)
@@ -15,9 +15,6 @@
     stream:
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 0502ea4a623c4c2ce943c5d9035c977f591eba43..f79f0cf591fef4d75ce5b4807088c10719791c4c 100644 (file)
     # Used by the release job
     staging-profile-id: a67ef386204aa
 
-- project:
-    name: nic-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'nic'
-    project-name: 'nic'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'nic-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
-    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
-
-    # Used by the release job
-    staging-profile-id: a67ef386204aa
-
 - project:
     name: nic-sonar
     jobs:
index 142e659d88c675bf561aa178691fc51847772a2a..6b3da1bfe654a7e69597c081324e4d4e61a48982 100644 (file)
@@ -15,9 +15,6 @@
     stream:
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index a7c7c562802db897be7f85913ec62a5b651bf4a2..a1ee88d2263515ef41a338e0b2a6f200e5c52dc8 100644 (file)
@@ -15,9 +15,6 @@
     stream:
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index a9e86a85b755ffbf81c4f99b047c0ac22c304f43..87c429e09b1666b1b9d23d6c0738c3f004f0c5fa 100644 (file)
     # Used by the release job
     staging-profile-id: a687673279f9c
 
-- project:
-    name: ocpplugin-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'ocpplugin'
-    project-name: 'ocpplugin'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'ocpplugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a687673279f9c
-
 - project:
     name: ocpplugin-sonar
     jobs:
index 24da0238326a059a50b5c16bbb1d5da260b7563a..5c89996ce736f8a91e274f12c31dc2ff8d1394c6 100644 (file)
     javadoc-path: org.opendaylight.$PROJECT/$STREAM
     staging-profile-id: 880d5ac25eaa
 
-- project:
-    name: odlparent-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-      - gerrit-tox-verify
-
-    stream: carbon
-    project: 'odlparent'
-    project-name: 'odlparent'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'odlparent-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[odlparent]'
-    archive-artifacts: >
-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
-
-    # Used by the release job
-    javadoc-path: org.opendaylight.$PROJECT/$STREAM
-    staging-profile-id: 880d5ac25eaa
-
 - project:
     name: odlparent-sonar
     jobs:
index a614b79684c0b88e56e4ba160ba3bfd7a6f590cb..f806380c17a8bba99da899cf31f20ffed7e9fc27 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 0d918badf99a051eba268eed18fcf668ee4f7c3f..998c03f21a40031358013041a9019b07897a6d97 100644 (file)
     # Used by the release job
     staging-profile-id: a6880455efe67
 
-- project:
-    name: of-config-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'of-config'
-    project-name: 'of-config'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: netconf-merge-{stream}'
-    email-upstream: '[of-config] [netconf]'
-
-    # Used by the release job
-    staging-profile-id: a6880455efe67
-
 - project:
     name: of-config-sonar
     jobs:
index 2cdba404694c2c9a8605b46ab533ed627ce6f26e..77ea9f218c8b5103dd401aa526acfe5257fffb2d 100644 (file)
     # Used by the release job
     staging-profile-id: a68970cf5b25c
 
-- project:
-    name: circuitsw-carbon
-    jobs:
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'ofextensions/circuitsw'
-    project-name: 'circuitsw'
-    branch: 'stable/carbon'
-    mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[circuitsw]'
-
-    # Used by the release job
-    staging-profile-id: a68970cf5b25c
-
 - project:
     name: circuitsw-sonar
     jobs:
index 5a921c0cbca9301643ab6f57e4d7abceb72717e8..e207ab8003fb7ba69c37859231f7fcbee7d3d693 100644 (file)
     # Used by the release job
     staging-profile-id: a68a1507dae22
 
-- project:
-    name: openflowjava-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'openflowjava'
-    project-name: 'openflowjava'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'openflowjava-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a68a1507dae22
-
 - project:
     name: openflowjava-sonar
     jobs:
index 2ace6c4ad9aacf6c928a3f8f0eaf838835c5ce13..593d22a9778acc8cb9a9897c1045c1385f69bda4 100644 (file)
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - carbon:
-          branch: 'stable/carbon'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
 
     project: 'opflex'
     archive-artifacts: '**/*.tar.gz'
index 516fa7195bbbafea562720f5ec85d511bac1e3d4..b018d80d73e228ffc844689683d475060663a9a2 100644 (file)
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - carbon:
-          branch: 'stable/carbon'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
 
     project: 'opflex'
 
index 6e2100179e6fb8fe7c254bfc6a1c8cd066aa2b85..323de7492ab9b60676416a573ea99245e7952f0d 100644 (file)
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - carbon:
-          branch: 'stable/carbon'
-          libuv-version: '1.8.0'
-          rapidjson-version: '1.0.2'
-          openvswitch-version: '2.6.0'
 
     project: 'opflex'
     project-name: 'opflex'
index e0e4969a03c80675c17d29578cfde483abf9de22..1ab742cb4b17d6184eaced748552d5e7210f319a 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index b88d63f4601330dd51bd1dabb2fe2e4a4ba29990..ed3a0a02133d57f0994eb0741773d16cb44c1829 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 8495123cbd9d3d766336dfe1659b1a3bc257073a..5a45af0b36947cd1945381852fa3f1f14ae1ba40 100644 (file)
       - nitrogen:
           branch: 'stable/nitrogen'
           os-branch: 'pike'
-      - carbon:
-          branch: 'stable/carbon'
-          os-branch: 'ocata'
-          karaf-version: karaf3
 
     jdk: 'openjdk8'
 
index 60064bd31a1fd7a8b0a577c2812f7e1340c15a30..ee9d84b7fc9c83a7d7b058e005ef32051fb9d06c 100644 (file)
 
     # Used by the release job
     staging-profile-id: a68b188166958
-
-- project:
-    name: ovsdb-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'ovsdb'
-    project-name: 'ovsdb'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'ovsdb-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a68b188166958
index 13eb0eb1f2ce91c49912c104b750295f61f8e444..11ebc0952bc8b7c3d07d0882838f508b8487c6fb 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index bba23473590e8ea3bc4feedb5d0fac61b27825eb..ed16d18cba618c2b607fc06007a6691c43fcae8f 100644 (file)
     # Used by the release job
     staging-profile-id: a68ca4a24655c
 
-- project:
-    name: packetcable-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'packetcable'
-    project-name: 'packetcable'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'packetcable-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[packetcable]'
-
-    # Used by the release job
-    staging-profile-id: a68ca4a24655c
-
 - project:
     name: packetcable-sonar
     jobs:
index c745e21788534770c48f7cf972302ff03db62e65..f9b73e441aee77b7b7bad599411fa7bef9044e0f 100644 (file)
     # Used by the release job
     staging-profile-id: a68d3c2bb44d1
 
-- project:
-    name: persistence-carbon
-    jobs:
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'persistence'
-    project-name: 'persistence'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk7
-    mvn-settings: 'persistence-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[persistence]'
-
-    # Used by the release job
-    staging-profile-id: a68d3c2bb44d1
-
 - project:
     name: persistence-sonar
     jobs:
index 0c37c0bb49b0f58c9bb7b6367d5518252bce164b..b0fc45b597c3dd70f95ad770dc965319f06896da 100644 (file)
@@ -13,6 +13,7 @@
     build-timeout: 360
     build-node: centos7-builder-4c-4g
     schedule: ''
+    schedule-daily: 'H H * * *'
     schedule-saturday: 'H H * * 6'
     schedule-weekly: 'H 23 * * 6'
     schedule-high-frequency: 'H H/4 * * *'
@@ -68,6 +69,9 @@
     # Distribution bundle URL
     bundle-url: 'last'
     repo-url: ''
+    install-features: ''
+    sm-repos: ''
+    sm-features: ''
 
     # CSIT images configuration
     openstack_system_image_ocata: ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
     csit-high-frequency-list-carbon: >
         netvirt-csit-1node-openstack-ocata-upstream-stateful-carbon
     csit-sanity-list-fluorine: >
-        openflowplugin-csit-1node-sanity-only-fluorine
+        openflowplugin-csit-1node-sanity-only-fluorine,
+        distribution-sanity-fluorine
     csit-sanity-list-oxygen: >
-        openflowplugin-csit-1node-sanity-only-oxygen
+        openflowplugin-csit-1node-sanity-only-oxygen,
+        distribution-sanity-oxygen
     csit-sanity-list-nitrogen: >
-        openflowplugin-csit-1node-sanity-only-nitrogen
+        openflowplugin-csit-1node-sanity-only-nitrogen,
+        distribution-sanity-nitrogen
     csit-sanity-list-carbon: >
-        openflowplugin-csit-1node-sanity-only-carbon
+        openflowplugin-csit-1node-sanity-only-carbon,
+        distribution-sanity-carbon
     csit-weekly-list-fluorine: >
         controller-csit-1node-notifications-longevity-only-fluorine,
         controller-csit-3node-drb-partnheal-longevity-only-fluorine,
         controller-csit-3node-drb-precedence-longevity-only-fluorine,
         controller-csit-3node-ddb-expl-lead-movement-longevity-only-fluorine,
         bgpcep-csit-3node-bgpclustering-longevity-only-fluorine,
-        distribution-deploy-fluorine,
-        distribution-offline-fluorine,
         openflowplugin-csit-1node-longevity-only-fluorine
     csit-weekly-list-oxygen: >
         controller-csit-1node-notifications-longevity-only-oxygen,
         controller-csit-3node-drb-precedence-longevity-only-oxygen,
         controller-csit-3node-ddb-expl-lead-movement-longevity-only-oxygen,
         bgpcep-csit-3node-bgpclustering-longevity-only-oxygen,
-        distribution-deploy-oxygen,
-        distribution-offline-oxygen,
         openflowplugin-csit-1node-longevity-only-oxygen
     csit-weekly-list-nitrogen: >
         controller-csit-1node-notifications-longevity-only-nitrogen,
         controller-csit-3node-drb-precedence-longevity-only-nitrogen,
         controller-csit-3node-ddb-expl-lead-movement-longevity-only-nitrogen,
         bgpcep-csit-3node-bgpclustering-longevity-only-nitrogen,
-        distribution-deploy-nitrogen,
-        distribution-offline-nitrogen,
         openflowplugin-csit-1node-longevity-only-nitrogen
     csit-weekly-list-carbon: >
         controller-csit-1node-notifications-longevity-only-carbon,
         controller-csit-3node-drb-precedence-longevity-only-carbon,
         controller-csit-3node-ddb-expl-lead-movement-longevity-only-carbon,
         bgpcep-csit-3node-bgpclustering-longevity-only-carbon,
-        distribution-deploy-carbon,
-        distribution-offline-carbon,
         openflowplugin-csit-1node-longevity-only-carbon
index c1f1c0897de973b6ace8c30dee9c881ed61e19ef..f07f229d5ca47717323ae2112ab8eaefefaca325 100644 (file)
 
     builders:
       - shell: !include-raw-escape: opendaylight-infra-update-image-list.sh
-      - opendaylight-infra-push-gerrit-patch:
+      - lf-infra-push-gerrit-patch:
           project: '{project}'
+          gerrit-user: 'jenkins-$SILO'
+          gerrit-host: 'git.opendaylight.org'
           gerrit-topic: 'releng-update-cloud-image-list'
           gerrit-commit-message: 'Update cloud image list docs'
+          reviewers-email: 'jluhrsen@redhat.com'
 
     publishers:
       - email-notification:
index f57959410608274c5f4200b4d047b899e9958e52..6487231cb84ca48bb13e9cf97eb8ef653037bec7 100644 (file)
           default: ''
           description: |
               Ordered list of patches to build in the format of project=changeset (checkout) or
-              project:changeset (cherry-pick) for example: genius=32/53632/9,netvirt:59/50259/47
+              project:changeset (cherry-pick) for example: genius=32/53632/9,netvirt:59/50259/47.
+              A topic is also allowed, for example: topic=binding-tlc-rpc
 
 - parameter:
-    name: run-test-parameter
+    name: build-order-parameter
     parameters:
       - string:
-          name: RUN_TEST
-          default: '{run-test}'
-          description: 'Set true to run test after build'
+          name: BUILD_ORDER
+          default: '{build-order}'
+          description: 'Build order for multipatch test when topic is used'
 
 - parameter:
     name: build-fast-parameter
           default: '{build-fast}'
           description: 'Set true to build fast -Pq'
 
+- parameter:
+    name: run-test-parameter
+    parameters:
+      - string:
+          name: RUN_TEST
+          default: '{run-test}'
+          description: 'Set true to run test after build'
+
 - parameter:
     name: distribution-branch-to-build-parameter
     parameters:
       - shell: !include-raw: opendaylight-infra-stack.sh
       - shell: !include-raw-escape: opendaylight-infra-copy-ssh-keys.sh
 
-- builder:
-    name: opendaylight-infra-push-gerrit-patch
-    # opendaylight-infra-push-gerrit-patch.sh allows a job to push a patch to
-    # Gerrit in an automated fashion. This is meant for tasks that creates
-    # the same patch regularly and needs the ability to detect if an unreviewed
-    # patch already exists. In which case it will update the existing patch.
-    #
-    # Note: This patch assumes the $WORKSPACE contains the project repo with
-    #       the files changed already "git add" and waiting for a "git commit" call.
-    #
-    # This script requires the following JJB variables to be passed in:
-    #     {project}       Gerrit project-name
-    #     {gerrit-topic}  Gerrit topic, please make a unique topic.
-    #     {gerrit-commit-message} Commit message to assign to commit.
-    # NOTE: Requires git review to be installed on node.
-    builders:
-      - shell: !include-raw: opendaylight-infra-push-gerrit-patch.sh
-
 - builder:
     name: distribute-build-url
     # Place URL of the current run of a build job to a file at given path.
index 47b06b04e7d5066710557a7e74eabe31eee94072..bb02d193828f2e83855558af6b299ef182c68bf3 100644 (file)
     # Used by the release job
     staging-profile-id: a68d9bc504037
 
-- project:
-    name: reservation-carbon
-    jobs:
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'reservation'
-    project-name: 'reservation'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'reservation-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[reservation]'
-
-    # Used by the release job
-    staging-profile-id: a68d9bc504037
-
 - project:
     name: reservation-sonar
     jobs:
index da2df481e3589885e6df5b9a8e1a7e4d672c194a..1e1df4fc9ea32371ca3e816a14beea65695479f9 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index a9dd8c51fcceb8d1a76a9b6dbed0139ecaf17a2e..0d06515aee127d07a16c66d6ca47d9fddf742cc7 100644 (file)
     # Used by the release job
     staging-profile-id: a68e3d1ff55e3
 
-- project:
-    name: sdninterfaceapp-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'sdninterfaceapp'
-    project-name: 'sdninterfaceapp'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'sdninterfaceapp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'bgpcep-merge-{stream}'
-    email-upstream: '[sdninterfaceapp] [bgpcep]'
-
-    # Used by the release job
-    staging-profile-id: a68e3d1ff55e3
-
 - project:
     name: sdninterfaceapp-sonar
     jobs:
index c050efa8c3cbe1334966e7c662d03595a620f496..d9d576e42275702797a5f382a87828d955742e9e 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index a0dc38318246cf4a53ed5a5cd53ca066932886f9..e6be93e35e489f12ef8f672299f2ebabf9d960f7 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index d3da132334eea099e309939671688afb2257d8db..0d155f72fedc72c959a28da24b7eeae39cf858f5 100644 (file)
@@ -15,9 +15,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     feature:
       - basic:
index 331afd100d16fac746af45b9ab22613bf0a6cf42..54ea866be7aa0c8b7dfc68492f0387edb887f8bd 100644 (file)
@@ -11,8 +11,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
 
     project: 'sfc'
     project-name: 'sfc'
index ab58e449b15e736227e610c6102eea5ed924ed16..75d1bd250bbc7cb8e528111496c63e920588bab2 100644 (file)
     # Used by the release job
     staging-profile-id: a68eb361ca48a
 
-- project:
-    name: sfc-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'sfc'
-    project-name: 'sfc'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'sfc-settings'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
-    email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    build-node: centos7-builder-8c-8g
-
-    # Used by the release job
-    staging-profile-id: a68eb361ca48a
-
 - project:
     name: sfc-sonar
     jobs:
index 86c6be31cf5823c1f9386433da32a28e821ed322..045e7a8a28d8f6ad0fc760e112cad9bd92f95d47 100644 (file)
     # Used by the release job
     staging-profile-id: a68f328cefed6
 
-- project:
-    name: snbi-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'snbi'
-    project-name: 'snbi'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'snbi-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[snbi]'
-
-    # Used by the release job
-    staging-profile-id: a68f328cefed6
-
 - project:
     name: snbi-sonar
     jobs:
index 5eb654f4872f03b958b8ab8319d807fcae936f82..a66bf0a18fdc8e9677bb7740a21f6187532fc697 100644 (file)
     # Used by the release job
     staging-profile-id: a68fb236b93a6
 
-- project:
-    name: snmp-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'snmp'
-    project-name: 'snmp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'snmp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[snmp] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a68fb236b93a6
-
 - project:
     name: snmp-sonar
     jobs:
index 9d07ce18bc6c63d5b0ef2c6597dfb787144b210e..0eac9f8d5de59dd5ed32143c6fa48c917d7831c2 100644 (file)
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
 
-- project:
-    name: snmp4sdn-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'snmp4sdn-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a69034a4b6ef5
-
 - project:
     name: snmp4sdn-sonar
     jobs:
index 32f2fea771e467af5543570f75020b2254fb4b65..b6656a02cdbb8faf64eda99a6d8ae1d8f323d6d0 100644 (file)
@@ -21,9 +21,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index d7b95d23c39cda248e2cde1e89081e4975e27402..a54a2f697ab06b1471d178b189260d764e613d71 100644 (file)
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-          install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-route'
 
     install:
       - all:
index 7404e0b81caf58695110b1951cca966efcebf83c..2013f744b0b38cb4b4ca20ab08679c1646e1d973 100644 (file)
@@ -21,9 +21,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 1c18ccd314298a46970f952e1d1b14ab65838686..2314008f8de69ddd530e339190557e4d142634ad 100644 (file)
@@ -21,9 +21,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 954ab23cab2878565f51116168a1f34d1ec141ab..cb63fe7b3bbdceb05ff5cacbaf5cd042310fc193 100644 (file)
@@ -21,9 +21,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 28abaf89d3d86ccf7bf4f78a1e7044cb6dc931a6..4b0ab51c7b3ef5100f3433d336049f05c74fbfbd 100644 (file)
@@ -21,9 +21,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index e3bb0b8768584d1062d74d721ca9910c8fdaaf5a..9d661fad5ae534e30976c737465a194b7f496afc 100644 (file)
     # Used by the release job
     staging-profile-id: a6909c75719b7
 
-- project:
-    name: sxp-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'sxp'
-    project-name: 'sxp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'sxp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a6909c75719b7
-
 - project:
     name: sxp-sonar
     jobs:
index f6b280bb9eacc3ae813370238164cc06b8578452..cf76a47f9980fbf336dbf6b3ffd0c3bdfbb395b3 100644 (file)
     # Used by the release job
     staging-profile-id: a69113575458e
 
-- project:
-    name: systemmetrics-carbon
-    jobs:
-      - odl-maven-jobs
-
-    project: 'systemmetrics'
-    project-name: 'systemmetrics'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'systemmetrics-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a69113575458e
-
 - project:
     name: systemmetrics-sonar
     jobs:
index a9def51b867ef5ef18f89ef890cbe896cc4fb679..a1d471497030666105a051b49410a26157f00018 100644 (file)
@@ -15,9 +15,6 @@
     stream:
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index b2a84b5d70163a3cfef8806057939b8b9a657112..97b7e3630c62c1e943ed9c8fd41e99d6408f1436 100644 (file)
     # Used by the release job
     staging-profile-id: a691bbe2328cb
 
-- project:
-    name: topoprocessing-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'topoprocessing'
-    project-name: 'topoprocessing'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'topoprocessing-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a691bbe2328cb
-
 - project:
     name: topoprocessing-sonar
     jobs:
index 30ab98e93c08fe4a30316aa1c6dc9caf9ac6fb39..e17f3469b06e0bd1bd4e47366708b8f6b08f3203 100644 (file)
     # Used by the release job
     staging-profile-id: a6927323fa3d4
 
-- project:
-    name: transportpce-carbon
-    jobs:
-      - odl-maven-jobs
-
-    project: 'transportpce'
-    project-name: 'transportpce'
-    stream: carbon
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'transportpce-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: a6927323fa3d4
-
 - project:
     name: transportpce-sonar
     jobs:
index 0abf934ed223dc04d3f8c33bef3fbd2cfc7105d3..6e9a43ba30f01ce1c4666557cf878e7206eb2932 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index 02e9df3cd6e5c086540387a9c6a1a5cd779a786f..57f60b33582a6f7388071f7565343379af2ecc08 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index c574684aeee5be9b03943402d072bf477e974816..a034c1b0009fb22781b2808d6d69079ff2620c7d 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 8c251df84db80e82624852ccaac0c84a21fb6048..0e35d1c50f7dca54f2df559a4e07ed24880a5628 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index a213d46d0ae4dae8b0d66dc2b24669d724cf1cc0..2fe38b4c17b25829174cad38ef3a5987ec279dfd 100644 (file)
     # Used by the release job
     staging-profile-id: a69373036303c
 
-- project:
-    name: tsdr-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'tsdr'
-    project-name: 'tsdr'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'tsdr-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[tsdr]'
-
-    # Used by the release job
-    staging-profile-id: a69373036303c
-
 - project:
     name: tsdr-sonar
     jobs:
index 0d06e7e91d32d50246a7ec8803795295a63d4299..8d4fbdf700d0e3e2f763bd313854a04d164e311f 100644 (file)
     # Used by the release job
     staging-profile-id: a693f948563d5
 
-- project:
-    name: ttp-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'ttp'
-    project-name: 'ttp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'ttp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[ttp] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a693f948563d5
-
 - project:
     name: ttp-sonar
     jobs:
index f8e2542a5fa2de930cb2d82c99a9fc6913755e43..a7753324a740fccf203768ad4b3e3a770883b058 100644 (file)
@@ -15,9 +15,6 @@
     stream:
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 4e74f04215b84034c2db334c1fa9b18c2c41742c..c221e79d595b8663a5b0745a34d5a5ac4a8f1dfe 100644 (file)
@@ -15,9 +15,6 @@
     stream:
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 5a73394ed6ae8f4f3037a62c4c7965dbceb6256d..ebc5171c08f2c1c43bd17a4024f5b88bd05da4e1 100644 (file)
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
 
-- project:
-    name: unimgr-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'unimgr'
-    project-name: 'unimgr'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'unimgr-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'ovsdb-merge-{stream}'
-    email-upstream: '[unimgr] [ovsdb]'
-    build-node: centos7-builder-4c-16g
-
-    # Used by the release job
-    staging-profile-id: a695d0a0b8d51
-
 - project:
     name: unimgr-sonar
     jobs:
index a43ce024c75d3beacfa16ac30e0d9b54d77e94ad..0ef3a94d96a5ce3a41e627cb780c748603ef2c2e 100644 (file)
@@ -22,9 +22,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index ca04c7f2d62aa361e2280c09a8ada5a273d7b189..02a1d544c5493965ddb1f980903d122c4f645868 100644 (file)
@@ -21,9 +21,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index b11b299d81546a4a19b9679df86399bcf8e23b47..e447eca17d0b94d2dc0a23fdbfbc315c0a6c782f 100644 (file)
     # Used by the release job
     staging-profile-id: a697b633b3ffe
 
-- project:
-    name: usc-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'usc'
-    project-name: 'usc'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'usc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a697b633b3ffe
-
 - project:
     name: usc-sonar
     jobs:
index ff278048d5b953193576dc6f9b565af4c368b3d9..83d3b707bd4fb3219df248dd7d12a1887b71cfcf 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
index 32263d804e0950efcde13677dccf806070b68c2d..5a372d08da87486de2e8b4a68b9dd2d75dfe1326 100644 (file)
     # Used by the release job
     staging-profile-id: a69902281e037
 
-- project:
-    name: usecplugin-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'usecplugin'
-    project-name: 'usecplugin'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'usecplugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowplugin-merge-{stream}'
-    email-upstream: '[usecplugin] [openflowplugin]'
-
-    # Used by the release job
-    staging-profile-id: a69902281e037
-
 - project:
     name: usecplugin-sonar
     jobs:
index 8a775119ab876e765c251237c39c817bddd2a9a4..d943a07e516011d13afa23c40a9af6094410ead3 100644 (file)
     # Used by the release job
     staging-profile-id: a69aae2832869
 
-- project:
-    name: yang-push-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'yang-push'
-    project-name: 'yang-push'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'yang-push-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[yang-push]'
-
-    # Used by the release job
-    staging-profile-id: a69aae2832869
-
 - project:
     name: yang-push-sonar
     jobs:
index 2e8ec0ae28d08bedc3db1ecd6a6fd08886fe69c4..2cfe449b6f4d7345e1e08580735f5489e560e070 100644 (file)
     # Used by the release job
     staging-profile-id: fba306956f98
 
-- project:
-    name: yangide-carbon
-    jobs:
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'yangide'
-    project-name: 'yangide'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'yangide-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[yangide] [odlparent] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: fba306956f98
-
 - project:
     name: yangide-sonar
     jobs:
index 52320ec7e4ffae063cddd3b5bfc657a97b4123c6..7d53f7fc560f5f3b41983c767d3eb7826cef6017 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - only:
index 2812b50aafd289c43a1023287d2b8dd08aa3e0f9..c7d14dab5d96bc97902928474a71307104d034c3 100644 (file)
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 
-- project:
-    name: yangtools-carbon
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'yangtools'
-    project-name: 'yangtools'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    mvn-settings: 'yangtools-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[yangtools] [odlparent]'
-    archive-artifacts: >
-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
-
-    # Used by the release job
-    staging-profile-id: 1271cf710cc09d
-
 - project:
     name: yangtools-sonar
     jobs: