Merge "Create install-test-uninstall-deb builder"

diff --git a/docs/jenkins.rst b/docs/jenkins.rst
index 464bb7cf307a5c4dc4cf2f8d2946aeea01ed6dc1..6cb6585836fda784667c9043e242171356972763 100644 (file)
--- a/docs/jenkins.rst
+++ b/docs/jenkins.rst
@@ -539,6 +539,29 @@ To install from a tag, like 1.4.0:
     $ cat jjb/requirements.txt
     -e git+https://git.openstack.org/openstack-infra/jenkins-job-builder@1.4.0#egg=jenkins-job-builder
 
+Updating releng/builder repo or global-jjb
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Follow these steps to update the releng/builder repo. The repo uses a submodule from
+a global-jjb repo so that common source can be shared across different projects. This
+requires updating the releng/builder repo periodically to pick up the changes. New
+versions of jjb could also require updating the releng/builder repo. Follow the
+previous steps earlier for updating jenkins-jobs using the
+`builder/jjb/requirements.txt <odl-jjb-requirements.txt_>`_ file. Ensure that the
+version listed in the file is the currently supported version, otherwise install a
+different version or simply upgrade using `pip install --upgrade jenkins-job-builder`.
+
+The example below assumes the user has cloned releng/builder to `~/git/releng/builder`.
+Update the repo, update the submodules and then submit a test to verify it works.
+
+.. code-block:: bash
+
+    cd ~/git/releng/builder
+    git checkout master
+    git pull
+    git submodule update --init --recursive
+    jenkins-jobs --conf jenkins.ini test jjb/ netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine
+
 Installing JJB Manually
 -----------------------
 
@@ -948,6 +971,11 @@ pushing, those changes will exist in the sandbox job. The format of the comment
 
         jjb-deploy <job name>
 
+.. note::
+
+    Also note that wildcards can be used in <job name> which
+    will expand all jobs that exist for the pattern.
+
 Running Jobs
 ^^^^^^^^^^^^
 

diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml
new file mode 100644 (file)
index 0000000..657fa09
--- /dev/null
+++ b/jjb/archetypes/archetypes.yaml
@@ -0,0 +1,26 @@
+---
+- project:
+    name: archetypes-fluorine
+    jobs:
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'archetypes'
+    project-name: 'archetypes'
+    branch: 'master'
+    mvn-settings: 'archetypes-settings'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
+    email-upstream: '[archetypes] [odlparent] [yangtools] [controller] [mdsal]'
+
+    # Used by the release job
+    staging-profile-id: d88dcfe6ce48d
+
+- project:
+    name: archetypes-sonar
+    jobs:
+      - gerrit-maven-sonar
+
+    project: 'archetypes'
+    project-name: 'archetypes'
+    branch: 'master'
+    mvn-settings: 'archetypes-settings'

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 429eb3fc452256c87db0f15c474d61bd10f69b0f..80a133bfdaf4b26de94467f1410f01351940175f 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -19,25 +19,23 @@
           next-release-tag: '{stream}'
           branch: 'master'
           integration-test: fluorine
-          extra-mvn-opts: -Dsft.heap.max=4g
+          extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
       - oxygen:
           next-release-tag: '{stream}'
           branch: 'stable/oxygen'
           integration-test: oxygen
-          extra-mvn-opts: -Dsft.heap.max=4g
+          extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
       - nitrogen:
-          # Run once a week (Sunday) now that Fluorine branch is cut, and Oxygen is pending release
-          cron: 'H 12 * * 0'
           next-release-tag: '{stream}'
           branch: 'stable/nitrogen'
           integration-test: nitrogen
-          extra-mvn-opts: -Dsft.heap.max=4g
+          extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
       - carbon:
           next-release-tag: '{stream}'
           branch: 'stable/carbon'
           integration-test: carbon
           karaf-version: karaf3
-          extra-mvn-opts: -Dskip.karaf4.featureTest=true
+          extra-mvn-opts: -P!karaf -Dskip.karaf4.featureTest=true
 
     project: releng/autorelease
     project-name: autorelease

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 560f30a362a3eb9be8444947c65a47bd7202d3ee..e0733cb4fb04e2fd83e0659605818896cf54d48e 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -54,11 +54,12 @@
 - job-template:
     name: 'autorelease-release-{stream}'
 
-    ############
-    # Defaults #
-    ############
+    ######################
+    # Default parameters #
+    ######################
 
     build-node: '{build-node}'
+    cron: 'H 0 * * *'
     java-version: openjdk8
     mvn-version: mvn33
     extra-mvn-opts: ''
@@ -70,7 +71,6 @@
     project-type: freestyle
     node: '{build-node}'
     jdk: '{java-version}'
-    cron: 'H 0 * * *'
 
     properties:
       - lf-infra-properties:
@@ -153,7 +153,6 @@
               $EXTRA_MVN_OPTS
               -Pintegrationtests,docs,repoBuild
               -Dcheckstyle.skip=true
-              -Dkaraf.keep.unpack=true
               -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage
               {opendaylight-infra-mvn-opts}
           java-opts:
@@ -173,11 +172,6 @@
       - shell: |
           mkdir -p archives/
           cp *.log *.prop $_
-          for file in $(find . -name karaf.log); do
-              module="${{file%%/target/*}}"
-              module="${{module##*/}}"
-              cp "$file" "archives/${{module}}-karaf.log"
-          done
 
     publishers:
       - opendaylight-infra-notify-status
@@ -206,10 +200,30 @@
             predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL
             property-file: variables.jenkins-trigger
             fail-on-missing: true
+      # Critical component of the OpenDaylight community
+      - postbuildscript:
+          builders:
+            - role: BOTH
+              build-on:
+                - SUCCESS
+              build-steps:
+                - shell: echo '#topic cookies'
+          mark-unstable-if-failed: false
       - lf-infra-publish
 
 - job-template:
     name: autorelease-update-validate-jobs-{stream}
+
+    ######################
+    # Default parameters #
+    ######################
+
+    cron: '@weekly'
+
+    #####################
+    # Job configuration #
+    #####################
+
     project-type: freestyle
     node: centos7-builder-2c-1g
 
@@ -234,6 +248,7 @@
           choosing-strategy: default
 
     triggers:
+      - timed: '{cron}'
       - gerrit:
           server-name: '{gerrit-server-name}'
           trigger-on:
@@ -494,7 +509,6 @@
           goals: |
               clean validate
               -Pq
-              -Dkaraf.keep.unpack=true
               {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -505,11 +519,6 @@
       - shell: |
           mkdir -p archives/
           cp *.log $_
-          for file in $(find . -name karaf.log); do
-              module="${{file%%/target/*}}"
-              module="${{module##*/}}"
-              cp "$file" "archives/${{module}}-karaf.log"
-          done
 
     publishers:
       - email-notification:

diff --git a/jjb/autorelease/notify-build-failure.sh b/jjb/autorelease/notify-build-failure.sh
index 0e3fe29b4f3fed4d86795a2716cbe4bea83cae62..939c46b5ef06883c1f7fbf1663510f31e91af62d 100644 (file)
--- a/jjb/autorelease/notify-build-failure.sh
+++ b/jjb/autorelease/notify-build-failure.sh
@@ -81,11 +81,11 @@ if [ ! -z "$ARTIFACT_ID" ]; then
     elif [ "${#grouplist[@]}" -gt 1 ]; then
         GROUPLIST="NOTE: The artifactId: $ARTIFACT_ID matches multiple groups: ${grouplist[*]}"
     else
-        echo "Failed to determine project.groupId using xpaths"
+        echo "Unable to determine project.groupId using xpaths"
     fi
 else
-    echo "Failed to determine ARTIFACT_ID"
-    exit 1
+    echo "Unable to determine failed ARTIFACT_ID. Build likely successful or bug in this script."
+    exit 0
 fi
 
 # Construct email subject & body

diff --git a/jjb/autorelease/validate-autorelease-carbon.yaml b/jjb/autorelease/validate-autorelease-carbon.yaml
index de0f2238c93dcb0aaffa0c61ffd04394230cd101..c4647d868529d62dde10d6b852c811a724942dc7 100644 (file)
--- a/jjb/autorelease/validate-autorelease-carbon.yaml
+++ b/jjb/autorelease/validate-autorelease-carbon.yaml
@@ -97,7 +97,5 @@
           project: unimgr
       - usc:
           project: usc
-      - vtn:
-          project: vtn
       - yangtools:
           project: yangtools

diff --git a/jjb/autorelease/validate-autorelease-fluorine.yaml b/jjb/autorelease/validate-autorelease-fluorine.yaml
index 559be4acee173a2d0589e5e2422776f6279ab0d0..17c565b68eb220a92bc1b3e1a92d8a292a0a76c3 100644 (file)
--- a/jjb/autorelease/validate-autorelease-fluorine.yaml
+++ b/jjb/autorelease/validate-autorelease-fluorine.yaml
@@ -19,8 +19,6 @@
           project: daexim
       - genius:
           project: genius
-      - honeycomb-vbd:
-          project: honeycomb/vbd
       - infrautils:
           project: infrautils
       - integration-distribution:

diff --git a/jjb/autorelease/validate-autorelease-nitrogen.yaml b/jjb/autorelease/validate-autorelease-nitrogen.yaml
index 7b1c76c85f70c8b502da2f34d078c4079c253b17..b388684d9890858a8e03234a395cdbeb6af18770 100644 (file)
--- a/jjb/autorelease/validate-autorelease-nitrogen.yaml
+++ b/jjb/autorelease/validate-autorelease-nitrogen.yaml
@@ -83,7 +83,5 @@
           project: unimgr
       - usc:
           project: usc
-      - vtn:
-          project: vtn
       - yangtools:
           project: yangtools

diff --git a/jjb/autorelease/validate-autorelease-oxygen.yaml b/jjb/autorelease/validate-autorelease-oxygen.yaml
index 4a4f99a49edf5caa74e33b6a4938c15aeb1f0168..cc5bdf577e246a0ad4404d432f411d726f559186 100644 (file)
--- a/jjb/autorelease/validate-autorelease-oxygen.yaml
+++ b/jjb/autorelease/validate-autorelease-oxygen.yaml
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-validate-autorelease-{stream}'
     stream: oxygen
-    branch: master
+    branch: stable/oxygen
     project-name:
       - aaa:
           project: aaa

diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh
index fc7e0466a15b48f354dfb8d2a8399f6454ca63a4..54bd1203f62b0bb01728a9d132ae6498980b5ca3 100644 (file)
--- a/jjb/autorelease/version-bump.sh
+++ b/jjb/autorelease/version-bump.sh
@@ -16,6 +16,7 @@ echo "---> version-bump.sh"
 # The only purpose of RELEASE_TAG in this script is to set the Gerrit topic.
 # It is also used as a placeholder for version bumping but gets wiped out
 # immediately to bump versions by x.y.(z+1).
+TOPIC="${RELEASE_TAG}"
 RELEASE_TAG="${STREAM^}"
 
 mkdir -p "$WORKSPACE/archives"
@@ -131,7 +132,7 @@ git submodule foreach git checkout -f
 if [ "$DRY_RUN" = "false" ]
 then
     # Push up patches last, as long as nothing failed.
-    git submodule foreach git review --yes -t "${RELEASE_TAG}"
+    git submodule foreach git review --yes -t "${TOPIC}"
 fi
 
 echo "Version bumping complete."

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 0eca8dc68df57172bb3afaec0964ad940c03221e..39e0958293ad32d57a7a6f6c3bc6d6d56f6ae169 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -38,7 +38,7 @@
         -v USE_NETCONF_CONNECTOR:False
         -v PCEP_READY_VERIFY_TIMEOUT:5
         -v RESTCONF_REUSE:False
-        -v UPDATER_TIMEOUT:600
+        -v UPDATER_TIMEOUT:900
 
     # Controller configuration
     odl_system_flavor: v2-standard-4

diff --git a/jjb/integration/csit-jobs-carbon.lst b/jjb/integration/csit-jobs-carbon.lst
index d22086acf88b461d9f7905df0a0bc939efc19564..ac2f4910538d9b9a46c651c4a49c950e97566d94 100644 (file)
--- a/jjb/integration/csit-jobs-carbon.lst
+++ b/jjb/integration/csit-jobs-carbon.lst
@@ -93,8 +93,5 @@ unimgr-csit-1node-legato-all-carbon,
 usc-csit-1node-channel-all-carbon,
 usc-csit-1node-tcp-all-carbon,
 usecplugin-csit-1node-basic-all-carbon,
-vtn-csit-1node-coordinator-only-carbon,
-vtn-csit-1node-manager-all-carbon,
 vtn-csit-1node-openstack-pike-neutron-carbon,
-vtn-csit-3node-manager-all-carbon,
 yangtools-csit-1node-periodic-system-only-carbon,

diff --git a/jjb/integration/csit-jobs-nitrogen.lst b/jjb/integration/csit-jobs-nitrogen.lst
index b9b10d89680d620ac0661f14bedfb05ebfd6d985..2263f3284940612c4cd1c749e6b70ea0963fba93 100644 (file)
--- a/jjb/integration/csit-jobs-nitrogen.lst
+++ b/jjb/integration/csit-jobs-nitrogen.lst
@@ -86,8 +86,5 @@ unimgr-csit-1node-legato-all-nitrogen,
 usc-csit-1node-channel-all-nitrogen,
 usc-csit-1node-tcp-all-nitrogen,
 usecplugin-csit-1node-basic-all-nitrogen,
-vtn-csit-1node-coordinator-only-nitrogen,
-vtn-csit-1node-manager-all-nitrogen,
 vtn-csit-1node-openstack-pike-neutron-nitrogen,
-vtn-csit-3node-manager-all-nitrogen,
 yangtools-csit-1node-periodic-system-only-nitrogen,

diff --git a/jjb/integration/csit-jobs-oxygen.lst b/jjb/integration/csit-jobs-oxygen.lst
index 63d9842840fb17f967323dc5b97d2c361397c66d..f0ce5ae5b63b58c7f509a0113a84370ea8254af9 100644 (file)
--- a/jjb/integration/csit-jobs-oxygen.lst
+++ b/jjb/integration/csit-jobs-oxygen.lst
@@ -82,8 +82,5 @@ tsdr-csit-1node-hbase-datastore-all-oxygen,
 tsdr-csit-1node-hsqldb-datastore-all-oxygen,
 usc-csit-1node-channel-all-oxygen,
 usc-csit-1node-tcp-all-oxygen,
-vtn-csit-1node-coordinator-only-oxygen,
-vtn-csit-1node-manager-all-oxygen,
 vtn-csit-1node-openstack-pike-neutron-oxygen,
-vtn-csit-3node-manager-all-oxygen,
 yangtools-csit-1node-periodic-system-only-oxygen,

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 0924a876be2228f954e151200e52d20f015d08b0..c5c8125f66263c59a18c5721882771c42f5b38fc 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -186,7 +186,7 @@
                 exclude-no-code-change: false
             - draft-published-event
             - comment-added-contains-event:
-                comment-contains-value: recheck
+                comment-contains-value: 'recheck$'
           override-votes: true
           gerrit-build-unstable-verified-value: +1
           gerrit-build-unstable-codereview-value: 0

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 6c3f046a001c2cc935e4b8b17da032068765efea..6f525f57f1cdfdf7b3df8c7ce7df35f66c8cc042 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -22,6 +22,7 @@
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
+          robot-options: '-v FAIL_ON_EXCEPTIONS:True'
       - 3node:
           openstack_system2_count: 3
           odl_system_count: 3

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 31f3963f8301bee75cc9e9328bfe5690d335fb73..50b654e6ffb97995b9592d672e44117bcdaf76ae 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -6,6 +6,7 @@
       - '{project-name}-maven-javadoc-jobs'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
           project-pattern: netvirt
           rtd-project: odl-netvirt
       - gerrit-tox-verify

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 8e65b7cdcfd134ffc59fadcda20d79a255b6e3f4..bb7add2fbb79eb9afc3ad59acbe7c87958aced6f 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -6,6 +6,7 @@
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
           project-pattern: integration/packaging
           rtd-project: odl-integrationpackaging
       - 'packaging-build-rpm-{stream}'

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 89508caf615bbf451bf6c8c8fc5a7ae2e7b1e904..1a38abbcd43d8005d2176eeef43a14e78c951a27 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -191,7 +191,7 @@
                 exclude-no-code-change: false
             - draft-published-event
             - comment-added-contains-event:
-                comment-contains-value: recheck
+                comment-contains-value: 'recheck$'
           projects:
             - project-compare-type: ANT
               project-pattern: '{project}'
@@ -211,7 +211,7 @@
           trigger-on:
             - change-merged-event
             - comment-added-contains-event:
-                comment-contains-value: 'remerge'
+                comment-contains-value: 'remerge$'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{name}'

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index ed88f5101aafd1b5b8a7209e74fb44fe8f66d865..89869dccde90eadd01f22ddc581100b9154c8f4f 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -108,6 +108,7 @@
       **/target/**/feature.xml
       **/target/failsafe-reports/failsafe-summary.xml
       **/target/surefire-reports/*-output.txt
+    mvn-opts: ''
     mvn-version: mvn33
     java-version: openjdk8
 

diff --git a/jjb/requirements.txt b/jjb/requirements.txt
index c6ee1eab24d31ca84ce8100b3ef918dddb610941..61d8a13567be36043c93cc83417f1e9a9f6e76bb 100644 (file)
--- a/jjb/requirements.txt
+++ b/jjb/requirements.txt
@@ -1 +1 @@
-jenkins-job-builder==1.6.2
+jenkins-job-builder==2.0.3

diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml
index 144a8f4e5d35cdfefcd41a8c7df268a319f7ca93..00cbb34b56daea39ce6cc38c371d59cc00a99a5e 100644 (file)
--- a/jjb/sxp/sxp-csit-basic.yaml
+++ b/jjb/sxp/sxp-csit-basic.yaml
@@ -14,6 +14,9 @@
     stream:
       - fluorine:
           branch: 'master'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
+          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:

diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml
index 8f6aec788956909b5cfdde2caa4ee2bca6bb02ab..36f1dd602a2ddfa7e0863e0020230f64dccdb150 100644 (file)
--- a/jjb/sxp/sxp-csit-cluster-routing.yaml
+++ b/jjb/sxp/sxp-csit-cluster-routing.yaml
@@ -14,6 +14,9 @@
     stream:
       - fluorine:
           branch: 'master'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
+          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:

diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml
index b724bd0d19a6094998a15fe4a3e7ad1e9bfa30f0..e337efc73f05463c3e3a2d374ffca3f894585aa6 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -14,6 +14,9 @@
     stream:
       - fluorine:
           branch: 'master'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
+          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index be42360bcb88ce280e569ca6dc75c6f828ee346d..5325dea6d6c5c53aeb302b4a89ade204fd73cfac 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -14,6 +14,9 @@
     stream:
       - fluorine:
           branch: 'master'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
+          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:

diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml
index b78f1f4a7b88f893bf02a7cd35a9c21db3afe25f..377d24949a6590c7942330462c549161c28e5c33 100644 (file)
--- a/jjb/sxp/sxp-csit-performance.yaml
+++ b/jjb/sxp/sxp-csit-performance.yaml
@@ -14,6 +14,9 @@
     stream:
       - fluorine:
           branch: 'master'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
+          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index 00950eff3b11843f27b61c5a051d986d2737c097..74147dfdde57e17dd1fd6f71d808c85f27e2e193 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -14,6 +14,9 @@
     stream:
       - fluorine:
           branch: 'master'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
+          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:

diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml
new file mode 100644 (file)
index 0000000..75a34f5
--- /dev/null
+++ b/jjb/telemetry/telemetry.yaml
@@ -0,0 +1,38 @@
+---
+- project:
+    name: telemetry-fluorine
+    jobs:
+      - 'odl-maven-jobs'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+
+    stream: fluorine
+    project: 'telemetry'
+    project-name: 'telemetry'
+    branch: 'master'
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'telemetry-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[telemetry]'
+    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 8ed9c52266504
+
+- project:
+    name: telemetry-sonar
+    jobs:
+      - gerrit-maven-sonar
+
+    project: 'telemetry'
+    project-name: 'telemetry'
+    branch: 'master'
+    mvn-settings: 'telemetry-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml
index 9176ec0c24100a146189b15b62e423c5a232ccef..4c418656e22e0e01777d98b44e28f8efc87be261 100644 (file)
--- a/jjb/usc/usc-csit-channel.yaml
+++ b/jjb/usc/usc-csit-channel.yaml
@@ -15,6 +15,9 @@
     stream:
       - fluorine:
           branch: 'master'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
+          bundle-url: 'https://jenkins.opendaylight.org/releng/view/usc/job/usc-merge-fluorine/lastBuild/org.opendaylight.usc$usc-karaf/artifact/org.opendaylight.usc/usc-karaf/1.6.0-SNAPSHOT/usc-karaf-1.6.0-SNAPSHOT.zip'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:

diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml
deleted file mode 100644 (file)
index 21ec6ea..0000000
--- a/jjb/vtn/vtn-csit-3node-manager.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- project:
-    name: vtn-csit-3node-manager
-    jobs:
-      - inttest-csit-3node
-      - inttest-csit-verify-3node
-
-    # The project name
-    project: 'vtn'
-
-    # The functionality under test
-    functionality: 'manager'
-
-    # Project branches
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-vtn-manager-rest,odl-vtn-manager-neutron'
-
-    # Robot custom options
-    robot-options: ''
-
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847'

diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml
deleted file mode 100644 (file)
index e1acbb2..0000000
--- a/jjb/vtn/vtn-csit-coordinator.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- project:
-    name: vtn-csit-vtn-coordinator
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'vtn'
-
-    # The functionality under test
-    functionality: 'coordinator'
-
-    # Project branches
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-          tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: 'odl-vtn-manager-rest'
-
-
-    # Robot custom options
-    robot-options: ''

diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml
deleted file mode 100644 (file)
index fd04de7..0000000
--- a/jjb/vtn/vtn-csit-manager.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- project:
-    name: vtn-csit-manager
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'vtn'
-
-    # The functionality under test
-    functionality: 'manager'
-
-    # Project branches
-    stream:
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-vtn-manager-rest,odl-vtn-manager-neutron'
-
-    # Robot custom options
-    robot-options: ''
-
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847