From: Daniel Farrell Date: Wed, 9 May 2018 09:39:36 +0000 (+0000) Subject: Merge "Remove of-config carbon jobs" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=9f80eab4fa3bf05322ca685151148b7a3cf12327;hp=b9d1c441d944b2edf2fcedc36abbcd3718119ed4;p=releng%2Fbuilder.git Merge "Remove of-config carbon jobs" --- diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 1360004a5..c085faa4f 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml index 1be27c06e..8d0f33daf 100644 --- a/jjb/aaa/aaa-csit-keystone.yaml +++ b/jjb/aaa/aaa-csit-keystone.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml index c557db0bb..5d6d1acb7 100644 --- a/jjb/aaa/aaa-csit-tls.yaml +++ b/jjb/aaa/aaa-csit-tls.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index d630199be..2930bd0fb 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -15,9 +15,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 feature: - authn: diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index f4e71ff3d..129604754 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -53,25 +53,6 @@ # Used by the release job staging-profile-id: 9318cf3c82c33 -- project: - name: aaa-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'aaa' - project-name: 'aaa' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'aaa-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[aaa] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 9318cf3c82c33 - - project: name: aaa-sonar jobs: diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index 56db31b84..774cb2576 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: 9324f12310e6a -- project: - name: atrium-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'atrium' - project-name: 'atrium' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'atrium-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[atrium]' - - # Used by the release job - staging-profile-id: 9324f12310e6a - - project: name: atrium-sonar jobs: diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index f49b3b3e9..e6bf110b6 100644 --- a/jjb/autorelease/autorelease-macros.yaml +++ b/jjb/autorelease/autorelease-macros.yaml @@ -145,6 +145,11 @@ - shell: !include-raw: - generate-release-notes.sh +- builder: + name: autorelease-update-project-views + builders: + - shell: !include-raw: update-autorelease-projects-views.sh + - builder: name: autorelease-update-validate-projects builders: diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 4c65c5b80..7e5138f08 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -271,6 +271,7 @@ jenkins-ssh-credential: opendaylight-jenkins-ssh builders: + - autorelease-update-project-views - autorelease-update-validate-projects - opendaylight-infra-push-gerrit-patch: project: 'releng/builder' diff --git a/jjb/autorelease/update-autorelease-projects-views.sh b/jjb/autorelease/update-autorelease-projects-views.sh new file mode 100755 index 000000000..87992153c --- /dev/null +++ b/jjb/autorelease/update-autorelease-projects-views.sh @@ -0,0 +1,60 @@ +#!/bin/bash +# SPDX-License-Identifier: EPL-1.0 +############################################################################## +# Copyright (c) 2018 The Linux Foundation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +############################################################################## + +VIEWS_AR_YAML_FILE="${WORKSPACE}/jjb/autorelease/view-autorelease-${STREAM}.yaml" +BRANCH="stable/${STREAM}" + +# The current development release will not have a stable branch defined so if +# branch does not exist assume master +url="https://git.opendaylight.org/gerrit/projects/releng%2Fautorelease/branches/" +resp=$(curl -s -w "\\n\\n%{http_code}" --globoff -H "Content-Type:application/json" "$url") +if [[ ! "$resp" =~ $BRANCH ]]; then + BRANCH="master" +fi + +wget -nv -O /tmp/pom.xml "https://git.opendaylight.org/gerrit/gitweb?p=releng/autorelease.git;a=blob_plain;f=pom.xml;hb=$GERRIT_BRANCH" + +# handle list of projects read from the pom.xml output as multiple lines. +mapfile -t modules < <(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' /tmp/pom.xml) + +cat > "$VIEWS_AR_YAML_FILE" << EOF +--- +# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job +- releng_view: &releng_autorelease_view_common_${STREAM} + name: releng-view-autorelease-${STREAM} + view-type: list + filter-executors: false + filter-queue: false + columns: + - status + - weather + - job + - last-success + - last-failure + - last-duration + - build-button + recurse: false + +- view: + name: Merge-${STREAM^} + description: 'List of ${STREAM^} Merge jobs for Autorelease' + job-name: +EOF + +for module in "${modules[@]}"; do + echo "Include project:$module to autorelease view" + echo " - '$module-maven-merge-${STREAM}'" >> "$VIEWS_AR_YAML_FILE" +done +echo " <<: *releng_autorelease_view_common_${STREAM}" >> "$VIEWS_AR_YAML_FILE" + +git add "${VIEWS_AR_YAML_FILE}" + +cp "${VIEWS_AR_YAML_FILE}" $WORKSPACE/archives diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml index 14ec6d49e..210728107 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 761ce7809..4519cfad5 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index ad009f9f6..145040d37 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: @@ -48,4 +45,3 @@ # Controller configuration odl_system_flavor: odl-standard-4 - diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 137abb967..c2cf62664 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -36,13 +36,6 @@ odl-restconf, odl-bgpcep-bgp, odl-bgpcep-bgp-config-example - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - install-features: > - odl-restconf, - odl-bgpcep-bgp, - odl-bgpcep-bgp-config-example install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index ee8e9d37a..bc8c1941f 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 1c2d76d71..7fdae26eb 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml index 904d097ed..da17fd358 100644 --- a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index f2e183547..23b665162 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index a0316bfed..dfb6adbfe 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -21,9 +21,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index f1e6f274a..5e8d35d69 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -15,9 +15,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 feature: - bgp: diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index a05817ddb..412da0013 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -77,33 +77,6 @@ # Used by the release job staging-profile-id: 9427a05049030 -- project: - name: bgpcep-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'bgpcep' - project-name: 'bgpcep' - build-node: centos7-builder-8c-8g - build-timeout: 120 - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'bgpcep-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - mdsal-merge-{stream}, - tcpmd5-merge-{stream} - email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]' - - # Used by the release job - staging-profile-id: 9427a05049030 - - project: name: bgpcep-sonar jobs: diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml index afeed6b87..66b7c4143 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -23,9 +23,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' verify-stream: 'nitrogen' verify-branch: 'stable/nitrogen' diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index b0c17783e..ba53880bf 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -57,26 +57,6 @@ # Used by the release job staging-profile-id: 942a8075b1f2a -- project: - name: bier-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'bier' - project-name: 'bier' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'bier-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[bier]' - - # Used by the release job - staging-profile-id: 942a8075b1f2a - - project: name: bier-sonar jobs: diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml index 023718a5c..46f26c564 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index d01c735b1..7c684484a 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: 96bd6b5bf86e3 -- project: - name: capwap-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'capwap' - project-name: 'capwap' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'capwap-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[capwap]' - - # Used by the release job - staging-profile-id: 96bd6b5bf86e3 - - project: name: capwap jobs: diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index 3db33a822..c2fe7cdfb 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: 96be20348f0f2 -- project: - name: cardinal-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'cardinal' - project-name: 'cardinal' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'cardinal-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' - email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]' - - # Used by the release job - staging-profile-id: 96be20348f0f2 - - project: name: cardinal-sonar jobs: diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index 117d2be80..6e27ebc45 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -55,24 +55,6 @@ # Used by the release job staging-profile-id: 96c0be46aac33 -- project: - name: coe-carbon - jobs: - - odl-maven-jobs - - project: 'coe' - project-name: 'coe' - stream: carbon - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'coe-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[coe] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 96c0be46aac33 - - project: name: coe-sonar jobs: diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index eb580fda5..74f10a059 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -17,9 +17,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 23ffa331c..5123bc388 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index a6bd7ac4d..5cff7f2cb 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index a5130abf9..541a5dcd5 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 88a8e0c12..3d0d69887 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index a95fdb06c..a11f40642 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 1743f1b1a..156522b5f 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index e79ebef99..cb0ade8ab 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 41169c5ac..f64faedde 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 344ebb88f..6edd88909 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 0c2b0fdfd..25ae25545 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 6cf7ecfea..616bee0ee 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 025a9e9a7..ed072791d 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -64,28 +64,6 @@ # Used by the release job staging-profile-id: 96c1c9177efdd -- project: - name: controller-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'controller' - project-name: 'controller' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'controller-settings' - mvn-goals: 'clean deploy -Pintegrationtests,docs' - mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - build-node: centos7-builder-8c-8g - build-timeout: 90 - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' - email-upstream: '[controller] [odlparent] [yangtools] [aaa]' - - # Used by the release job - staging-profile-id: 96c1c9177efdd - - project: name: controller-sonar jobs: diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index 67d5754d2..78b683e71 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -53,25 +53,6 @@ # Used by the release job staging-profile-id: 96cd299563ec6 -- project: - name: coretutorials-carbon - jobs: - - odl-maven-jobs - - stream: carbon - project: 'coretutorials' - project-name: 'coretutorials' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'coretutorials-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[coretutorials]' - build-timeout: 120 - - # Used by the release job - staging-profile-id: 96cd299563ec6 - - project: name: coretutorials-sonar jobs: diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml index 4732b9b1c..ef01af1a4 100644 --- a/jjb/didm/didm-csit-discovery.yaml +++ b/jjb/didm/didm-csit-discovery.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index fae22b5b6..30fd8f6d5 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: 96e6338c870f5 -- project: - name: didm-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'didm' - project-name: 'didm' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'didm-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[didm]' - - # Used by the release job - staging-profile-id: 96e6338c870f5 - - project: name: didm-sonar jobs: diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index 6356d4413..e878163c4 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: 96e6a0327484f -- project: - name: dlux-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'dlux' - project-name: 'dlux' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'dlux-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[dlux] [odlparent]' - - # Used by the release job - staging-profile-id: 96e6a0327484f - - project: name: dlux-sonar jobs: diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index 5e4639a09..1a8287d82 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -12,8 +12,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' project: docs project-name: docs diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index c5fd3112e..31d0eba08 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -58,27 +58,6 @@ # Used by the release job staging-profile-id: 96e9352979521 -- project: - name: eman-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'eman' - project-name: 'eman' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'eman-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[eman]' - build-node: centos7-builder-4c-16g - - # Used by the release job - staging-profile-id: 96e9352979521 - - project: name: eman-sonar jobs: diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index c01098b30..39bef773b 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: 96f5ac591d858 -- project: - name: faas-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'faas' - project-name: 'faas' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'faas-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[faas]' - - # Used by the release job - staging-profile-id: 96f5ac591d858 - - project: name: faas-sonar jobs: diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml index a0ded3310..30fa052fa 100644 --- a/jjb/federation/federation.yaml +++ b/jjb/federation/federation.yaml @@ -55,26 +55,6 @@ # Used by the release job staging-profile-id: 96f78c7a40a24 -- project: - name: federation-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - project: 'federation' - project-name: 'federation' - stream: carbon - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'federation-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[federation] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 96f78c7a40a24 - - project: name: federation-sonar jobs: diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index c46ed7ed0..7fcab6c0b 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -43,9 +43,6 @@ stream: - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 testplan: 'genius-carbon-nitrogen.txt' diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index 5b0ee7f92..64c7817bf 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -16,10 +16,6 @@ - nitrogen: branch: 'stable/nitrogen' os-branch: 'pike' - - carbon: - branch: 'stable/carbon' - os-branch: 'ocata' - karaf-version: karaf3 jdk: 'openjdk8' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index 73bbbf8d5..bd092cc1c 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -4,6 +4,11 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: genius + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/ + rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f - odl-maven-jobs stream: fluorine @@ -30,6 +35,11 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: genius + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/ + rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f - odl-maven-jobs stream: oxygen @@ -55,6 +65,11 @@ name: genius-nitrogen jobs: - '{project-name}-distribution-check-{stream}' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: genius + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/ + rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f - odl-maven-jobs stream: nitrogen @@ -75,31 +90,6 @@ # Used by the release job staging-profile-id: 96fb4b6d9d1ee -- project: - name: genius-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'genius' - project-name: 'genius' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'genius-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - controller-merge-{stream}, - yangtools-merge-{stream}, - odlparent-merge-{stream}, - openflowplugin-merge-{stream}, - neutron-merge-{stream} - email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]' - - # Used by the release job - staging-profile-id: 96fb4b6d9d1ee - - project: name: genius-sonar jobs: diff --git a/jjb/global-jjb b/jjb/global-jjb index 536325e51..5a2ef9c64 160000 --- a/jjb/global-jjb +++ b/jjb/global-jjb @@ -1 +1 @@ -Subproject commit 536325e5186cf8883d630feaea2d91591b39fd50 +Subproject commit 5a2ef9c64caf06ff737dfa040b61c4909c97e996 diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml index a8442ad78..c71f00846 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -28,10 +28,6 @@ - nitrogen: branch: 'stable/nitrogen' install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' openstack: - ocata: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index 53b6f7578..4467a8f6d 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index 1444524aa..6c160b554 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index 675fdf0c2..75c71ffbe 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index be355c2fc..f193d5e31 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -17,9 +17,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index 678ed3629..f7cdd2057 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -75,32 +75,6 @@ # Used by the release job staging-profile-id: 96fbb93f95a76 -- project: - name: groupbasedpolicy-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'groupbasedpolicy' - project-name: 'groupbasedpolicy' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'groupbasedpolicy-settings' - mvn-goals: '-U clean deploy findbugs:findbugs' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - openflowjava-merge-{stream}, - openflowplugin-merge-{stream}, - neutron-merge-{stream}, - sfc-merge-{stream}, - ovsdb-merge-{stream} - email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' - - # Used by the release job - staging-profile-id: 96fbb93f95a76 - - project: name: groupbasedpolicy-sonar jobs: diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index 90cb51574..ec193bb09 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: 96fc362c36862 -- project: - name: vbd-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'honeycomb/vbd' - project-name: 'vbd' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'honeycomb-vbd-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[vbd]' - - # Used by the release job - staging-profile-id: 96fc362c36862 - - project: name: vbd-sonar jobs: diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml index 7eceb9a37..34a5f9690 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -16,10 +16,6 @@ - nitrogen: branch: 'stable/nitrogen' os-branch: 'pike' - - carbon: - branch: 'stable/carbon' - os-branch: 'ocata' - karaf-version: karaf3 jdk: 'openjdk8' diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index bfec7c881..0390cc3a0 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -55,25 +55,6 @@ # Used by the release job staging-profile-id: 96fca0367756c -- project: - name: infrautils-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'infrautils' - project-name: 'infrautils' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'infrautils-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[infrautils] [odlparent]' - - # Used by the release job - staging-profile-id: 96fca0367756c - - project: name: infrautils-sonar jobs: diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml index fcbaa7eef..d703d35a7 100644 --- a/jjb/iotdm/iotdm-csit-basic.yaml +++ b/jjb/iotdm/iotdm-csit-basic.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index 3a29a05ca..00d7b9769 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -55,26 +55,6 @@ # Used by the release job staging-profile-id: 96fd6e9453970 -- project: - name: iotdm-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'iotdm' - project-name: 'iotdm' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'iotdm-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'aaa-merge-{stream}' - email-upstream: '[iotdm] [aaa]' - - # Used by the release job - staging-profile-id: 96fd6e9453970 - - project: name: iotdm-sonar jobs: diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index 5612eab04..c83d90cb8 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -24,12 +24,6 @@ karaf-version: karaf3 # yamllint disable-line rule:line-length bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-nitrogen/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.1.0-SNAPSHOT/jsonrpc-karaf-1.1.0-SNAPSHOT.zip' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - # yamllint disable-line rule:line-length - bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-carbon/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.0.0-SNAPSHOT/jsonrpc-karaf-1.0.0-SNAPSHOT.zip' - install: - only: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 1eaa52fb6..168fa943b 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -51,24 +51,6 @@ # Used by the release job staging-profile-id: 96fdf4408765d -- project: - name: jsonrpc-carbon - jobs: - - odl-maven-jobs - - project: 'jsonrpc' - project-name: 'jsonrpc' - stream: carbon - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'jsonrpc-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' - email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' - - # Used by the release job - staging-profile-id: 96fdf4408765d - - project: name: jsonrpc-sonar jobs: diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index 63be624c0..8509c0139 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index f56573369..c85c9f64d 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 54fb5958c..62e8620c0 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index fd3e64984..b3a3a205d 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -15,9 +15,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 feature: - all: diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 3792df733..c55bb6ced 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -67,30 +67,6 @@ # Used by the release job staging-profile-id: 96fee85953ca0 -- project: - name: l2switch-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'l2switch' - project-name: 'l2switch' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'l2switch-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - openflowjava-merge-{stream}, - openflowplugin-merge-{stream} - email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' - - # Used by the release job - staging-profile-id: 96fee85953ca0 - - project: name: l2switch-sonar jobs: diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml index 1cf3cabbd..53fee1754 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index 850c4a524..792f5ddb9 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: 96ff6c0ff6ab1 -- project: - name: lacp-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'lacp' - project-name: 'lacp' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'lacp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' - email-upstream: '[lacp] [openflowjava] [openflowplugin]' - - # Used by the release job - staging-profile-id: 96ff6c0ff6ab1 - - project: name: lacp-sonar jobs: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index fb0a4f21b..0067ee76a 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -20,9 +20,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index e9a27a52a..9a8a7b434 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index d3fc860f9..5fa2f1e67 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -74,28 +74,6 @@ # Used by the release job staging-profile-id: 96fff2503b766 -- project: - name: lispflowmapping-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'lispflowmapping' - project-name: 'lispflowmapping' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'lispflowmapping-settings' - mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' - dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' - email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' - build-node: centos7-builder-8c-8g - - # Used by the release job - staging-profile-id: 96fff2503b766 - - project: name: lispflowmapping-sonar jobs: diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index 6a6cb9b2e..8fd766fd6 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -17,10 +17,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - robot-options: '-v JAVA_OPTIONS:-Xmx6656m' install: - only: diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index dd0a04631..86cb2c3ef 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -66,28 +66,6 @@ # Used by the release job staging-profile-id: a674173c7b29d -- project: - name: mdsal-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'mdsal' - project-name: 'mdsal' - branch: 'stable/carbon' - build-node: centos7-builder-8c-8g - karaf-version: karaf3 - mvn-settings: 'mdsal-settings' - mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[mdsal] [odlparent] [yangtools]' - - # Used by the release job - staging-profile-id: a674173c7b29d - - project: name: mdsal-sonar jobs: diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml index c6afc49a0..df3049ed0 100644 --- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml +++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index e9c9b0858..aba72d8c2 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -55,26 +55,6 @@ # Used by the release job staging-profile-id: a677283157db4 -- project: - name: messaging4transport-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'messaging4transport' - project-name: 'messaging4transport' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'messaging4transport-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[messaging4transport]' - - # Used by the release job - staging-profile-id: a677283157db4 - - project: name: messaging4transport-sonar jobs: diff --git a/jjb/natapp/natapp-csit-basic.yaml b/jjb/natapp/natapp-csit-basic.yaml deleted file mode 100644 index cf2700191..000000000 --- a/jjb/natapp/natapp-csit-basic.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -- project: - name: natapp-csit-basic - jobs: - - inttest-csit-1node - - inttest-csit-verify-1node - - # The project name - project: 'natapp' - - # The functionality under test - functionality: 'basic' - - # Project branches - stream: - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - - install: - - all: - scope: 'all' - - # Features to install - install-features: 'odl-restconf, odl-natapp' - - # Robot custom options - robot-options: '' diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index b0d5a8629..4b0235ec4 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -55,26 +55,6 @@ # Used by the release job staging-profile-id: a679c0f4f08a8 -- project: - name: natapp-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'natapp' - project-name: 'natapp' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'natapp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowplugin-merge-{stream}' - email-upstream: '[natapp] [openflowplugin]' - - # Used by the release job - staging-profile-id: a679c0f4f08a8 - - project: name: natapp-sonar jobs: diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index 8ffa8fd78..ea5003956 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 61564eb05..eefa87c6e 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: a67a9890f6202 -- project: - name: nemo-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'nemo' - project-name: 'nemo' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'nemo-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[nemo]' - - # Used by the release job - staging-profile-id: a67a9890f6202 - - project: name: nemo-sonar jobs: diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml index c45a2ca2a..0ce1d8122 100644 --- a/jjb/netide/netide-csit-basic.yaml +++ b/jjb/netide/netide-csit-basic.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index 38965fcfc..3599f849a 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: a67bab3755815 -- project: - name: netide-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'netide' - project-name: 'netide' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'netide-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowjava-merge-{stream}' - email-upstream: '[netide] [openflowjava]' - - # Used by the release job - staging-profile-id: a67bab3755815 - - project: name: netide-sonar jobs: diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index ad9aefa2c..e2130df80 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -157,57 +157,3 @@ odl-ml2-port-binding: 'pseudo-agentdb-binding' openstack_system_image: '{openstack_system_image_pike}' openstack_system2_image: '{openstack_system_image_pike}' - -- project: - name: netvirt-csit-hwvtep-openstack-integration-carbon - jobs: - - inttest-csit-hwvtep-openstack - - project: 'netvirt' - stream: 'carbon' - branch: 'stable/carbon' - karaf-version: karaf3 - testplan: '{project}-{topology}-l2gw-openstack.txt' - odl-ml2-driver-version: 'v2' - enable-openstack-services: 'placement-api,l2gw-plugin' - enable-openstack-compute-services: 'placement-client' - security-group-mode: 'stateful' - odl_system_flavor: odl-standard-8 - openstack_system_flavor: odl-standard-8 - openstack_system2_flavor: odl-standard-4 - tools_system_count: 2 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847 - - # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled - enable-networking-l2gw: 'yes' - - topology: - - 1node: - openstack_system2_count: 1 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack' - - 3node: - openstack_system2_count: 1 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack' - - functionality: - - upstream-stateful - - gate-stateful - - openstack: - - ocata: - openstack-branch: 'stable/ocata' - odl-ml2-branch: 'stable/ocata' - openstack_system_image: '{openstack_system_image_ocata}' - openstack_system2_image: '{openstack_system_image_ocata}' - enable-openstack-network-services: '{openstack_legacy_default_network_services}' - - pike: - openstack-branch: 'stable/pike' - odl-ml2-branch: 'stable/pike' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_system_image_pike}' - openstack_system2_image: '{openstack_system_image_pike}' - enable-openstack-network-services: '{openstack_legacy_default_network_services}' diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index 02475d741..89f48409f 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -170,61 +170,6 @@ openstack_system_image: '{openstack_system_image_pike}' openstack_system2_image: '{openstack_system_image_pike}' -- project: - name: netvirt-csit-openstack-integration-carbon - jobs: - - inttest-csit-openstack - - project: 'netvirt' - stream: 'carbon' - branch: 'stable/carbon' - karaf-version: karaf3 - testplan: '{project}-{topology}-openstack.txt' - odl-ml2-driver-version: 'v2' - enable-openstack-services: 'placement-api,tempest' - enable-openstack-compute-services: 'placement-client' - security-group-mode: 'stateful' - odl_system_flavor: odl-standard-8 - openstack_system_flavor: odl-standard-8 - openstack_system2_flavor: odl-standard-4 - - topology: - - 1node: - openstack_system2_count: 2 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack' - - 3node: - openstack_system2_count: 3 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack' - - functionality: - - upstream-stateful: - schedule: '@daily' - - upstream-stateful-snat-conntrack: - odl-snat-mode: 'conntrack' - schedule: '@daily' - - gate-stateful - - gate-stateful-snat-conntrack: - odl-snat-mode: 'conntrack' - - openstack: - - ocata: - openstack-branch: 'stable/ocata' - odl-ml2-branch: 'stable/ocata' - openstack_system_image: '{openstack_system_image_ocata}' - openstack_system2_image: '{openstack_system_image_ocata}' - enable-openstack-network-services: '{openstack_legacy_default_network_services}' - - pike: - openstack-branch: 'stable/pike' - odl-ml2-branch: 'stable/pike' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_system_image_pike}' - openstack_system2_image: '{openstack_system_image_pike}' - enable-openstack-network-services: '{openstack_legacy_default_network_services}' - - project: name: netvirt-csit-sfc-openstack-integration jobs: diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml index bb4852f00..8cf106f88 100644 --- a/jjb/netvirt/netvirt-full-integration.yaml +++ b/jjb/netvirt/netvirt-full-integration.yaml @@ -11,9 +11,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 project: 'netvirt' archive-artifacts: '*.log **/target/surefire-reports/*.txt' diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index 73b3adb16..194d2d69b 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -18,10 +18,6 @@ - nitrogen: branch: 'stable/nitrogen' os-branch: 'pike' - - carbon: - branch: 'stable/carbon' - os-branch: 'ocata' - karaf-version: karaf3 jdk: 'openjdk8' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 8a00e9b51..6f83a6b81 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -20,9 +20,7 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 + project: 'netvirt' project-name: 'netvirt' mvn-settings: 'netvirt-settings' diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 766bd81c7..b51ce7ad2 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -59,27 +59,6 @@ # Used by the release job staging-profile-id: a67e1b40d7419 -- project: - name: neutron-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'neutron' - project-name: 'neutron' - build-timeout: 60 - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'neutron-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' - email-upstream: '[neutron] [odlparent] [aaa]' - - # Used by the release job - staging-profile-id: a67e1b40d7419 - - project: name: neutron-sonar jobs: diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index 730362054..c3025ee07 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: a67e7c516f385 -- project: - name: next-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'next' - project-name: 'next' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'next-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[next]' - - # Used by the release job - staging-profile-id: a67e7c516f385 - - project: name: next-sonar jobs: diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml index 6d21673ae..59b60a8fd 100644 --- a/jjb/nic/nic-csit-basic.yaml +++ b/jjb/nic/nic-csit-basic.yaml @@ -15,9 +15,6 @@ stream: - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index 0502ea4a6..f79f0cf59 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -55,26 +55,6 @@ # Used by the release job staging-profile-id: a67ef386204aa -- project: - name: nic-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'nic' - project-name: 'nic' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'nic-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}' - email-upstream: '[nic] [vtn] [groupbasedpolicy]' - - # Used by the release job - staging-profile-id: a67ef386204aa - - project: name: nic-sonar jobs: diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml index 142e659d8..6b3da1bfe 100644 --- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-basic.yaml @@ -15,9 +15,6 @@ stream: - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml index a7c7c5628..a1ee88d22 100644 --- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml +++ b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml @@ -15,9 +15,6 @@ stream: - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index a9e86a85b..87c429e09 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: a687673279f9c -- project: - name: ocpplugin-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'ocpplugin' - project-name: 'ocpplugin' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'ocpplugin-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a687673279f9c - - project: name: ocpplugin-sonar jobs: diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index 24da02383..5c89996ce 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -119,35 +119,6 @@ javadoc-path: org.opendaylight.$PROJECT/$STREAM staging-profile-id: 880d5ac25eaa -- project: - name: odlparent-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - gerrit-tox-verify - - stream: carbon - project: 'odlparent' - project-name: 'odlparent' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'odlparent-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[odlparent]' - archive-artifacts: > - **/*.prop - **/*.log - **/target/surefire-reports/*-output.txt - **/target/failsafe-reports/failsafe-summary.xml - **/hs_err_*.log - **/target/feature/feature.xml - - # Used by the release job - javadoc-path: org.opendaylight.$PROJECT/$STREAM - staging-profile-id: 880d5ac25eaa - - project: name: odlparent-sonar jobs: diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index 2cdba4046..77ea9f218 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -50,23 +50,6 @@ # Used by the release job staging-profile-id: a68970cf5b25c -- project: - name: circuitsw-carbon - jobs: - - odl-maven-jobs - - stream: carbon - project: 'ofextensions/circuitsw' - project-name: 'circuitsw' - branch: 'stable/carbon' - mvn-settings: 'ofextensions-circuitsw-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[circuitsw]' - - # Used by the release job - staging-profile-id: a68970cf5b25c - - project: name: circuitsw-sonar jobs: diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index 5a921c0cb..e207ab800 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -18,26 +18,6 @@ # Used by the release job staging-profile-id: a68a1507dae22 -- project: - name: openflowjava-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'openflowjava' - project-name: 'openflowjava' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'openflowjava-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a68a1507dae22 - - project: name: openflowjava-sonar jobs: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 00fdc9702..7bf4f2a3b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 045b935ad..9a22ec92b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -20,9 +20,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index bca8ed3d6..c4740342c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -20,9 +20,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index b93b67675..da1520e4b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -20,9 +20,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 12df50ccc..0d41cc9de 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -20,9 +20,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - all: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 7705e08f9..38b8e609a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 3d37ea451..bd2808eff 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -20,9 +20,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index 8a65460cc..981ad1064 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -20,9 +20,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 5fe0ab123..6cccdbf83 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 835926e96..567959a20 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index ff29a4fd9..21202836b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 9a7c34685..a93ea5e08 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -20,9 +20,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 01a735dcc..6f50fbc52 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -18,10 +18,6 @@ - nitrogen: branch: 'stable/nitrogen' os-branch: 'pike' - - carbon: - branch: 'stable/carbon' - os-branch: 'ocata' - karaf-version: 'karaf3' jdk: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 356444073..07582f1f8 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -77,33 +77,6 @@ # Used by the release job staging-profile-id: a68a76dc1b44c -- project: - name: openflowplugin-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'openflowplugin' - project-name: 'openflowplugin' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - build-timeout: 90 - karaf-version: 'karaf3' - mvn-settings: 'openflowplugin-settings' - mvn-goals: 'clean deploy javadoc:aggregate' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - openflowjava-merge-{stream} - email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]' - - # Used by the release job - staging-profile-id: a68a76dc1b44c - - project: name: openflowplugin-sonar jobs: diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index 2ace6c4ad..593d22a97 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -21,11 +21,6 @@ libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - - carbon: - branch: 'stable/carbon' - libuv-version: '1.8.0' - rapidjson-version: '1.0.2' - openvswitch-version: '2.6.0' project: 'opflex' archive-artifacts: '**/*.tar.gz' diff --git a/jjb/opflex/opflex-thirdparty-dependencies.yaml b/jjb/opflex/opflex-thirdparty-dependencies.yaml index 516fa7195..b018d80d7 100644 --- a/jjb/opflex/opflex-thirdparty-dependencies.yaml +++ b/jjb/opflex/opflex-thirdparty-dependencies.yaml @@ -17,11 +17,6 @@ libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - - carbon: - branch: 'stable/carbon' - libuv-version: '1.8.0' - rapidjson-version: '1.0.2' - openvswitch-version: '2.6.0' project: 'opflex' diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml index 6e2100179..323de7492 100644 --- a/jjb/opflex/opflex.yaml +++ b/jjb/opflex/opflex.yaml @@ -20,11 +20,6 @@ libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - - carbon: - branch: 'stable/carbon' - libuv-version: '1.8.0' - rapidjson-version: '1.0.2' - openvswitch-version: '2.6.0' project: 'opflex' project-name: 'opflex' diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index e0e4969a0..1ab742cb4 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -20,9 +20,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index b88d63f46..ed3a0a021 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -20,9 +20,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 8495123cb..5a45af0b3 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -17,10 +17,6 @@ - nitrogen: branch: 'stable/nitrogen' os-branch: 'pike' - - carbon: - branch: 'stable/carbon' - os-branch: 'ocata' - karaf-version: karaf3 jdk: 'openjdk8' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 60064bd31..ee9d84b7f 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -58,24 +58,3 @@ # Used by the release job staging-profile-id: a68b188166958 - -- project: - name: ovsdb-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'ovsdb' - project-name: 'ovsdb' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'ovsdb-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a68b188166958 diff --git a/jjb/packaging/build-rpm-snap.sh b/jjb/packaging/build-rpm-snap.sh index bcb79b5f8..20f632e71 100644 --- a/jjb/packaging/build-rpm-snap.sh +++ b/jjb/packaging/build-rpm-snap.sh @@ -15,9 +15,7 @@ $PYTHON -m pip install --upgrade pip $PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt" # Convert stream to numeric ODL major version -if [ "$STREAM" == "carbon" ]; then - VERSION_MAJOR=6 -elif [ "$STREAM" == "nitrogen" ]; then +if [ "$STREAM" == "nitrogen" ]; then VERSION_MAJOR=7 elif [ "$STREAM" == "oxygen" ]; then VERSION_MAJOR=8 @@ -34,4 +32,3 @@ fi --changelog_email "$CHANGELOG_EMAIL" \ latest_snap \ --major "$VERSION_MAJOR" - diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index 56dd06a9d..0465cf603 100644 --- a/jjb/packaging/packaging.yaml +++ b/jjb/packaging/packaging.yaml @@ -26,7 +26,6 @@ stream: - fluorine - - carbon - nitrogen - oxygen distro: @@ -276,27 +275,6 @@ build-timeout: '{build-timeout}' builders: - # Test Carbon SR2 tarball - - inject: - # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.2-Carbon/distribution-karaf-0.6.2-Carbon.tar.gz' - - shell: !include-raw-escape: build-rpm.sh - - install-test-uninstall-rpm - - # Test Carbon multipatch zip (no parallel tarball available) - # NB: This will need to be updated as old builds expire - - inject: - # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/distribution-karaf/0.6.4-SNAPSHOT/distribution-karaf-0.6.4-20180408.212935-2.zip' - - shell: !include-raw-escape: build-rpm.sh - - install-test-uninstall-rpm - - # Test latest Carbon snapshot - - inject: - properties-content: 'STREAM=carbon' - - shell: !include-raw: build-rpm-snap.sh - - install-test-uninstall-rpm - # Test Nitrogen tarball - inject: # yamllint disable-line rule:line-length diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml index 0ec0a7b38..5ef7d58ef 100644 --- a/jjb/packaging/puppet.yaml +++ b/jjb/packaging/puppet.yaml @@ -17,8 +17,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - job-template: name: '{project-name}-test-sanity-{stream}' diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index 13eb0eb1f..11ebc0952 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index bba234735..ed16d18cb 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: a68ca4a24655c -- project: - name: packetcable-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'packetcable' - project-name: 'packetcable' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'packetcable-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[packetcable]' - - # Used by the release job - staging-profile-id: a68ca4a24655c - - project: name: packetcable-sonar jobs: diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index c745e2178..f9b73e441 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -53,25 +53,6 @@ # Used by the release job staging-profile-id: a68d3c2bb44d1 -- project: - name: persistence-carbon - jobs: - - odl-maven-jobs - - stream: carbon - project: 'persistence' - project-name: 'persistence' - branch: 'stable/carbon' - karaf-version: karaf3 - jdk: openjdk7 - mvn-settings: 'persistence-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[persistence]' - - # Used by the release job - staging-profile-id: a68d3c2bb44d1 - - project: name: persistence-sonar jobs: diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index 68b63a3ca..c1f1c0897 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -29,7 +29,7 @@ build-node: centos7-builder-2c-2g archive-artifacts: '**/*.log' build-timeout: 30 - jjb-version: 2.0.5 + jjb-version: 2.0.6 jenkins-urls: > https://jenkins.opendaylight.org/releng https://jenkins.opendaylight.org/sandbox diff --git a/jjb/releng-views.yaml b/jjb/releng-views.yaml new file mode 100644 index 000000000..5be4d2b18 --- /dev/null +++ b/jjb/releng-views.yaml @@ -0,0 +1,689 @@ +--- +- releng_view: &releng_view_common + name: releng-view-common + view-type: list + filter-executors: false + filter-queue: false + columns: + - status + - weather + - job + - last-success + - last-failure + - last-duration + - build-button + recurse: false + +# Note: most-recent Job Filter requires JJB 2.1 to be released. +- view: + name: 01-recent + regex: '.*' + description: 'List of most recent jobs' + job-filters: + most-recent: + max-to-include: 25 + check-start-time: true + <<: *releng_view_common + +- view: + name: All-Sonar + regex: '.*-sonar$' + description: 'List of Sonar jobs' + <<: *releng_view_common + +- view: + name: CLM + description: 'List of CLM jobs' + regex: '.*-clm$' + <<: *releng_view_common + +- view: + name: CSIT-1node + description: 'List of CSIT 1node jobs' + regex: '^.*-csit-1node.*' + <<: *releng_view_common + +- view: + name: CSIT-3node + description: 'List of CSIT 3node jobs' + regex: '^.*-csit-3node.*' + <<: *releng_view_common + +- view: + name: CSIT + description: 'List of CSIT jobs' + regex: '^.*-csit-.*' + <<: *releng_view_common + +- view: + name: CSIT-Verify + description: 'List of CSIT Verify jobs' + regex: '^.*-csit-verify.*' + <<: *releng_view_common + +- view: + name: Distribution-Check + description: 'List of Distribution Check jobs' + regex: '.*-distribution.*-check-.*' + <<: *releng_view_common + +- view: + name: Distribution-Jobs + description: 'List of Distribution jobs (test, check, merge, deploy, offline, verify)' + regex: '^.*-distribution-(?!(test|check|merge|deploy|offline|verify)).*' + <<: *releng_view_common + +- view: + name: Gate + description: 'List of Gate jobs' + regex: '.*-gate-.*' + <<: *releng_view_common + +# Note: column plugins implementations requires JJB 2.1 to be released. +- view: + name: Integration + description: 'List of Integration jobs' + regex: '.*-integration-.*' + view-type: list + filter-executors: false + filter-queue: false + columns: + - status + - weather + - job + - last-success + - last-failure + - last-duration + - build-button + - jacoco + - find-bugs + - robot-list + recurse: false + +- view: + name: Merge-Jobs + description: 'List of Merge jobs' + regex: '.*-merge-.*' + <<: *releng_view_common + +- view: + name: Patch-Test + description: 'List of Patch-Test jobs, for prioritizing jobs via the Job Priorities plugin' + regex: '.*-patch-test-.*' + <<: *releng_view_common + +- view: + name: Periodic + description: 'List of Periodic jobs' + regex: '[a-zA-Z0-9]+-periodic-[a-zA-Z0-9]+' + <<: *releng_view_common + +- view: + name: Release + description: 'List of Release jobs' + regex: '.*-release-.*' + <<: *releng_view_common + +- view: + name: Sanity + description: 'List of Sanity jobs' + regex: '.*-sanity-.*' + <<: *releng_view_common + +- view: + name: Thirdparty + description: 'List of ODL Nexus Thirdparty dependencies jobs' + regex: '.*-thirdparty-.*' + <<: *releng_view_common + +- view: + name: Validate + description: 'List of Validate jobs' + regex: '.*-validate-autorelease-.*' + <<: *releng_view_common + +- view: + name: Verify + description: 'List of Verify jobs, exluding CSIT jobs' + regex: '^(?!.*-csit).*-verify-.*' + <<: *releng_view_common + +- view: + name: aaa + description: 'List of aaa jobs' + regex: '^aaa-.*' + <<: *releng_view_common + +- view: + name: alto + description: 'List of alto jobs' + regex: '^alto-.*' + <<: *releng_view_common + +- view: + name: archetypes + regex: '^archetypes-.*' + description: 'List of archetypes jobs' + <<: *releng_view_common + +- view: + name: atrium + description: 'List of atrium jobs' + regex: '^atrium-.*' + <<: *releng_view_common + +- view: + name: autorelease + description: 'List of autorelease jobs' + regex: '^autorelease-.*' + <<: *releng_view_common + +- view: + name: bgpcep + description: 'List of bgpcep jobs' + regex: '^bgpcep-.*' + <<: *releng_view_common + +- view: + name: bier + description: 'List of bier jobs' + regex: '^bier-.*' + <<: *releng_view_common + +- view: + name: builder + description: 'List of builder jobs' + regex: '^(builder|lf-infra)-.*' + <<: *releng_view_common + +- view: + name: capwap + description: 'List of capwap jobs' + regex: '^capwap-.*' + <<: *releng_view_common + +- view: + name: cardinal + description: 'List of cardinal jobs' + regex: '^cardinal-.*' + <<: *releng_view_common + +- view: + name: centinel + description: 'List of centinel jobs' + regex: '^centinel-.*' + <<: *releng_view_common + +- view: + name: circuitsw + description: 'List of circuitsw jobs' + regex: '^circuitsw-.*' + <<: *releng_view_common + +- view: + name: coe + description: 'List of coe jobs' + regex: '^coe-.*' + <<: *releng_view_common + +- view: + name: controller + description: 'List of controller jobs' + regex: '^controller-.*' + <<: *releng_view_common + +- view: + name: coretutorials + description: 'List of coretutorials jobs' + regex: '^coretutorials-.*' + <<: *releng_view_common + +- view: + name: daexim + description: 'List of daexim jobs' + regex: '^daexim-.*' + <<: *releng_view_common + +- view: + name: didm + description: 'List of didm jobs' + regex: '^didm-.*' + <<: *releng_view_common + +- view: + name: distribution + description: 'List of distribution jobs' + regex: '^(integration-)?distribution-.*' + <<: *releng_view_common + +- view: + name: dlux + description: 'List of dlux jobs' + regex: '^dlux-.*' + <<: *releng_view_common + +- view: + name: dluxapps + description: 'List of dluxapps jobs' + regex: '^dluxapps-.*' + <<: *releng_view_common + +- view: + name: docs + description: 'List of docs jobs' + regex: '^docs-.*' + <<: *releng_view_common + +- view: + name: eman + description: 'List of eman jobs' + regex: '^eman-.*' + <<: *releng_view_common + +- view: + name: epc + description: 'List of epc jobs' + regex: '^epc-.*' + <<: *releng_view_common + +- view: + name: faas + description: 'List of faas jobs' + regex: '^faas-.*' + <<: *releng_view_common + +- view: + name: federation + description: 'List of federation jobs' + regex: '^federation-.*' + <<: *releng_view_common + +- view: + name: fpc + description: 'List of fpc jobs' + regex: '^fpc-.*' + <<: *releng_view_common + +- view: + name: genius + description: 'List of genius jobs' + regex: '^genius-.*' + <<: *releng_view_common + +- view: + name: gnt + description: 'List of gnt jobs' + regex: '^gnt-.*' + <<: *releng_view_common + +- view: + name: groupbasedpolicy + description: 'List of groupbasedpolicy jobs' + regex: '^groupbasedpolicy-.*' + <<: *releng_view_common + +- view: + name: intrautils + description: 'List of infrautils jobs' + regex: '^infrautils-.*' + <<: *releng_view_common + +- view: + name: integration + description: 'List of integration jobs' + regex: '^integration-.*' + <<: *releng_view_common + +- view: + name: iotdm + description: 'List of iotdm jobs' + regex: '^iotdm-.*' + <<: *releng_view_common + +- view: + name: jsonrpc + description: 'List of jsonrpc jobs' + regex: '^jsonrpc-.*' + <<: *releng_view_common + +- view: + name: kafkaproducer + description: 'List of kafkaproducer jobs' + regex: '^kafkaproducer-.*' + <<: *releng_view_common + +- view: + name: l2switch + description: 'List of l2switch jobs' + regex: '^l2switch-.*' + <<: *releng_view_common + +- view: + name: lacp + description: 'List of lacp jobs' + regex: '^lacp-.*' + <<: *releng_view_common + +- view: + name: lispflowmapping + description: 'List of lispflowmapping jobs' + regex: '^lispflowmapping-.*' + <<: *releng_view_common + +- view: + name: mdsal + description: 'List of mdsal jobs' + regex: '^mdsal-.*' + <<: *releng_view_common + +- view: + name: messaging4transport + description: 'List of messaging4transport jobs' + regex: '^messaging4transport-.*' + <<: *releng_view_common + +- view: + name: natapp + description: 'List of natapp jobs' + regex: '^natapp-.*' + <<: *releng_view_common + +- view: + name: nemo + description: 'List of nemo jobs' + regex: '^nemo-.*' + <<: *releng_view_common + +- view: + name: netconf + description: 'List of netconf jobs' + regex: '^netconf-.*' + <<: *releng_view_common + +- view: + name: netide + description: 'List of netide jobs' + regex: '^netide-.*' + <<: *releng_view_common + +- view: + name: netvirt + description: 'List of netvirt jobs' + regex: '^netvirt-.*' + <<: *releng_view_common + +- view: + name: netvirt-csit + description: 'List of netvirt-csit jobs' + regex: 'netvirt-csit(?!(.*gate)|(.*hwvtep)).*' + <<: *releng_view_common + +- view: + name: neutron + description: 'List of neutron jobs' + regex: '^neutron-.*' + <<: *releng_view_common + +- view: + name: next + description: 'List of next jobs' + regex: '^next-.*' + <<: *releng_view_common + +- view: + name: nic + description: 'List of nic jobs' + regex: '^nic-.*' + <<: *releng_view_common + +- view: + name: ocpplugin + description: 'List of ocpplugin jobs' + regex: '^ocpplugin-.*' + <<: *releng_view_common + +- view: + name: odlparent + description: 'List of odlparent jobs' + regex: '^odlparent-.*' + <<: *releng_view_common + +- view: + name: of-config + description: 'List of of-config jobs' + regex: '^of-config-.*' + <<: *releng_view_common + +- view: + name: openflowjava + description: 'List of openflowjava jobs' + regex: '^openflowjava-.*' + <<: *releng_view_common + +- view: + name: openflowplugin + description: 'List of openflowplugin jobs' + regex: '^openflowplugin-.*' + <<: *releng_view_common + +- view: + name: openflowplugin-carbon + description: 'List of openflowplugin carbon jobs' + regex: 'openflowplugin-.*-carbon' + <<: *releng_view_common + +- view: + name: openflowplugin-nitrogen + description: 'List of openflowplugin nitrogen jobs' + regex: 'openflowplugin-.*-nitrogen' + <<: *releng_view_common + +- view: + name: openflowplugin-oxygen + description: 'List of openflowplugin oxygen jobs' + regex: 'openflowplugin-.*-oxygen' + <<: *releng_view_common + +- view: + name: opflex + description: 'List of opflex jobs' + regex: '^opflex-.*' + <<: *releng_view_common + +- view: + name: ovil + description: 'List of ovil jobs' + regex: '^ovil-.*' + <<: *releng_view_common + +- view: + name: ovsdb + description: 'List of ovsdb jobs' + regex: '^ovsdb-.*' + <<: *releng_view_common + +- view: + name: p4plugin + description: 'List of p4plugin jobs' + regex: '^p4plugin-.*' + <<: *releng_view_common + +- view: + name: packaging + description: 'List of packaging, ansible and puppet jobs' + regex: '^packaging.*|ansible.*|puppet.*' + <<: *releng_view_common + +- view: + name: packer + description: 'List of packer jobs' + regex: '^builder-.*packer.*' + <<: *releng_view_common + +- view: + name: packetcable + description: 'List of packetcable jobs' + regex: '^packetcable-.*' + <<: *releng_view_common + +- view: + name: persistence + description: 'List of persistence jobs' + regex: '^persistence-.*' + <<: *releng_view_common + +- view: + name: potn + description: 'List of potn jobs' + regex: '^potn-.*' + <<: *releng_view_common + +- view: + name: reservation + description: 'List of reservation jobs' + regex: '^reservation-.*' + <<: *releng_view_common + +- view: + name: sdninterfaceapp + description: 'List of sdninterfaceapp jobs' + regex: '^sdninterfaceapp-.*' + <<: *releng_view_common + +- view: + name: sfc + description: 'List of sfc jobs' + regex: '^sfc-.*' + <<: *releng_view_common + +- view: + name: snbi + description: 'List of snbi jobs' + regex: '^snbi-.*' + <<: *releng_view_common + +- view: + name: snmp + description: 'List of snmp jobs' + regex: '^snmp-.*' + <<: *releng_view_common + +- view: + name: snmp4sdn + description: 'List of snmp4sdn jobs' + regex: '^snmp4sdn-.*' + <<: *releng_view_common + +- view: + name: spectrometer + description: 'List of spectrometer jobs' + regex: '^spectrometer-.*' + <<: *releng_view_common + +- view: + name: sptn + description: 'List of sptn jobs' + regex: '^sptn-.*' + <<: *releng_view_common + +- view: + name: spx + description: 'List of spx jobs' + regex: '^sxp-.*' + <<: *releng_view_common + +- view: + name: systemmetrics + description: 'List of systemmetrics jobs' + regex: '^systemmetrics-.*' + <<: *releng_view_common + +- view: + name: telemetry + description: 'List of telemetry jobs' + regex: '^telemetry-.*' + <<: *releng_view_common + +- view: + name: topoprocessing + description: 'List of topoprocessing jobs' + regex: '^topoprocessing-.*' + <<: *releng_view_common + +- view: + name: transportpce + description: 'List of transportpce jobs' + regex: '^transportpce-.*' + <<: *releng_view_common + +- view: + name: tsdr + description: 'List of tsdr jobs' + regex: '^tsdr-.*' + <<: *releng_view_common + +- view: + name: ttp + description: 'List of ttp jobs' + regex: '^ttp-.*' + <<: *releng_view_common + +- view: + name: unimgr + description: 'List of unimgr jobs' + regex: '^unimgr-.*' + <<: *releng_view_common + +- view: + name: usc + description: 'List of usc jobs' + regex: '^usc-.*' + <<: *releng_view_common + +- view: + name: uscplugin + description: 'List of uscplugin jobs' + regex: '^usecplugin-.*' + <<: *releng_view_common + +- view: + name: vbd + description: 'List of vbd jobs' + regex: '^vbd-.*' + <<: *releng_view_common + +- view: + name: verify-python + description: 'List of pyhton-verify jobs' + regex: '.*-python-.*' + <<: *releng_view_common + +- view: + name: vpnservice + description: 'List of vpnservice jobs' + regex: '^vpnservice-.*' + <<: *releng_view_common + +- view: + name: vtn + description: 'List of vtn jobs' + regex: '^vtn-.*' + <<: *releng_view_common + +- view: + name: yang-push + description: 'List of yang-push jobs' + regex: '^yang-push-.*' + <<: *releng_view_common + +- view: + name: yangide + description: 'List of yangide jobs' + regex: '^yangide-.*' + <<: *releng_view_common + +- view: + name: yangtools + description: 'List of yangtools jobs' + regex: '^yangtools-.*' + <<: *releng_view_common diff --git a/jjb/requirements.txt b/jjb/requirements.txt index 5d42295a0..b6e748b49 100644 --- a/jjb/requirements.txt +++ b/jjb/requirements.txt @@ -1 +1 @@ -jenkins-job-builder==2.0.5 +jenkins-job-builder==2.0.6 diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index 47b06b04e..bb02d1938 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -50,24 +50,6 @@ # Used by the release job staging-profile-id: a68d9bc504037 -- project: - name: reservation-carbon - jobs: - - odl-maven-jobs - - stream: carbon - project: 'reservation' - project-name: 'reservation' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'reservation-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[reservation]' - - # Used by the release job - staging-profile-id: a68d9bc504037 - - project: name: reservation-sonar jobs: diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml index da2df481e..1e1df4fc9 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index a9dd8c51f..0d06515ae 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -55,26 +55,6 @@ # Used by the release job staging-profile-id: a68e3d1ff55e3 -- project: - name: sdninterfaceapp-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'sdninterfaceapp' - project-name: 'sdninterfaceapp' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'sdninterfaceapp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'bgpcep-merge-{stream}' - email-upstream: '[sdninterfaceapp] [bgpcep]' - - # Used by the release job - staging-profile-id: a68e3d1ff55e3 - - project: name: sdninterfaceapp-sonar jobs: diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index c050efa8c..d9d576e42 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -18,9 +18,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index a0dc38318..e6be93e35 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index d3da13233..0d155f72f 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -15,9 +15,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 feature: - basic: diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index 331afd100..54ea866be 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -11,8 +11,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' project: 'sfc' project-name: 'sfc' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index ab58e449b..75d1bd250 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -58,26 +58,6 @@ # Used by the release job staging-profile-id: a68eb361ca48a -- project: - name: sfc-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'sfc' - project-name: 'sfc' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'sfc-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' - email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' - build-node: centos7-builder-8c-8g - - # Used by the release job - staging-profile-id: a68eb361ca48a - - project: name: sfc-sonar jobs: diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index 86c6be31c..045e7a8a2 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: a68f328cefed6 -- project: - name: snbi-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'snbi' - project-name: 'snbi' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'snbi-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[snbi]' - - # Used by the release job - staging-profile-id: a68f328cefed6 - - project: name: snbi-sonar jobs: diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 5eb654f48..a66bf0a18 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: a68fb236b93a6 -- project: - name: snmp-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'snmp' - project-name: 'snmp' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'snmp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[snmp] [odlparent]' - - # Used by the release job - staging-profile-id: a68fb236b93a6 - - project: name: snmp-sonar jobs: diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 9d07ce18b..0eac9f8d5 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: a69034a4b6ef5 -- project: - name: snmp4sdn-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'snmp4sdn' - project-name: 'snmp4sdn' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'snmp4sdn-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a69034a4b6ef5 - - project: name: snmp4sdn-sonar jobs: diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 32f2fea77..b6656a02c 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -21,9 +21,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml index d7b95d23c..a54a2f697 100644 --- a/jjb/sxp/sxp-csit-cluster-routing.yaml +++ b/jjb/sxp/sxp-csit-cluster-routing.yaml @@ -21,10 +21,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-route' install: - all: diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index 7404e0b81..2013f744b 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -21,9 +21,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 1c18ccd31..2314008f8 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -21,9 +21,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index 954ab23ca..cb63fe7b3 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -21,9 +21,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 28abaf89d..4b0ab51c7 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -21,9 +21,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index e3bb0b876..9d661fad5 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: a6909c75719b7 -- project: - name: sxp-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'sxp' - project-name: 'sxp' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'sxp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[sxp] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a6909c75719b7 - - project: name: sxp-sonar jobs: diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml index f6b280bb9..cf76a47f9 100644 --- a/jjb/systemmetrics/systemmetrics.yaml +++ b/jjb/systemmetrics/systemmetrics.yaml @@ -50,24 +50,6 @@ # Used by the release job staging-profile-id: a69113575458e -- project: - name: systemmetrics-carbon - jobs: - - odl-maven-jobs - - project: 'systemmetrics' - project-name: 'systemmetrics' - stream: carbon - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'systemmetrics-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a69113575458e - - project: name: systemmetrics-sonar jobs: diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml index a9def51b8..a1d471497 100644 --- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml +++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml @@ -15,9 +15,6 @@ stream: - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index b2a84b5d7..97b7e3630 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: a691bbe2328cb -- project: - name: topoprocessing-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'topoprocessing' - project-name: 'topoprocessing' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'topoprocessing-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a691bbe2328cb - - project: name: topoprocessing-sonar jobs: diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 30ab98e93..e17f3469b 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -50,24 +50,6 @@ # Used by the release job staging-profile-id: a6927323fa3d4 -- project: - name: transportpce-carbon - jobs: - - odl-maven-jobs - - project: 'transportpce' - project-name: 'transportpce' - stream: carbon - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'transportpce-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a6927323fa3d4 - - project: name: transportpce-sonar jobs: diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index 0abf934ed..6e9a43ba3 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index 02e9df3cd..57f60b335 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index c574684ae..a034c1b00 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index 8c251df84..0e35d1c50 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index a213d46d0..2fe38b4c1 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: a69373036303c -- project: - name: tsdr-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'tsdr' - project-name: 'tsdr' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'tsdr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[tsdr]' - - # Used by the release job - staging-profile-id: a69373036303c - - project: name: tsdr-sonar jobs: diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index 0d06e7e91..8d4fbdf70 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: a693f948563d5 -- project: - name: ttp-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'ttp' - project-name: 'ttp' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'ttp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[ttp] [odlparent]' - - # Used by the release job - staging-profile-id: a693f948563d5 - - project: name: ttp-sonar jobs: diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml index f8e2542a5..a7753324a 100644 --- a/jjb/unimgr/unimgr-csit-basic.yaml +++ b/jjb/unimgr/unimgr-csit-basic.yaml @@ -15,9 +15,6 @@ stream: - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml index 4e74f0421..c221e79d5 100644 --- a/jjb/unimgr/unimgr-csit-legato.yaml +++ b/jjb/unimgr/unimgr-csit-legato.yaml @@ -15,9 +15,6 @@ stream: - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 5a73394ed..ebc5171c0 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -55,26 +55,6 @@ # Used by the release job staging-profile-id: a695d0a0b8d51 -- project: - name: unimgr-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'unimgr' - project-name: 'unimgr' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'unimgr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'ovsdb-merge-{stream}' - email-upstream: '[unimgr] [ovsdb]' - build-node: centos7-builder-4c-16g - - # Used by the release job - staging-profile-id: a695d0a0b8d51 - - project: name: unimgr-sonar jobs: diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index a43ce024c..0ef3a94d9 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -22,9 +22,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index ca04c7f2d..02a1d544c 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -21,9 +21,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index b11b299d8..e447eca17 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -55,26 +55,6 @@ # Used by the release job staging-profile-id: a697b633b3ffe -- project: - name: usc-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'usc' - project-name: 'usc' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'usc-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' - email-upstream: '[usc] [controller] [yangtools] [odlparent]' - - # Used by the release job - staging-profile-id: a697b633b3ffe - - project: name: usc-sonar jobs: diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml index ff278048d..83d3b707b 100644 --- a/jjb/usecplugin/usecplugin-csit-basic.yaml +++ b/jjb/usecplugin/usecplugin-csit-basic.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index 32263d804..5a372d08d 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: a69902281e037 -- project: - name: usecplugin-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'usecplugin' - project-name: 'usecplugin' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'usecplugin-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowplugin-merge-{stream}' - email-upstream: '[usecplugin] [openflowplugin]' - - # Used by the release job - staging-profile-id: a69902281e037 - - project: name: usecplugin-sonar jobs: diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index 8a775119a..d943a07e5 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -52,25 +52,6 @@ # Used by the release job staging-profile-id: a69aae2832869 -- project: - name: yang-push-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'yang-push' - project-name: 'yang-push' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'yang-push-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[yang-push]' - - # Used by the release job - staging-profile-id: a69aae2832869 - - project: name: yang-push-sonar jobs: diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index 2e8ec0ae2..2cfe449b6 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -50,24 +50,6 @@ # Used by the release job staging-profile-id: fba306956f98 -- project: - name: yangide-carbon - jobs: - - odl-maven-jobs - - stream: carbon - project: 'yangide' - project-name: 'yangide' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'yangide-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[yangide] [odlparent] [yangtools]' - - # Used by the release job - staging-profile-id: fba306956f98 - - project: name: yangide-sonar jobs: diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 52320ec7e..7d53f7fc5 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -19,9 +19,6 @@ branch: 'stable/oxygen' - nitrogen: branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index 2812b50aa..c7d14dab5 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -54,34 +54,6 @@ # Used by the release job staging-profile-id: 1271cf710cc09d -- project: - name: yangtools-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'yangtools' - project-name: 'yangtools' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'yangtools-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[yangtools] [odlparent]' - archive-artifacts: > - **/*.prop - **/*.log - **/target/surefire-reports/*-output.txt - **/target/failsafe-reports/failsafe-summary.xml - **/hs_err_*.log - **/target/feature/feature.xml - - # Used by the release job - staging-profile-id: 1271cf710cc09d - - project: name: yangtools-sonar jobs: