From: Daniel Farrell Date: Wed, 9 May 2018 09:35:44 +0000 (+0000) Subject: Merge "Remove sxp carbon jobs" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=521c7c44f4330f394315d19fccd1856a494a3952;hp=dd28d242e12282f838c89264b2edbf34fb1b9c97;p=releng%2Fbuilder.git Merge "Remove sxp carbon jobs" --- diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 1360004a59..c085faa4fd 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 1be27c06eb..8d0f33daf9 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 c557db0bb4..5d6d1acb78 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 d630199be4..2930bd0fbd 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 f4e71ff3d9..1296047540 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/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index f49b3b3e91..e6bf110b6c 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 4c65c5b807..7e5138f08f 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 0000000000..87992153c9 --- /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/genius/genius.yaml b/jjb/genius/genius.yaml index 73bbbf8d52..e70e2fa969 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 diff --git a/jjb/global-jjb b/jjb/global-jjb index 536325e518..5a2ef9c64c 160000 --- a/jjb/global-jjb +++ b/jjb/global-jjb @@ -1 +1 @@ -Subproject commit 536325e5186cf8883d630feaea2d91591b39fd50 +Subproject commit 5a2ef9c64caf06ff737dfa040b61c4909c97e996 diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index ad9aefa2c9..e2130df801 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 02475d741d..89f48409f8 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 bb4852f00f..8cf106f883 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 73b3adb169..194d2d69b6 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 8a00e9b51c..6f83a6b813 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/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index 24da023832..5c89996ce7 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/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 00fdc97029..7bf4f2a3b8 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 045b935ad7..9a22ec92b9 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 bca8ed3d6b..c4740342c2 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 b93b676753..da1520e4b3 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 12df50ccca..0d41cc9ded 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 7705e08f99..38b8e609a3 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 3d37ea4510..bd2808eff0 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 8a65460cc6..981ad10640 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 5fe0ab123b..6cccdbf838 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 835926e963..567959a201 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 ff29a4fd91..21202836b0 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 9a7c346850..a93ea5e084 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 01a735dccf..6f50fbc52b 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 3564440735..07582f1f8d 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/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index e0e4969a03..1ab742cb4b 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 b88d63f460..ed3a0a0213 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 8495123cbd..5a45af0b36 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 60064bd31a..ee9d84b7fc 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 bcb79b5f83..20f632e716 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 56dd06a9db..0465cf603f 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 0ec0a7b381..5ef7d58efb 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/releng-jobs.yaml b/jjb/releng-jobs.yaml index 68b63a3ca5..c1f1c0897d 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 0000000000..5be4d2b18a --- /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 5d42295a06..b6e748b49a 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/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml index da2df481e3..1e1df4fc9e 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 a9dd8c51fc..0d06515aee 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/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml index a9def51b86..a1d4714970 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 b2a84b5d70..97b7e3630c 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 30ab98e93c..e17f3469b0 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 0abf934ed2..6e9a43ba30 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 02e9df3cd6..57f60b3358 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 c574684aee..a034c1b000 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 8c251df84d..0e35d1c50f 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 a213d46d0a..2fe38b4c17 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 0d06e7e91d..8d4fbdf700 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 f8e2542a5f..a7753324a7 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 4e74f04215..c221e79d59 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 5a73394ed6..ebc5171c08 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 a43ce024c7..0ef3a94d96 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 ca04c7f2d6..02a1d544c5 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 b11b299d81..e447eca17d 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 ff278048d5..83d3b707bd 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 32263d804e..5a372d08da 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 8a775119ab..d943a07e51 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 2e8ec0ae28..2cfe449b6f 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 52320ec7e4..7d53f7fc56 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 2812b50aaf..c7d14dab5d 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: