From: Sam Hague Date: Sat, 20 Jan 2018 14:43:38 +0000 (+0000) Subject: Merge "Remove COE openstack based CSIT" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=bd47fbd3e4d8688d5e789ee814a78d6979bc9a46;hp=d80dc2683101f65bb41f8c2738a23f7377a86d7e;p=releng%2Fbuilder.git Merge "Remove COE openstack based CSIT" --- diff --git a/docs/jenkins.rst b/docs/jenkins.rst index 6b07f6c06..e6f802a04 100644 --- a/docs/jenkins.rst +++ b/docs/jenkins.rst @@ -202,26 +202,50 @@ accounts in the cloud so should ensure consistent performance. - CPUs - Memory - * - v1-performance-1 + * - v2-standard-1 - 1 - 4 - * - v1-performance-2 + * - v2-standard-2 - 2 - 8 - * - v1-performance-4 + * - v2-standard-4 - 4 - 16 - * - v1-performance-8 + * - v2-standard-8 - 8 - 32 - * - v1-performance-16 + * - v2-standard-16 - 16 - 64 + * - v2-highcpu-1 + - 1 + - 1 + + * - v2-highcpu-2 + - 2 + - 2 + + * - v2-highcpu-4 + - 4 + - 4 + + * - v2-highcpu-8 + - 8 + - 8 + + * - v2-highcpu-16 + - 16 + - 16 + + * - v2-highcpu-32 + - 32 + - 32 + Pool: ODLVEX ^^^^^^^^^^^^ diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 72a41e37f..e6816390e 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'aaa' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'aaa' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'aaa' diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index a85a816a2..4527fd8e8 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'alto' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'alto' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'alto' diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index d6cb887f6..7a9dad82b 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'atrium' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'atrium' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'atrium' diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 588d9053c..3dfe88483 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -418,6 +418,8 @@ settings-type: cfp global-settings: global-settings global-settings-type: cfp + # Hack to workaround the duplicate-finder plugin in odlparent breaking validate-autorelease + - shell: sed -i 's/validate/none/' /tmp/r/org/opendaylight/odlparent/odlparent/3.0.2/odlparent-3.0.2.pom - maven-target: maven-version: mvn33 pom: pom.xml diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 6787f0d31..da8da068b 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'bgpcep' @@ -38,8 +38,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'bgpcep' @@ -72,8 +72,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'bgpcep' diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index 42d3c5c56..4cbf05927 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'bier' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'bier' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'bier' diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index 7549ec42e..eb31447c6 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'capwap' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'capwap' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'capwap' diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index 7b4460c01..ffc3baa5c 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'cardinal' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'cardinal' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'cardinal' diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index 757601598..bd045cbf8 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'centinel' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'centinel' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'centinel' diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index 0d49e9b7f..bda82a856 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'coe' project-name: 'coe' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'coe' project-name: 'coe' @@ -55,7 +55,7 @@ name: coe-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'coe' project-name: 'coe' diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 327799ab2..78631d214 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'controller' @@ -32,7 +32,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'controller' @@ -58,7 +58,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'controller' diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index e392ba515..ae09f245f 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -3,7 +3,7 @@ name: coretutorials-oxygen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'coretutorials' @@ -29,7 +29,7 @@ name: coretutorials-nitrogen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'coretutorials' @@ -55,7 +55,7 @@ name: coretutorials-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'coretutorials' @@ -90,4 +90,3 @@ mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' build-timeout: 120 - diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 5c13c798b..96ad52781 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'daexim' project-name: 'daexim' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'daexim' project-name: 'daexim' diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index c2249a289..de560eea3 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'didm' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'didm' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'didm' diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index 76a63f8d7..e6ab39ea9 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'dlux' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'dlux' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'dlux' diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 88c1c4b2a..0b479d155 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'dluxapps' project-name: 'dluxapps' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'dluxapps' project-name: 'dluxapps' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'dluxapps' project-name: 'dluxapps' diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index f889912ee..df4f24a34 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'eman' @@ -32,8 +32,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'eman' @@ -60,8 +60,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'eman' diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index e1bfa4d31..af7804f42 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'faas' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'faas' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'faas' diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml index 3482598c5..b4180e1b3 100644 --- a/jjb/federation/federation.yaml +++ b/jjb/federation/federation.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs project: 'federation' project-name: 'federation' @@ -31,8 +31,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs project: 'federation' project-name: 'federation' @@ -58,8 +58,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs project: 'federation' project-name: 'federation' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index 5e21d81bb..a11bd16a7 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'genius' @@ -37,7 +37,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'genius' @@ -68,7 +68,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'genius' diff --git a/jjb/global-jjb b/jjb/global-jjb index c1873360f..a5a5237ab 160000 --- a/jjb/global-jjb +++ b/jjb/global-jjb @@ -1 +1 @@ -Subproject commit c1873360fa7455fdb690c6235923d7eb68e30ec6 +Subproject commit a5a5237ab810ab8ad4ff61731f9f8bdc1e1e342e diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index bf28b0175..dcf6c8ccc 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'groupbasedpolicy' @@ -36,7 +36,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'groupbasedpolicy' @@ -67,7 +67,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'groupbasedpolicy' diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index d6459caa0..157660f36 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'honeycomb/vbd' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'honeycomb/vbd' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'honeycomb/vbd' diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 5b26154e4..77fe7e4b3 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'infrautils' @@ -31,7 +31,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'infrautils' @@ -57,7 +57,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'infrautils' diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh new file mode 100644 index 000000000..7e3b3b648 --- /dev/null +++ b/jjb/integration/common-functions.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# Basic controller configuration settings +export MAVENCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg +export FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg +export CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties +export LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg +export MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv +export CONTROLLERMEM="2048m" + +# Cluster specific configuration settings +export AKKACONF=/tmp/${BUNDLEFOLDER}/configuration/initial/akka.conf +export MODULESCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/modules.conf +export MODULESHARDSCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/module-shards.conf + +# Setup JAVA_HOME and MAX_MEM Value in ODL startup config file +function set_java_vars() { + + echo "Configure java home and max memory..." + sed -ie 's%^# export JAVA_HOME%export JAVA_HOME="\${JAVA_HOME:-${JAVA_HOME}}"%g' ${MEMCONF} + sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' ${MEMCONF} + cat ${MEMCONF} + + echo "Set Java version" + sudo /usr/sbin/alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 1 + sudo /usr/sbin/alternatives --set java ${JAVA_HOME}/bin/java + echo "JDK default version ..." + java -version + + echo "Set JAVA_HOME" + export JAVA_HOME="${JAVA_HOME}" + # shellcheck disable=SC2037 + JAVA_RESOLVED=\`readlink -e "\${JAVA_HOME}/bin/java"\` + echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}" +} # set_java_vars() diff --git a/jjb/integration/distribution/distribution-check-bootup.sh b/jjb/integration/distribution/distribution-check-bootup.sh index 720331ad1..2a333dea7 100644 --- a/jjb/integration/distribution/distribution-check-bootup.sh +++ b/jjb/integration/distribution/distribution-check-bootup.sh @@ -20,10 +20,13 @@ unzip -q "${BUNDLE}" echo "Configuring the startup features..." FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg" -# Add test feature repo if Karaf 4. -sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}" -# Add test feature repo if Karaf 3. -sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}" +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}" diff --git a/jjb/integration/distribution/distribution-deploy-offline.sh b/jjb/integration/distribution/distribution-deploy-offline.sh index 570f0617c..e7920b534 100644 --- a/jjb/integration/distribution/distribution-deploy-offline.sh +++ b/jjb/integration/distribution/distribution-deploy-offline.sh @@ -15,10 +15,13 @@ unzip -q "${BUNDLE}" echo "Configuring the startup features..." FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg" -# Add test feature repo if Karaf 4. -sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}" -# Add test feature repo if Karaf 3. -sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}" +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}" diff --git a/jjb/integration/distribution/distribution-deploy-verify.sh b/jjb/integration/distribution/distribution-deploy-verify.sh index a29a57599..c81ac6db6 100644 --- a/jjb/integration/distribution/distribution-deploy-verify.sh +++ b/jjb/integration/distribution/distribution-deploy-verify.sh @@ -14,11 +14,14 @@ echo "Extracting the new controller..." unzip -q "${BUNDLE}" echo "Configuring the startup features..." -FEATURESCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg -# Add test feature repo if Karaf 4. -sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}" -# Add test feature repo if Karaf 3. -sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}" +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}" diff --git a/jjb/integration/integration-configure-clustering.sh b/jjb/integration/integration-configure-clustering.sh index 3c679d156..5b1db13ec 100644 --- a/jjb/integration/integration-configure-clustering.sh +++ b/jjb/integration/integration-configure-clustering.sh @@ -9,20 +9,9 @@ echo "#################################################" echo "## Configure Cluster and Start ##" echo "#################################################" -AKKACONF=/tmp/${BUNDLEFOLDER}/configuration/initial/akka.conf -MODULESCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/modules.conf -MODULESHARDSCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/module-shards.conf -MAVENCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg -FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg -CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties -LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg -MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv -CONTROLLERMEM="2048m" - - if [ ${CONTROLLERSCOPE} == 'all' ]; then ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}" - CONTROLLERMEM="3072m" + export CONTROLLERMEM="3072m" else ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}" fi @@ -82,7 +71,13 @@ cat ${MAVENCONF} echo "Configuring the startup features..." sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF} -sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF} + +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,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF} cat ${FEATURESCONF} echo "Configuring the log..." @@ -110,22 +105,7 @@ if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then cat ${CUSTOMPROP} fi -echo "Configure java home and max memory..." -sed -ie 's%^# export JAVA_HOME%export JAVA_HOME="\${JAVA_HOME:-${JAVA_HOME}}"%g' ${MEMCONF} -sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' ${MEMCONF} -cat ${MEMCONF} - -echo "Set Java version" -sudo /usr/sbin/alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 1 -sudo /usr/sbin/alternatives --set java ${JAVA_HOME}/bin/java -echo "JDK default version ..." -java -version - -echo "Set JAVA_HOME" -export JAVA_HOME="${JAVA_HOME}" -# Did you know that in HERE documents, single quote is an ordinary character, but backticks are still executing? -JAVA_RESOLVED=\`readlink -e "\${JAVA_HOME}/bin/java"\` -echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}" +set_java_vars # Copy shard file if exists if [ -f /tmp/custom_shard_config.txt ]; then diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh index a81b9aec4..c6beeed41 100644 --- a/jjb/integration/integration-deploy-controller-run-test.sh +++ b/jjb/integration/integration-deploy-controller-run-test.sh @@ -5,12 +5,6 @@ # shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091 source ${ROBOT_VENV}/bin/activate -MAVENCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg -FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg -CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties -LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg -MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv -CONTROLLERMEM="2048m" if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then echo "Configure cluster" @@ -21,7 +15,7 @@ fi if [ ${CONTROLLERSCOPE} == 'all' ]; then ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}" - CONTROLLERMEM="3072m" + export CONTROLLERMEM="3072m" COOLDOWN_PERIOD="180" else ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}" @@ -70,10 +64,8 @@ if [[ "$USEFEATURESBOOT" == "True" ]]; then sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF} fi -FEATURE_INDEX_STRING="features-integration-index" FEATURE_TEST_STRING="features-integration-test" if [[ "$KARAF_VERSION" == "karaf4" ]]; then - FEATURE_INDEX_STRING="features-index" FEATURE_TEST_STRING="features-test" fi @@ -106,26 +98,11 @@ if [ -n "${CONTROLLERDEBUGMAP}" ]; then fi cat ${LOGCONF} -echo "Configure java home and max memory..." -sed -ie 's%^# export JAVA_HOME%export JAVA_HOME="\${JAVA_HOME:-${JAVA_HOME}}"%g' ${MEMCONF} -sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' ${MEMCONF} -cat ${MEMCONF} +set_java_vars echo "Listing all open ports on controller system..." netstat -pnatu -echo "Set Java version" -sudo /usr/sbin/alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 1 -sudo /usr/sbin/alternatives --set java ${JAVA_HOME}/bin/java -echo "JDK default version..." -java -version - -echo "Set JAVA_HOME" -export JAVA_HOME="${JAVA_HOME}" -# Did you know that in HERE documents, single quote is an ordinary character, but backticks are still executing? -JAVA_RESOLVED=\`readlink -e "\${JAVA_HOME}/bin/java"\` -echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}" - if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then # Copy shard file if exists diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 7fa75f3c2..4e2ccf0de 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -374,7 +374,9 @@ - builder: name: integration-deploy-controller-run-test builders: - - shell: !include-raw: integration-deploy-controller-run-test.sh + - shell: !include-raw: + - common-functions.sh + - integration-deploy-controller-run-test.sh # Macro: integration-configure-clustering # Operation: this macro configures the clustering @@ -383,7 +385,9 @@ - builder: name: integration-configure-clustering builders: - - shell: !include-raw: integration-configure-clustering.sh + - shell: !include-raw: + - common-functions.sh + - integration-configure-clustering.sh # Macro: integration-start-cluster-run-test # Operation: this macro starts the 3-node cluster and runs test diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index 3138be836..c2c135ab6 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'iotdm' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'iotdm' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'iotdm' diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 8be6bef23..48cb51f35 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -3,7 +3,7 @@ name: jsonrpc-fluorine jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'jsonrpc' project-name: 'jsonrpc' @@ -28,7 +28,7 @@ name: jsonrpc-oxygen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'jsonrpc' project-name: 'jsonrpc' @@ -53,7 +53,7 @@ name: jsonrpc-nitrogen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'jsonrpc' project-name: 'jsonrpc' @@ -78,7 +78,7 @@ name: jsonrpc-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'jsonrpc' project-name: 'jsonrpc' diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 24535bbee..f203d8959 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'l2switch' @@ -35,7 +35,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'l2switch' @@ -66,7 +66,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'l2switch' diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index 432afc945..72c8ca70b 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'lacp' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'lacp' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'lacp' diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 0cfe21a30..582621eec 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'lispflowmapping' @@ -35,8 +35,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'lispflowmapping' @@ -66,8 +66,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'lispflowmapping' diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index b45f6641b..79e498ce1 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'mdsal' @@ -32,8 +32,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'mdsal' @@ -59,8 +59,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'mdsal' diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index 60c15f857..5c6f81e30 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'messaging4transport' @@ -31,8 +31,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'messaging4transport' @@ -58,8 +58,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'messaging4transport' diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index 166100f5d..023296967 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'natapp' @@ -31,8 +31,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'natapp' @@ -58,8 +58,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'natapp' diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 8a9c37ae7..0b37f358e 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'nemo' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'nemo' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'nemo' diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 575d9c025..806cd5ee7 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'netconf' @@ -31,7 +31,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'netconf' @@ -57,7 +57,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'netconf' diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index 1ee7e512d..318b15c50 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'netide' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'netide' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'netide' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 061d222d8..846501688 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -4,9 +4,9 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - gerrit-tox-verify + - odl-maven-jobs stream: - oxygen: diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index b07936607..3f3de316a 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'neutron' @@ -32,8 +32,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'neutron' @@ -60,8 +60,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'neutron' diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index 4f413844a..36c1d21e9 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'next' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'next' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'next' diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index 12cd1473b..0af5510cd 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'nic' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'nic' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'nic' diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index ae0c75ad2..9865f61af 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'ocpplugin' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'ocpplugin' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'ocpplugin' diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index a1e295cfc..b9fc80aa5 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -2,8 +2,8 @@ - project: name: odlparent-master jobs: - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs - gerrit-tox-verify project: odlparent @@ -38,8 +38,8 @@ - project: name: odlparent-2.0.x jobs: - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs - gerrit-tox-verify project: odlparent @@ -77,8 +77,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs - gerrit-tox-verify stream: carbon diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index ab6c67a89..7677ec676 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'of-config' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'of-config' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'of-config' diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index 1f892da28..66bfcae95 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -3,7 +3,7 @@ name: circuitsw-oxygen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'ofextensions/circuitsw' @@ -28,7 +28,7 @@ name: circuitsw-nitrogen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'ofextensions/circuitsw' @@ -53,7 +53,7 @@ name: circuitsw-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'ofextensions/circuitsw' diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index 5d7df78f3..c2a080e1d 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'openflowjava' @@ -31,8 +31,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'openflowjava' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index e82bc6b66..fcb6ef944 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'openflowplugin' @@ -36,8 +36,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'openflowplugin' @@ -67,8 +67,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'openflowplugin' diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml index ba3a55032..2e5d81414 100644 --- a/jjb/ovil/ovil.yaml +++ b/jjb/ovil/ovil.yaml @@ -2,7 +2,7 @@ - project: name: ovil jobs: - - '{project-name}-maven-jobs' + - odl-maven-jobs - gerrit-tox-verify project: ovil diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 476b606f2..a87a43b98 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'ovsdb' @@ -31,8 +31,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'ovsdb' @@ -58,8 +58,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'ovsdb' diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 1b77e5f93..985d6b25e 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'p4plugin' diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index cbea081f8..afdf9373d 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'packetcable' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'packetcable' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'packetcable' diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index 0c0db87cf..d89c48f5b 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -3,7 +3,7 @@ name: persistence-oxygen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'persistence' @@ -30,7 +30,7 @@ name: persistence-nitrogen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'persistence' @@ -57,7 +57,7 @@ name: persistence-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'persistence' diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml index f64aa99f3..d697e548f 100644 --- a/jjb/releng-templates-java.yaml +++ b/jjb/releng-templates-java.yaml @@ -1,4 +1,21 @@ --- +- job-group: + name: odl-maven-jobs + + jobs: + - gerrit-maven-clm + + - gerrit-maven-merge: + post_build_trigger: + - project: + - 'distribution-merge-{stream}' + condition: SUCCESS + trigger-with-no-params: true + + - gerrit-maven-release + - gerrit-maven-verify + - gerrit-maven-verify-dependencies + - job-template: name: '{project-name}-integration-{stream}' diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index c551d402b..1e32c5d21 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -3,7 +3,7 @@ name: reservation-oxygen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'reservation' @@ -28,7 +28,7 @@ name: reservation-nitrogen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'reservation' @@ -53,7 +53,7 @@ name: reservation-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'reservation' diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index 704e1c789..90d2d5aa5 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'sdninterfaceapp' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'sdninterfaceapp' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'sdninterfaceapp' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 3da3c1efa..972f346a2 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'sfc' @@ -32,7 +32,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'sfc' @@ -59,7 +59,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'sfc' diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index 1b17aa4b3..6958d317b 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'snbi' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'snbi' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'snbi' diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 6cc6f8a1c..c73acb1be 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'snmp' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'snmp' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'snmp' diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index f435a1c6f..b29129035 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'snmp4sdn' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'snmp4sdn' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'snmp4sdn' diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index c7df74017..a74ba2d59 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'sxp' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'sxp' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'sxp' diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml index b38ae2e4d..88514e606 100644 --- a/jjb/systemmetrics/systemmetrics.yaml +++ b/jjb/systemmetrics/systemmetrics.yaml @@ -3,7 +3,7 @@ name: systemmetrics-oxygen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'systemmetrics' project-name: 'systemmetrics' @@ -28,7 +28,7 @@ name: systemmetrics-nitrogen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'systemmetrics' project-name: 'systemmetrics' @@ -53,7 +53,7 @@ name: systemmetrics-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'systemmetrics' project-name: 'systemmetrics' diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index 47974a495..6c78c55e2 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'topoprocessing' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'topoprocessing' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'topoprocessing' diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index bddccb90f..a905cf964 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -3,7 +3,7 @@ name: transportpce-oxygen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'transportpce' project-name: 'transportpce' @@ -28,7 +28,7 @@ name: transportpce-nitrogen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'transportpce' project-name: 'transportpce' @@ -53,7 +53,7 @@ name: transportpce-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'transportpce' project-name: 'transportpce' diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index a0594e289..d1cae2d6a 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'tsdr' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'tsdr' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'tsdr' diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index 3375a869b..41de1a0dd 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'ttp' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'ttp' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'ttp' diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 8613b63ac..10f602889 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'unimgr' @@ -31,7 +31,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'unimgr' @@ -58,7 +58,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'unimgr' diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 7ab9c71b6..86b4017fe 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'usc' @@ -31,8 +31,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'usc' @@ -58,8 +58,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'usc' diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index 43c14a22d..1efca00c4 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'usecplugin' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'usecplugin' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'usecplugin' diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index 69abc18b2..844a26552 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'vtn' @@ -35,8 +35,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'vtn' @@ -66,8 +66,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'vtn' diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index 952f813c4..fc38e865b 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'yang-push' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'yang-push' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'yang-push' diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index fbc83d824..cd0617c9c 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -3,7 +3,7 @@ name: yangide-oxygen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'yangide' @@ -28,7 +28,7 @@ name: yangide-nitrogen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'yangide' @@ -53,7 +53,7 @@ name: yangide-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'yangide' diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index 910746e5e..2a67a52d7 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -2,8 +2,8 @@ - project: name: yangtools-master jobs: - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs project: yangtools project-name: yangtools @@ -38,8 +38,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'yangtools' @@ -74,8 +74,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'yangtools'