From 73db6e3816a507f0c12edede5d8951c488800bda Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Wed, 27 Mar 2019 18:43:44 +1000 Subject: [PATCH] Remove all Oxygen Jobs. Oxygen is EOL-ed with Neon released, remove all Oxygen jobs from the infra. Change-Id: I2d7f8a9e7c6a405324059719ce6d7c60f5bf9d8c Signed-off-by: Anil Belur --- jjb/aaa/aaa-csit-authn.yaml | 3 - jjb/aaa/aaa-patch-test.yaml | 4 - jjb/aaa/aaa.yaml | 19 ---- jjb/alto/alto-csit-setup.yaml | 3 - jjb/alto/alto.yaml | 20 ----- jjb/autorelease/autorelease-projects.yaml | 4 - jjb/autorelease/autorelease-templates.yaml | 2 +- .../autorelease-version-management.yaml | 2 - .../validate-autorelease-oxygen.yaml | 77 ---------------- jjb/autorelease/view-autorelease-oxygen.yaml | 59 ------------ jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml | 3 - jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 3 - jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml | 3 - .../bgpcep-csit-bgpclustering-longevity.yaml | 3 - jjb/bgpcep/bgpcep-csit-bgpclustering.yaml | 3 - jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 3 - jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 3 - jjb/bgpcep/bgpcep-patch-test.yaml | 3 - jjb/bgpcep/bgpcep.yaml | 26 ------ jjb/bier/bier-csit-basic.yaml | 7 +- jjb/bier/bier.yaml | 21 ----- jjb/coe/coe-csit.yaml | 3 - jjb/coe/coe-patch-test.yaml | 3 - jjb/coe/coe.yaml | 25 ------ jjb/controller/controller-csit-akka1.yaml | 3 - .../controller-csit-clustering.yaml | 3 - .../controller-csit-cs-chasing-leader.yaml | 3 - .../controller-csit-cs-partnheal.yaml | 3 - ...ontroller-csit-ddb-expl-lead-movement.yaml | 3 - .../controller-csit-dnb-noloss.yaml | 3 - .../controller-csit-drb-partnheal.yaml | 3 - .../controller-csit-drb-precedence.yaml | 3 - .../controller-csit-dsbenchmark-cluster.yaml | 3 - .../controller-csit-dsbenchmark.yaml | 3 - .../controller-csit-rest-cars-perf.yaml | 3 - .../controller-csit-rest-clust-cars-perf.yaml | 3 - jjb/controller/controller-patch-test.yaml | 4 - jjb/controller/controller.yaml | 23 ----- jjb/daexim/daexim-csit-basic.yaml | 3 - jjb/daexim/daexim-csit-clustering-basic.yaml | 3 - jjb/daexim/daexim.yaml | 19 ---- jjb/defaults.yaml | 14 --- jjb/dlux/dlux.yaml | 19 ---- jjb/dluxapps/dluxapps-csit-yangman.yaml | 3 - jjb/dluxapps/dluxapps.yaml | 20 ----- jjb/docs/docs-rtd.yaml | 3 - jjb/genius/genius-csit-genius.yaml | 3 - jjb/genius/genius-patch-test.yaml | 4 - jjb/genius/genius.yaml | 32 ------- ...groupbasedpolicy-csit-1node-openstack.yaml | 4 - .../groupbasedpolicy-csit-3node.yaml | 3 - .../groupbasedpolicy-csit-6node.yaml | 3 - .../groupbasedpolicy-csit-clustering.yaml | 3 - .../groupbasedpolicy-csit-sxp.yaml | 3 - jjb/groupbasedpolicy/groupbasedpolicy.yaml | 27 ------ jjb/honeycomb/vbd/vbd.yaml | 19 ---- jjb/infrautils/infrautils-patch-test.yaml | 4 - jjb/infrautils/infrautils.yaml | 26 ------ jjb/integration/csit-jobs-oxygen.lst | 81 ----------------- .../distribution-csit-userfeatures.yaml | 2 - .../distribution/distribution-jobs.yaml | 44 --------- jjb/integration/integration-test-jobs.yaml | 27 ------ jjb/jsonrpc/jsonrpc-csit-basic.yaml | 3 - jjb/jsonrpc/jsonrpc.yaml | 19 ---- .../l2switch-csit-host-scalability-daily.yaml | 3 - jjb/l2switch/l2switch-csit-scalability.yaml | 3 - jjb/l2switch/l2switch-csit-switch.yaml | 3 - jjb/l2switch/l2switch-patch-test.yaml | 3 - jjb/l2switch/l2switch.yaml | 24 ----- .../lispflowmapping-csit-msmr.yaml | 3 - .../lispflowmapping-csit-performance.yaml | 3 - jjb/lispflowmapping/lispflowmapping.yaml | 25 ------ jjb/mdsal/mdsal-csit-bindingv1.yaml | 3 - jjb/mdsal/mdsal-patch-test.yaml | 4 - jjb/mdsal/mdsal.yaml | 30 ------- jjb/nemo/nemo-csit-engine.yaml | 3 - jjb/nemo/nemo.yaml | 19 ---- jjb/netconf/netconf-clustering-scale.yaml | 3 - jjb/netconf/netconf-clustering.yaml | 3 - jjb/netconf/netconf-csit-callhome.yaml | 3 - jjb/netconf/netconf-patch-test.yaml | 4 - jjb/netconf/netconf-scale.yaml | 3 - jjb/netconf/netconf-userfeatures.yaml | 3 - jjb/netconf/netconf.yaml | 22 ----- .../netvirt-csit-hwvtep-openstack.yaml | 49 ---------- jjb/netvirt/netvirt-csit-multi-apex.yaml | 3 - jjb/netvirt/netvirt-csit-multi-openstack.yaml | 89 ------------------- jjb/netvirt/netvirt-job-reports.yaml | 2 - jjb/netvirt/netvirt-patch-test.yaml | 4 - jjb/netvirt/netvirt.yaml | 3 - jjb/neutron/neutron-patch-test.yaml | 4 - jjb/neutron/neutron.yaml | 20 ----- jjb/odlparent/odlparent-patch-test.yaml | 4 - jjb/of-config/of-config.yaml | 19 ---- ...ugin-csit-bundle-based-reconciliation.yaml | 3 - .../openflowplugin-csit-cbench.yaml | 3 - ...flowplugin-csit-clustering-bulkomatic.yaml | 3 - ...lugin-csit-clustering-perf-bulkomatic.yaml | 3 - .../openflowplugin-csit-clustering.yaml | 3 - .../openflowplugin-csit-flow-services.yaml | 3 - .../openflowplugin-csit-longevity.yaml | 3 - .../openflowplugin-csit-perf-bulkomatic.yaml | 3 - ...flowplugin-csit-perf-stats-collection.yaml | 3 - .../openflowplugin-csit-sanity.yaml | 3 - .../openflowplugin-csit-scale-link.yaml | 3 - .../openflowplugin-csit-scale-switch.yaml | 3 - .../openflowplugin-csit-scale.yaml | 3 - .../openflowplugin-patch-test.yaml | 4 - jjb/openflowplugin/openflowplugin.yaml | 39 +------- jjb/opflex/opflex-custom.yaml | 7 -- jjb/opflex/opflex.yaml | 6 -- jjb/ovsdb/ovsdb-csit-clustering.yaml | 3 - jjb/ovsdb/ovsdb-csit-southbound.yaml | 3 - jjb/ovsdb/ovsdb-full-integration.yaml | 3 - jjb/ovsdb/ovsdb-patch-test.yaml | 4 - jjb/ovsdb/ovsdb.yaml | 21 ----- jjb/p4plugin/p4plugin.yaml | 20 ----- jjb/packaging/build-rpm-snap.sh | 4 +- jjb/packaging/packaging-puppet.yaml | 3 - jjb/packaging/packaging.yaml | 2 - jjb/packaging/test-rpm-docker.sh | 2 +- jjb/packetcable/packetcable-csit-pcmm.yaml | 3 - jjb/packetcable/packetcable.yaml | 19 ---- jjb/serviceutils/serviceutils-patch-test.yaml | 4 - jjb/serviceutils/serviceutils.yaml | 3 - jjb/sfc/sfc-csit-full-deploy.yaml | 3 - jjb/sfc/sfc-csit-rest-basic.yaml | 3 - jjb/sfc/sfc-patch-test.yaml | 4 - jjb/sfc/sfc-python.yaml | 3 - jjb/sfc/sfc.yaml | 26 ------ jjb/snmp/snmp.yaml | 19 ---- jjb/snmp4sdn/snmp4sdn.yaml | 19 ---- jjb/sxp/sxp-csit-basic.yaml | 3 - jjb/sxp/sxp-csit-clustering.yaml | 3 - jjb/sxp/sxp-csit-filtering.yaml | 3 - jjb/sxp/sxp-csit-performance.yaml | 3 - jjb/sxp/sxp-csit-topology.yaml | 3 - jjb/sxp/sxp.yaml | 21 ----- jjb/transportpce/transportpce.yaml | 18 ---- jjb/tsdr/tsdr-csit-cassandra.yaml | 3 - jjb/tsdr/tsdr-csit-elasticsearch.yaml | 3 - jjb/tsdr/tsdr-csit-hbase.yaml | 3 - jjb/tsdr/tsdr-csit-hsqldb.yaml | 3 - jjb/tsdr/tsdr.yaml | 19 ---- jjb/usc/usc-csit-tcp.yaml | 3 - jjb/usc/usc.yaml | 20 ----- jjb/yangtools/yangtools-csit-system.yaml | 3 - jjb/yangtools/yangtools-patch-test.yaml | 4 - 148 files changed, 8 insertions(+), 1493 deletions(-) delete mode 100644 jjb/autorelease/validate-autorelease-oxygen.yaml delete mode 100644 jjb/autorelease/view-autorelease-oxygen.yaml delete mode 100644 jjb/integration/csit-jobs-oxygen.lst diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 5eecb1ef1..8404aec2b 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -19,9 +19,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - all: diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index 5f873c438..b87306907 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -16,10 +16,6 @@ - fluorine: branch: 'stable/fluorine' os-branch: 'queens' - - oxygen: - branch: 'stable/oxygen' - os-branch: 'queens' - disable-job: 'true' feature: - authn: diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index bbebed1ca..5cd894b9a 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -68,25 +68,6 @@ # Used by the release job staging-profile-id: 9318cf3c82c33 -- project: - name: aaa-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - disable-job: true - stream: oxygen - project: 'aaa' - project-name: 'aaa' - branch: 'stable/oxygen' - 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/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index 9ca1ca048..ee913d8da 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - all: diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index 8aec1decc..bab58b8d0 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -56,26 +56,6 @@ # Used by the release job staging-profile-id: 931eabae9693c -- project: - name: alto-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: oxygen - project: 'alto' - project-name: 'alto' - branch: 'stable/oxygen' - build-node: centos7-builder-2c-8g - mvn-settings: 'alto-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'l2switch-merge-{stream}' - email-upstream: '[alto] [l2switch]' - disable-job: 'true' - - # Used by the release job - staging-profile-id: 931eabae9693c - - project: name: alto-sonar jobs: diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 164d6eba9..d60c8cbd7 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -23,10 +23,6 @@ - fluorine: branch: 'stable/fluorine' integration-test: fluorine - - oxygen: - branch: 'stable/oxygen' - integration-test: oxygen - disable-job: 'true' project: releng/autorelease project-name: autorelease diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 5974c7616..20f0a74b6 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -469,7 +469,7 @@ name: RELEASE description: | Release to generate release notes for. - Eg. Oxygen-SR1, Fluorine-SR2... + Eg. Neon-SR1, Fluorine-SR2... scm: - lf-infra-gerrit-scm: git-url: '$GIT_URL/$GERRIT_PROJECT' diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index 4427eacf1..9b1203b71 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -17,5 +17,3 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' diff --git a/jjb/autorelease/validate-autorelease-oxygen.yaml b/jjb/autorelease/validate-autorelease-oxygen.yaml deleted file mode 100644 index 06bad8036..000000000 --- a/jjb/autorelease/validate-autorelease-oxygen.yaml +++ /dev/null @@ -1,77 +0,0 @@ ---- -# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job -- project: - name: autorelease-validate-oxygen - jobs: - - '{project-name}-validate-autorelease-{stream}' - stream: oxygen - branch: stable/oxygen - project-name: - - aaa: - project: aaa - - alto: - project: alto - - bgpcep: - project: bgpcep - - bier: - project: bier - - controller: - project: controller - - coe: - project: coe - - daexim: - project: daexim - - dlux: - project: dlux - - dluxapps: - project: dluxapps - - genius: - project: genius - - groupbasedpolicy: - project: groupbasedpolicy - - honeycomb-vbd: - project: honeycomb/vbd - - infrautils: - project: infrautils - - integration-distribution: - project: integration/distribution - - jsonrpc: - project: jsonrpc - - l2switch: - project: l2switch - - lispflowmapping: - project: lispflowmapping - - mdsal: - project: mdsal - - nemo: - project: nemo - - netconf: - project: netconf - - netvirt: - project: netvirt - - neutron: - project: neutron - - of-config: - project: of-config - - openflowplugin: - project: openflowplugin - - ovsdb: - project: ovsdb - - p4plugin: - project: p4plugin - - packetcable: - project: packetcable - - serviceutils: - project: serviceutils - - sfc: - project: sfc - - snmp: - project: snmp - - snmp4sdn: - project: snmp4sdn - - sxp: - project: sxp - - tsdr: - project: tsdr - - usc: - project: usc diff --git a/jjb/autorelease/view-autorelease-oxygen.yaml b/jjb/autorelease/view-autorelease-oxygen.yaml deleted file mode 100644 index 9138f0ea3..000000000 --- a/jjb/autorelease/view-autorelease-oxygen.yaml +++ /dev/null @@ -1,59 +0,0 @@ ---- -# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job -- releng_view: &releng_autorelease_view_common_oxygen - name: releng-view-autorelease-oxygen - 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-Oxygen - description: 'List of Oxygen Merge jobs for Autorelease' - job-name: - - 'aaa-maven-merge-oxygen' - - 'alto-maven-merge-oxygen' - - 'bgpcep-maven-merge-oxygen' - - 'bier-maven-merge-oxygen' - - 'controller-maven-merge-oxygen' - - 'coe-maven-merge-oxygen' - - 'daexim-maven-merge-oxygen' - - 'dlux-maven-merge-oxygen' - - 'dluxapps-maven-merge-oxygen' - - 'genius-maven-merge-oxygen' - - 'groupbasedpolicy-maven-merge-oxygen' - - 'honeycomb/vbd-maven-merge-oxygen' - - 'infrautils-maven-merge-oxygen' - - 'integration/distribution-maven-merge-oxygen' - - 'jsonrpc-maven-merge-oxygen' - - 'l2switch-maven-merge-oxygen' - - 'lispflowmapping-maven-merge-oxygen' - - 'mdsal-maven-merge-oxygen' - - 'nemo-maven-merge-oxygen' - - 'netconf-maven-merge-oxygen' - - 'netvirt-maven-merge-oxygen' - - 'neutron-maven-merge-oxygen' - - 'of-config-maven-merge-oxygen' - - 'openflowplugin-maven-merge-oxygen' - - 'ovsdb-maven-merge-oxygen' - - 'p4plugin-maven-merge-oxygen' - - 'packetcable-maven-merge-oxygen' - - 'serviceutils-maven-merge-oxygen' - - 'sfc-maven-merge-oxygen' - - 'snmp-maven-merge-oxygen' - - 'snmp4sdn-maven-merge-oxygen' - - 'sxp-maven-merge-oxygen' - - 'tsdr-maven-merge-oxygen' - - 'usc-maven-merge-oxygen' - <<: *releng_autorelease_view_common_oxygen diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 51fd4d44e..2a6b8cc6c 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index 2655b30e6..01fa4f668 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -19,9 +19,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 598415ec4..bbfa54b55 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 59963c7c6..41bc854b9 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 582af12ab..222032dff 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 9a7c9ba39..cb07e4a3d 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - all: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index a80a7845d..ed80862a4 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -21,9 +21,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - all: diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index 767bbef08..36ef21235 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -15,9 +15,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' feature: - bgp: diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index cb7c9f206..94f551508 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -89,32 +89,6 @@ # Used by the release job staging-profile-id: 9427a05049030 -- project: - name: bgpcep-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: oxygen - project: 'bgpcep' - project-name: 'bgpcep' - build-node: centos7-builder-8c-8g - build-timeout: 120 - branch: 'stable/oxygen' - mvn-settings: 'bgpcep-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - mdsal-merge-{stream} - email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal]' - disable-job: 'true' - - # 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 715b63cba..ba7a52179 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -20,12 +20,9 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' - verify-stream: 'oxygen' - verify-branch: 'stable/oxygen' + verify-stream: 'fluorine' + verify-branch: 'stable/fluorine' verify-karaf-version: 'karaf4' install: diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index 959acae10..fc3e31d9b 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -59,27 +59,6 @@ # Used by the release job staging-profile-id: 942a8075b1f2a -- project: - name: bier-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: oxygen - project: 'bier' - project-name: 'bier' - branch: 'stable/oxygen' - build-node: centos7-builder-2c-8g - build-timeout: 90 - mvn-settings: 'bier-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[bier]' - disable-job: 'true' - - # Used by the release job - staging-profile-id: 942a8075b1f2a - - project: name: bier-sonar jobs: diff --git a/jjb/coe/coe-csit.yaml b/jjb/coe/coe-csit.yaml index 2880906af..d5f3ad426 100644 --- a/jjb/coe/coe-csit.yaml +++ b/jjb/coe/coe-csit.yaml @@ -17,9 +17,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - only: diff --git a/jjb/coe/coe-patch-test.yaml b/jjb/coe/coe-patch-test.yaml index eaf499375..11672aeb9 100644 --- a/jjb/coe/coe-patch-test.yaml +++ b/jjb/coe/coe-patch-test.yaml @@ -13,9 +13,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' jdk: 'openjdk8' diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index 980591d75..4621f57cd 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -71,31 +71,6 @@ # Used by the release job staging-profile-id: 96c0be46aac33 -- project: - name: coe-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: coe - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/ - rtd-token: 95a5a8fed43b75c6be8432a2643f20a344ba5155 - - odl-maven-jobs - - project: 'coe' - project-name: 'coe' - stream: oxygen - branch: 'stable/oxygen' - 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]' - build-node: centos7-docker-2c-8g - disable-job: 'true' - - # 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 2e6f70ea9..e47fa7530 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -17,9 +17,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - all: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index b3313cb78..f5531d4cf 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -16,9 +16,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - all: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 0ed748e67..c6751a3f2 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/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - only: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 6528e045a..ce92ead15 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' 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 8de3ceab2..5bb582fe0 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/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - only: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index b9f9c78d3..ef0ecc07c 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - only: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 0e1dcf30f..b8bd04743 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - only: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index ee0cd3a58..4f2aad082 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - only: diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 2537cca60..de95463be 100644 --- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - all: diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml index 70b35bf85..16e29821f 100644 --- a/jjb/controller/controller-csit-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - all: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 61a7e187f..d78dbdbad 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/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' 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 8daba62ce..89fe12dc1 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - only: diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml index 174be2904..d9ea876b7 100644 --- a/jjb/controller/controller-patch-test.yaml +++ b/jjb/controller/controller-patch-test.yaml @@ -16,10 +16,6 @@ - fluorine: branch: 'stable/fluorine' os-branch: 'queens' - - oxygen: - branch: 'stable/oxygen' - os-branch: 'queens' - disable-job: 'true' jdk: 'openjdk8' diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 81fa9f84f..2115e9bbe 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -80,29 +80,6 @@ # Used by the release job staging-profile-id: 96c1c9177efdd -- project: - name: controller-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: oxygen - project: 'controller' - project-name: 'controller' - branch: 'stable/oxygen' - 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]' - disable-job: 'true' - - # Used by the release job - staging-profile-id: 96c1c9177efdd - - project: name: controller-sonar jobs: diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 3f7539d55..e84f71cc5 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - only: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index 4078d6989..6eb81685d 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - only: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 7fed129bf..c62c4b794 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -68,25 +68,6 @@ # Used by the release job staging-profile-id: 96e4dade34bd7 -- project: - name: daexim-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - project: 'daexim' - project-name: 'daexim' - stream: oxygen - branch: 'stable/oxygen' - mvn-settings: 'daexim-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[daexim] [odlparent] [yangtools] [controller]' - disable-job: 'true' - - # Used by the release job - staging-profile-id: 96e4dade34bd7 - - project: name: daexim-sonar jobs: diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index 7f9614560..95df192e1 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -185,8 +185,6 @@ netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-neon csit-high-frequency-list-fluorine: > netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine - csit-high-frequency-list-oxygen: > - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen csit-sanity-list-sodium: > openflowplugin-csit-1node-sanity-only-sodium, distribution-sanity-sodium @@ -196,9 +194,6 @@ csit-sanity-list-fluorine: > openflowplugin-csit-1node-sanity-only-fluorine, distribution-sanity-fluorine - csit-sanity-list-oxygen: > - openflowplugin-csit-1node-sanity-only-oxygen, - distribution-sanity-oxygen csit-weekly-list-sodium: > controller-csit-1node-notifications-longevity-only-sodium, controller-csit-3node-drb-partnheal-longevity-only-sodium, @@ -226,12 +221,3 @@ distribution-deploy-fluorine, distribution-offline-fluorine, openflowplugin-csit-1node-longevity-only-fluorine - csit-weekly-list-oxygen: > - controller-csit-1node-notifications-longevity-only-oxygen, - controller-csit-3node-drb-partnheal-longevity-only-oxygen, - controller-csit-3node-drb-precedence-longevity-only-oxygen, - controller-csit-3node-ddb-expl-lead-movement-longevity-only-oxygen, - bgpcep-csit-3node-bgpclustering-longevity-only-oxygen, - distribution-deploy-oxygen, - distribution-offline-oxygen, - openflowplugin-csit-1node-longevity-only-oxygen diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index c9f0688c2..fd9b0d9ee 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -53,25 +53,6 @@ # Used by the release job staging-profile-id: 96e6a0327484f -- project: - name: dlux-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: oxygen - project: 'dlux' - project-name: 'dlux' - branch: 'stable/oxygen' - mvn-settings: 'dlux-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[dlux] [odlparent]' - disable-job: 'true' - - # Used by the release job - staging-profile-id: 96e6a0327484f - - project: name: dlux-sonar jobs: diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index fd7a203de..8fa8dd24e 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - all: diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 0b9ccc08b..a478078d7 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -56,26 +56,6 @@ # Used by the release job staging-profile-id: 96e6fb1e65bf9 -- project: - name: dluxapps-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - project: 'dluxapps' - project-name: 'dluxapps' - stream: oxygen - branch: 'stable/oxygen' - build-node: centos7-builder-2c-8g - mvn-settings: 'dluxapps-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' - disable-job: 'true' - - # Used by the release job - staging-profile-id: 96e6fb1e65bf9 - - project: name: dluxapps-sonar jobs: diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index 510f268d0..dcaeb7bfd 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -12,9 +12,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' project: docs project-name: docs diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 56c6069aa..1c3fe7def 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -22,9 +22,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - only: diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index d38db9027..716664463 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -16,10 +16,6 @@ - fluorine: branch: 'stable/fluorine' os-branch: 'queens' - - oxygen: - branch: 'stable/oxygen' - os-branch: 'queens' - disable-job: 'true' jdk: 'openjdk8' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index ff1ec5ce0..2e75ccf3b 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -98,38 +98,6 @@ # Used by the release job staging-profile-id: 96fb4b6d9d1ee -- project: - name: genius-oxygen - 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 - project: 'genius' - project-name: 'genius' - branch: 'stable/oxygen' - build-node: centos7-builder-2c-8g - mvn-settings: 'genius-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - build-timeout: 90 - dependencies: > - controller-merge-{stream}, - yangtools-merge-{stream}, - odlparent-merge-{stream}, - openflowplugin-merge-{stream}, - neutron-merge-{stream} - email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]' - disable-job: 'true' - - # Used by the release job - staging-profile-id: 96fb4b6d9d1ee - - project: name: genius-sonar jobs: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml index 591d3c9da..26e52ffb9 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -28,10 +28,6 @@ - fluorine: branch: 'stable/fluorine' install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' - - oxygen: - branch: 'stable/oxygen' - install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' - disable-job: 'true' openstack: - pike: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index edf23ff9f..90e9866ff 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -19,9 +19,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index 506c09067..c955dbccf 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index a2b8eaf40..6202a755b 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index 69c304e50..c80c65d24 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: 'true' install: - only: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index 3292b54ce..36b12ad69 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -77,33 +77,6 @@ # Used by the release job staging-profile-id: 96fbb93f95a76 -- project: - name: groupbasedpolicy-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: oxygen - project: 'groupbasedpolicy' - project-name: 'groupbasedpolicy' - branch: 'stable/oxygen' - build-node: centos7-builder-2c-8g - mvn-settings: 'groupbasedpolicy-settings' - mvn-goals: '-U clean deploy findbugs:findbugs' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - build-timeout: 90 - dependencies: > - openflowjava-merge-{stream}, - openflowplugin-merge-{stream}, - neutron-merge-{stream}, - sfc-merge-{stream}, - ovsdb-merge-{stream} - email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' - disable-job: 'true' - - # 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 71010fa24..e3d869d73 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -50,25 +50,6 @@ # Used by the release job staging-profile-id: 96fc362c36862 -- project: - name: vbd-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: oxygen - project: 'honeycomb/vbd' - project-name: 'vbd' - branch: 'stable/oxygen' - mvn-settings: 'honeycomb-vbd-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[vbd]' - disable-job: 'true' - - # 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 72fa951ab..f49c2d6c1 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -16,10 +16,6 @@ - fluorine: branch: 'stable/fluorine' os-branch: 'queens' - - oxygen: - branch: 'stable/oxygen' - os-branch: 'queens' - disable-job: 'true' jdk: 'openjdk8' diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 0dd9a4aef..c391f02a0 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -74,32 +74,6 @@ # Used by the release job staging-profile-id: 96fca0367756c -- project: - name: infrautils-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - doc-dir: .tox/docs/tmp/html - project-pattern: infrautils - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/ - rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9 - - odl-maven-jobs - - stream: oxygen - project: 'infrautils' - project-name: 'infrautils' - branch: 'stable/oxygen' - mvn-settings: 'infrautils-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[infrautils] [odlparent]' - disable-job: 'true' - - # Used by the release job - staging-profile-id: 96fca0367756c - - project: name: infrautils-sonar jobs: diff --git a/jjb/integration/csit-jobs-oxygen.lst b/jjb/integration/csit-jobs-oxygen.lst deleted file mode 100644 index a71aae80d..000000000 --- a/jjb/integration/csit-jobs-oxygen.lst +++ /dev/null @@ -1,81 +0,0 @@ -aaa-csit-1node-authn-all-oxygen, -alto-csit-1node-setup-all-oxygen, -bgpcep-csit-1node-bgp-ingest-all-oxygen, -bgpcep-csit-1node-bgp-ingest-mixed-all-oxygen, -bgpcep-csit-1node-throughpcep-all-oxygen, -bgpcep-csit-1node-userfeatures-all-oxygen, -bgpcep-csit-3node-bgpclustering-all-oxygen, -bgpcep-csit-3node-bgpclustering-ha-only-oxygen, -bier-csit-1node-basic-all-oxygen, -coe-csit-1node-container-networking-only-oxygen, -controller-csit-1node-akka1-all-oxygen, -controller-csit-1node-benchmark-all-oxygen, -controller-csit-1node-rest-cars-perf-all-oxygen, -controller-csit-3node-benchmark-all-oxygen, -controller-csit-3node-clustering-ask-all-oxygen, -controller-csit-3node-clustering-tell-all-oxygen, -controller-csit-3node-rest-clust-cars-perf-ask-only-oxygen, -controller-csit-3node-rest-clust-cars-perf-tell-only-oxygen, -daexim-csit-1node-basic-only-oxygen, -daexim-csit-3node-clustering-basic-only-oxygen, -distribution-csit-1node-userfeatures-all-oxygen, -distribution-csit-managed-oxygen, -dluxapps-csit-1node-yangman-all-oxygen, -genius-csit-1node-upstream-only-oxygen, -genius-csit-3node-upstream-only-oxygen, -groupbasedpolicy-csit-1node-3-node-all-oxygen, -groupbasedpolicy-csit-1node-6node-all-oxygen, -groupbasedpolicy-csit-1node-sxp-only-oxygen, -groupbasedpolicy-csit-3node-clustering-all-oxygen, -l2switch-csit-1node-host-scalability-daily-only-oxygen, -l2switch-csit-1node-scalability-all-oxygen, -l2switch-csit-1node-switch-all-oxygen, -lispflowmapping-csit-1node-msmr-all-oxygen, -lispflowmapping-csit-1node-performance-only-oxygen, -lispflowmapping-csit-3node-msmr-all-oxygen, -mdsal-csit-1node-bindingv1-only-oxygen, -nemo-csit-1node-engine-all-oxygen, -netconf-csit-1node-callhome-only-oxygen, -netconf-csit-1node-scale-only-oxygen, -netconf-csit-1node-userfeatures-all-oxygen, -netconf-csit-3node-clustering-only-oxygen, -netconf-csit-3node-clustering-scale-only-oxygen, -netvirt-csit-1node-0cmb-1ctl-1cmp-openstack-queens-sfc-oxygen, -netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-oxygen, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-oxygen, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen, -netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-oxygen, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-oxygen, -netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-snat-conntrack-oxygen, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-oxygen, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen, -netvirt-csit-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-oxygen, -netvirt-csit-hwvtep-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen, -netvirt-csit-hwvtep-3node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen, -openflowplugin-csit-1node-bundle-based-reconciliation-all-oxygen, -openflowplugin-csit-1node-cbench-only-oxygen, -openflowplugin-csit-1node-flow-services-all-oxygen, -openflowplugin-csit-1node-perf-bulkomatic-only-oxygen, -openflowplugin-csit-1node-perf-stats-collection-only-oxygen, -openflowplugin-csit-1node-scale-link-only-oxygen, -openflowplugin-csit-1node-scale-only-oxygen, -openflowplugin-csit-1node-scale-switch-only-oxygen, -openflowplugin-csit-3node-clustering-bulkomatic-only-oxygen, -openflowplugin-csit-3node-clustering-only-oxygen, -openflowplugin-csit-3node-clustering-perf-bulkomatic-only-oxygen, -ovsdb-csit-1node-upstream-southbound-all-oxygen, -ovsdb-csit-3node-upstream-clustering-only-oxygen, -packetcable-csit-1node-pcmm-all-oxygen, -sfc-csit-3node-docker-full-deploy-all-oxygen, -sfc-csit-3node-rest-basic-all-oxygen, -sxp-csit-1node-basic-all-oxygen, -sxp-csit-1node-filtering-all-oxygen, -sxp-csit-1node-performance-all-oxygen, -sxp-csit-1node-topology-all-oxygen, -sxp-csit-3node-clustering-all-oxygen, -tsdr-csit-1node-cassandra-datastore-only-oxygen, -tsdr-csit-1node-elasticsearch-datastore-only-oxygen, -tsdr-csit-1node-hbase-datastore-all-oxygen, -tsdr-csit-1node-hsqldb-datastore-all-oxygen, -usc-csit-1node-tcp-all-oxygen, -yangtools-csit-1node-system-only-oxygen, diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index f8eaf14f4..8bb89d2a9 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -18,8 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' install: - all: diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 85ac347ca..3f7646034 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -51,11 +51,6 @@ odl-transportpce-ordmodels, odl-transportpce-stubmodels - - oxygen: - branch: 'stable/oxygen' - karaf-version: karaf4 - disable-job: 'true' - - project: name: distribution-managed jobs: @@ -136,45 +131,6 @@ serviceutils-merge-{stream}, sfc-merge-{stream} - - oxygen: - branch: 'stable/oxygen' - disable-job: true - dependencies: > - aaa-merge-{stream}, - alto-merge-{stream}, - bgpcep-merge-{stream}, - bier-merge-{stream}, - coe-merge-{stream}, - controller-merge-{stream}, - daexim-merge-{stream}, - dluxapps-merge-{stream}, - dlux-merge-{stream}, - faas-merge-{stream}, - genius-merge-{stream}, - groupbasedpolicy-merge-{stream}, - infrautils-merge-{stream}, - jsonrpc-merge-{stream}, - l2switch-merge-{stream}, - lispflowmapping-merge-{stream}, - mdsal-merge-{stream}, - nemo-merge-{stream}, - netconf-merge-{stream}, - netvirt-merge-{stream}, - neutron-merge-{stream}, - of-config-merge-{stream}, - openflowplugin-merge-{stream}, - ovsdb-merge-{stream}, - p4plugin-merge-{stream}, - packetcable-merge-{stream}, - serviceutils-merge-{stream}, - sfc-merge-{stream}, - snmp4sdn-merge-{stream}, - snmp-merge-{stream}, - sxp-merge-{stream}, - tsdr-merge-{stream}, - usc-merge-{stream}, - vbd-merge-{stream} - - project: name: distribution-full jobs: diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index be7e06e5d..fb2caf47e 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -45,16 +45,6 @@ daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt bgpcep integration/distribution - - oxygen: - branch: 'stable/oxygen' - mvn-version: 'mvn35' - csit-list: !include: csit-jobs-oxygen.lst - build-order: > - odlparent yangtools infrautils mdsal controller serviceutils aaa netconf - daexim ovsdb neutron openflowplugin coe genius lispflowmapping sfc netvirt - bgpcep integration/distribution - disable-job: true - - project: name: integration-distribution project: integration/test @@ -109,19 +99,6 @@ csit-list: !include: csit-jobs-fluorine.lst csit-weekly-list: '{csit-weekly-list-fluorine}' csit-high-frequency-list: '{csit-high-frequency-list-fluorine}' - - oxygen: - branch: 'stable/oxygen' - csit-blacklist: > - capwap centinel didm iotdm jsonrpc lacp messaging4transport netide nic - ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd tempest wip - aaa-csit-1node-keystone-all groupbasedpolicy-csit-1node-1cmb-0ctl-0cmp-openstack-pike-openstack - netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike - netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct - netvirt-csit-3node-1cmb - last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used - csit-list: !include: csit-jobs-oxygen.lst - csit-weekly-list: '{csit-weekly-list-oxygen}' - csit-high-frequency-list: '{csit-high-frequency-list-oxygen}' - project: name: integration-sanity @@ -143,10 +120,6 @@ branch: 'stable/fluorine' karaf-version: odl csit-sanity-list: '{csit-sanity-list-fluorine}' - - oxygen: - branch: 'stable/oxygen' - karaf-version: karaf4 - csit-sanity-list: '{csit-sanity-list-oxygen}' - job-template: name: 'integration-merge-dashboard' diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml index f0d77cc85..443dd1807 100644 --- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml +++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml @@ -21,9 +21,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 41522921f..093115b80 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -50,25 +50,6 @@ # Used by the release job staging-profile-id: 96fdf4408765d -- project: - name: jsonrpc-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - project: 'jsonrpc' - project-name: 'jsonrpc' - stream: oxygen - branch: 'stable/oxygen' - 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]' - disable-job: true - - # 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 94afbf13c..a1cde7a89 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -19,9 +19,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index c800e5af2..679a9b30f 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -19,9 +19,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 208f5c691..acc6bff9b 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml index 3f8b2ea24..4984e5ee1 100644 --- a/jjb/l2switch/l2switch-patch-test.yaml +++ b/jjb/l2switch/l2switch-patch-test.yaml @@ -17,9 +17,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true feature: - all: diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 30f1487e2..b317c206e 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -68,30 +68,6 @@ # Used by the release job staging-profile-id: 96fee85953ca0 -- project: - name: l2switch-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: oxygen - project: 'l2switch' - project-name: 'l2switch' - branch: 'stable/oxygen' - 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]' - disable-job: true - - # Used by the release job - staging-profile-id: 96fee85953ca0 - - project: name: l2switch-sonar jobs: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index 1902a1f11..edbb8f03f 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index 55f008e6a..c8b05965b 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 6febcdaf4..6b6f17fb1 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -95,31 +95,6 @@ # Used by the release job staging-profile-id: 96fff2503b766 -- project: - name: lispflowmapping-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: oxygen - project: 'lispflowmapping' - project-name: 'lispflowmapping' - branch: 'stable/oxygen' - 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]' - archive-artifacts: > - **/*.log - **/target/surefire-reports/*-output.txt - - build-node: centos7-builder-8c-8g - disable-job: true - # 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 c7a3344d2..1dc5719ff 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml index d7ec6f12d..c24407703 100644 --- a/jjb/mdsal/mdsal-patch-test.yaml +++ b/jjb/mdsal/mdsal-patch-test.yaml @@ -16,10 +16,6 @@ - fluorine: branch: 'stable/fluorine' os-branch: 'queens' - - oxygen: - branch: 'stable/oxygen' - os-branch: 'queens' - disable-job: true jdk: 'openjdk8' diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index f34c3b9b7..4c28ccca2 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -95,36 +95,6 @@ # Used by the release job staging-profile-id: a674173c7b29d -- project: - name: mdsal-oxygen - jobs: - - '{project-name}-distribution-check-{stream}': - mvn-version: 'mvn35' - - '{project-name}-maven-javadoc-jobs': - mvn-version: 'mvn33' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: mdsal - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/ - rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002 - - odl-maven-jobs - - stream: oxygen - project: 'mdsal' - project-name: 'mdsal' - branch: 'stable/oxygen' - mvn-settings: 'mdsal-settings' - mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' - mvn-opts: '-Xmx2048m' - build-node: centos7-builder-8c-8g - build-timeout: 90 - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[mdsal] [odlparent] [yangtools]' - disable-job: true - - # Used by the release job - staging-profile-id: a674173c7b29d - - project: name: mdsal-sonar jobs: diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index c13b8502e..ecf7605ca 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 4584f017c..d47144d06 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -53,25 +53,6 @@ # Used by the release job staging-profile-id: a67a9890f6202 -- project: - name: nemo-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: oxygen - project: 'nemo' - project-name: 'nemo' - branch: 'stable/oxygen' - mvn-settings: 'nemo-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[nemo]' - disable-job: true - - # Used by the release job - staging-profile-id: a67a9890f6202 - - project: name: nemo-sonar jobs: diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index 79fcc3cf7..5fd3de7c7 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 62be81de9..c2c36726c 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 41145bd74..4012b53e3 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index e73252541..756b9b1bc 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -16,10 +16,6 @@ - fluorine: branch: 'stable/fluorine' os-branch: 'queens' - - oxygen: - branch: 'stable/oxygen' - os-branch: 'queens' - disable-job: true feature: - core: diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index efffbcd54..6e610acf6 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index f49c4f5a4..5b41d7dc6 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -21,9 +21,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 7fb3c583c..b5c684321 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -77,28 +77,6 @@ # Used by the release job staging-profile-id: a67b22fc3663f -- project: - name: netconf-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: oxygen - project: 'netconf' - project-name: 'netconf' - branch: 'stable/oxygen' - build-node: centos7-builder-2c-8g - mvn-settings: 'netconf-settings' - mvn-goals: 'clean deploy -Pintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - build-timeout: 90 - dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' - disable-job: true - - # Used by the release job - staging-profile-id: a67b22fc3663f - - project: name: netconf-sonar jobs: diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 7e34fe6b3..cb652a30e 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -96,52 +96,3 @@ odl-ml2-port-binding: 'pseudo-agentdb-binding' openstack_system_image: '{openstack_queens_system_image}' openstack_system2_image: '{openstack_queens_system_image}' - -- project: - name: netvirt-csit-hwvtep-openstack-integration-oxygen - jobs: - - inttest-csit-hwvtep-openstack-custom - - project: 'netvirt' - stream: 'oxygen' - branch: 'stable/oxygen' - 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-highcpu-8 - openstack_system_flavor: odl-highcpu-8 - openstack_system2_flavor: odl-highcpu-4 - tools_system_count: 2 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20181029-223513.438 - os-cmb-cnt: 0 - os-ctl-cnt: 1 - os-cmp-cnt: 2 - - # 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: 2 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' - - 3node: - openstack_system2_count: 3 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' - - functionality: - - upstream-stateful - - gate-stateful - - openstack: - - queens: - openstack-branch: 'stable/queens' - odl-ml2-branch: 'stable/queens' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_queens_system_image}' - openstack_system2_image: '{openstack_queens_system_image}' diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml index efc2b804b..7274d996a 100644 --- a/jjb/netvirt/netvirt-csit-multi-apex.yaml +++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml @@ -12,9 +12,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true testplan: '{project}-{topology}-openstack.txt' diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index 56c2f10d4..22b40f4e0 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -230,84 +230,6 @@ openstack_system_image: '{openstack_queens_system_image}' openstack_system2_image: '{openstack_queens_system_image}' -- project: - name: netvirt-csit-openstack-integration-oxygen - jobs: - - inttest-csit-openstack-custom - - project: 'netvirt' - stream: 'oxygen' - branch: 'stable/oxygen' - 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-highcpu-8 - openstack_system_flavor: odl-highcpu-8 - openstack_system2_flavor: odl-highcpu-4 - tools_system_count: 0 - os-cmb-cnt: 0 - os-ctl-cnt: 1 - os-cmp-cnt: 2 - disable-job: true - - topology: - - 1node: - openstack_system2_count: 2 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' - robot-options: '-v FAIL_ON_EXCEPTIONS:True' - - 3node: - openstack_system2_count: 3 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' - - functionality: - - upstream-stateful - - upstream-stateful-itm-direct-tunnels: - enable-itm-direct-tunnels: 'true' - - upstream-stateful-snat-conntrack: - odl-snat-mode: 'conntrack' - - gate-stateful - - gate-stateful-snat-conntrack: - odl-snat-mode: 'conntrack' - - gate-stateful-itm-direct-tunnels: - enable-itm-direct-tunnels: 'true' - - gate-minimal-cluster: - testplan: '{project}-{topology}-minimal-openstack.txt' - # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually. - - gate-tdd-wip: - testplan: '{project}-{topology}-tdd-wip-openstack.txt' - schedule: '' - tools_system_count: 3 - - tempest-stateful: - test-suites: 'openstack/tempest/tempest.robot' - testplan: '{project}-{topology}-openstack-tempest.txt' - schedule: '{schedule-daily}' - - tempest-stateful-snat-conntrack: - test-suites: 'openstack/tempest/tempest.robot' - testplan: '{project}-{topology}-openstack-tempest.txt' - odl-snat-mode: 'conntrack' - schedule: '{schedule-daily}' - - gate-tempest-stateful: - test-suites: 'openstack/tempest/tempest.robot' - testplan: '{project}-{topology}-openstack-tempest.txt' - - gate-tempest-stateful-snat-conntrack: - test-suites: 'openstack/tempest/tempest.robot' - testplan: '{project}-{topology}-openstack-tempest.txt' - odl-snat-mode: 'conntrack' - - openstack: - - queens: - openstack-branch: 'stable/queens' - odl-ml2-branch: 'stable/queens' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_queens_system_image}' - openstack_system2_image: '{openstack_queens_system_image}' - - project: name: netvirt-csit-sfc-openstack-integration jobs: @@ -353,14 +275,6 @@ - fluorine: branch: 'stable/fluorine' ovs-install: 'v2.9.2' - - oxygen: - branch: 'stable/oxygen' - ovs-install: 'v2.6.1-nsh' - os-cmp-cnt: 1 - openstack_system2_count: 1 - openstack_system_image: '{openstack_pike_system_image}' - openstack_system2_image: '{openstack_pike_system_image}' - disable-job: true - project: name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration @@ -385,9 +299,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true topology: - 1node: diff --git a/jjb/netvirt/netvirt-job-reports.yaml b/jjb/netvirt/netvirt-job-reports.yaml index 0cde5fc5c..3e1363ebc 100644 --- a/jjb/netvirt/netvirt-job-reports.yaml +++ b/jjb/netvirt/netvirt-job-reports.yaml @@ -9,8 +9,6 @@ netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-neon netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-fluorine netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-fluorine - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-oxygen - netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-snat-conntrack-oxygen report-logurl: 'https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1' report-numjobs: 100 report-path: '/tmp/jobreports' diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index 1aa204505..6065a5abc 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -16,10 +16,6 @@ - fluorine: branch: 'stable/fluorine' os-branch: 'queens' - - oxygen: - branch: 'stable/oxygen' - os-branch: 'queens' - disable-job: true jdk: 'openjdk8' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 97877eea5..967564c31 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -23,9 +23,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true project: 'netvirt' project-name: 'netvirt' diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml index 68c612ae3..9b1b75e37 100644 --- a/jjb/neutron/neutron-patch-test.yaml +++ b/jjb/neutron/neutron-patch-test.yaml @@ -16,10 +16,6 @@ - fluorine: branch: 'stable/fluorine' os-branch: 'queens' - - oxygen: - branch: 'stable/oxygen' - os-branch: 'queens' - disable-job: true jdk: 'openjdk8' diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index c42101443..23f7620ca 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -60,26 +60,6 @@ # Used by the release job staging-profile-id: a67e1b40d7419 -- project: - name: neutron-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: oxygen - project: 'neutron' - project-name: 'neutron' - build-timeout: 90 - branch: 'stable/oxygen' - 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/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml index 9a7fe3fb0..88c47d85f 100644 --- a/jjb/odlparent/odlparent-patch-test.yaml +++ b/jjb/odlparent/odlparent-patch-test.yaml @@ -16,10 +16,6 @@ - fluorine: branch: 'stable/fluorine' os-branch: 'queens' - - oxygen: - branch: 'stable/oxygen' - os-branch: 'queens' - disable-job: true jdk: 'openjdk8' diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index e18db3f1a..c4040d950 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -53,25 +53,6 @@ # Used by the release job staging-profile-id: a6880455efe67 -- project: - name: of-config-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: oxygen - project: 'of-config' - project-name: 'of-config' - branch: 'stable/oxygen' - mvn-settings: 'of-config-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: netconf-merge-{stream}' - email-upstream: '[of-config] [netconf]' - disable-job: true - - # Used by the release job - staging-profile-id: a6880455efe67 - - project: name: of-config-sonar jobs: diff --git a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml index 061eda837..a96aeb92a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml @@ -16,9 +16,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index d83bf837c..b7f322e54 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 5c3caa2e7..2d1b48091 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 431b24648..8def41378 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/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 9ec743cda..736f08057 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 7a5acaf3f..7820b795f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 7df4298db..ef3a6ec22 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -19,9 +19,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 79df63be0..947a34406 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index 0c6e97d7b..566a6b01f 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/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index c6a90e064..c69615b39 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -19,9 +19,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 9e2efa5d3..ba7bc2b59 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index 0a6f65f3a..be686f303 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index db0cc1610..2eafdfe3b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 80f63abbf..f0ce435bc 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -18,10 +18,6 @@ - fluorine: branch: 'stable/fluorine' os-branch: 'queens' - - oxygen: - branch: 'stable/oxygen' - os-branch: 'queens' - disable-job: true jdk: 'openjdk8' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index e18ea7e82..bdf251356 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -101,39 +101,6 @@ # Used by the release job staging-profile-id: a68a76dc1b44c -- project: - name: openflowplugin-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - doc-dir: .tox/docs/tmp/html - project-pattern: openflowplugin - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/ - rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f - - odl-maven-jobs - - stream: oxygen - project: 'openflowplugin' - project-name: 'openflowplugin' - branch: 'stable/oxygen' - build-node: centos7-builder-2c-8g - build-timeout: 90 - 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]' - disable-job: true - - # Used by the release job - staging-profile-id: a68a76dc1b44c - - project: name: openflowplugin-sonar jobs: @@ -155,8 +122,8 @@ project-name: 'openflowplugin' - project: - name: openflowplugin-oxygen-view + name: openflowplugin-fluorine-view views: - common-view - view-name: 'openflowplugin-oxygen' - view-regex: '^openflowplugin-.*-oxygen' + view-name: 'openflowplugin-flourine' + view-regex: '^openflowplugin-.*-fluorine' diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index f920b3d4a..217de21b5 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -21,13 +21,6 @@ libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - - oxygen: - branch: 'stable/oxygen' - libuv-version: '1.8.0' - rapidjson-version: '1.0.2' - openvswitch-version: '2.6.0' - disable-job: true - project: 'opflex' archive-artifacts: '**/*.tar.gz' diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml index 9f621b041..ddca4e02d 100644 --- a/jjb/opflex/opflex.yaml +++ b/jjb/opflex/opflex.yaml @@ -25,12 +25,6 @@ libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - - oxygen: - branch: 'stable/oxygen' - libuv-version: '1.8.0' - rapidjson-version: '1.0.2' - openvswitch-version: '2.6.0' - disable-job: true project: 'opflex' project-name: 'opflex' diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 4ee50847b..bade29c75 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 1acd4cb2e..96d4a5f81 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -20,9 +20,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 4bc2181f1..803116ad7 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -11,9 +11,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true project: 'ovsdb' archive-artifacts: '*.log' diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index fb2c5b417..c80f878be 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -17,10 +17,6 @@ - fluorine: branch: 'stable/fluorine' os-branch: 'queens' - - oxygen: - branch: 'stable/oxygen' - os-branch: 'queens' - disable-job: true jdk: 'openjdk8' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index a47e7e2d4..991e030e7 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -80,27 +80,6 @@ # Used by the release job staging-profile-id: a68b188166958 -- project: - name: ovsdb-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: oxygen - project: 'ovsdb' - project-name: 'ovsdb' - branch: 'stable/oxygen' - build-node: centos7-builder-2c-8g - 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]' - disable-job: true - - # Used by the release job - staging-profile-id: a68b188166958 - - project: name: ovsdb-view views: diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 0f6c51852..cf9c19ca2 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -53,26 +53,6 @@ # Used by the release job staging-profile-id: a68bf26e208d4 -- project: - name: p4plugin-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: oxygen - project: 'p4plugin' - project-name: 'p4plugin' - branch: 'stable/oxygen' - mvn-settings: 'p4plugin-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[p4plugin]' - disable-job: true - - # Used by the release job - staging-profile-id: a68bf26e208d4 - - project: name: p4plugin-sonar jobs: diff --git a/jjb/packaging/build-rpm-snap.sh b/jjb/packaging/build-rpm-snap.sh index 707635038..57b8de52e 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" == "oxygen" ]; then - VERSION_MAJOR=8 -elif [ "$STREAM" == "fluorine" ]; then +if [ "$STREAM" == "fluorine" ]; then VERSION_MAJOR=9 elif [ "$STREAM" == "neon" ]; then VERSION_MAJOR=10 diff --git a/jjb/packaging/packaging-puppet.yaml b/jjb/packaging/packaging-puppet.yaml index 5179fcc16..3752bd0f8 100644 --- a/jjb/packaging/packaging-puppet.yaml +++ b/jjb/packaging/packaging-puppet.yaml @@ -15,9 +15,6 @@ branch: 'master' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true - job-template: name: '{project-name}-test-sanity-{stream}' diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index 0b3673e43..197731d33 100644 --- a/jjb/packaging/packaging.yaml +++ b/jjb/packaging/packaging.yaml @@ -27,8 +27,6 @@ stream: - neon - fluorine - - oxygen: - disable-job: 'true' distro: - opensuse-42 diff --git a/jjb/packaging/test-rpm-docker.sh b/jjb/packaging/test-rpm-docker.sh index a7faeb446..980011d00 100644 --- a/jjb/packaging/test-rpm-docker.sh +++ b/jjb/packaging/test-rpm-docker.sh @@ -26,7 +26,7 @@ sudo docker exec $docker_id /bin/bash $scripts_path/start-odl.sh sudo docker exec $docker_id /bin/bash $scripts_path/test-ports-nofeature.sh # Don't install test feature and check REST for Oxygen, ODLPARENT-139 breaks it -if [ "$STREAM" == "oxygen" ] || [ "$STREAM" == "fluorine" ] || [ "$STREAM" == "neon" ]; then +if [ "$STREAM" == "fluorine" ] || [ "$STREAM" == "neon" ]; then sudo docker exec $docker_id /usr/bin/expect $scripts_path/test-karaf-oxygensafe.expect else sudo docker exec $docker_id /usr/bin/expect $scripts_path/test-karaf.expect diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index a5b7e36ee..c8ed20200 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -21,9 +21,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 895f07b59..fb1e2d689 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -53,25 +53,6 @@ # Used by the release job staging-profile-id: a68ca4a24655c -- project: - name: packetcable-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: oxygen - project: 'packetcable' - project-name: 'packetcable' - branch: 'stable/oxygen' - mvn-settings: 'packetcable-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[packetcable]' - disable-job: true - - # Used by the release job - staging-profile-id: a68ca4a24655c - - project: name: packetcable-sonar jobs: diff --git a/jjb/serviceutils/serviceutils-patch-test.yaml b/jjb/serviceutils/serviceutils-patch-test.yaml index d3e1e8438..450cbc2ba 100644 --- a/jjb/serviceutils/serviceutils-patch-test.yaml +++ b/jjb/serviceutils/serviceutils-patch-test.yaml @@ -16,10 +16,6 @@ - fluorine: branch: 'stable/fluorine' os-branch: 'queens' - - oxygen: - branch: 'stable/oxygen' - os-branch: 'queens' - disable-job: false jdk: 'openjdk8' diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index c28579e5c..2a69a9309 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true project: 'serviceutils' project-name: 'serviceutils' diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index 0718a03d9..bca4fbc0f 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index 9f22e8643..9c2a82031 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -19,9 +19,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index 0ab5eaf65..597bba707 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -18,10 +18,6 @@ - fluorine: branch: 'stable/fluorine' os-branch: 'queens' - - oxygen: - branch: 'stable/oxygen' - os-branch: 'queens' - disable-job: true feature: - basic: diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index 16752b0c4..3152dfa38 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -11,9 +11,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true project: 'sfc' project-name: 'sfc' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index b160c492e..cd9e99228 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -74,32 +74,6 @@ # Used by the release job staging-profile-id: a68eb361ca48a -- project: - name: sfc-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-rtd-jobs': - build-node: centos7-builder-2c-2g - project-pattern: sfc - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-sfc/38996/ - rtd-token: 2fa6c2900bbe181b0427ad65df3dc494ac749edb - - odl-maven-jobs - - stream: oxygen - project: 'sfc' - project-name: 'sfc' - branch: 'stable/oxygen' - mvn-settings: 'sfc-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - build-timeout: 120 - dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' - email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' - build-node: centos7-builder-8c-8g - disable-job: true - - # Used by the release job - staging-profile-id: a68eb361ca48a - - project: name: sfc-sonar jobs: diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 46ebba15d..996ea76c1 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -50,25 +50,6 @@ # Used by the release job staging-profile-id: a68fb236b93a6 -- project: - name: snmp-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: oxygen - project: 'snmp' - project-name: 'snmp' - branch: 'stable/oxygen' - mvn-settings: 'snmp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[snmp] [odlparent]' - disable-job: true - - # 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 eab54f697..9a45a18dd 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -50,25 +50,6 @@ # Used by the release job staging-profile-id: a69034a4b6ef5 -- project: - name: snmp4sdn-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: oxygen - project: 'snmp4sdn' - project-name: 'snmp4sdn' - branch: 'stable/oxygen' - 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]' - disable-job: true - - # 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 f10ead2a8..58a779435 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -26,9 +26,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index e9a7a7c1f..09ac3079d 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -26,9 +26,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 754f9b0e7..ef910c9d6 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -26,9 +26,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index fc876b8bb..7f970e61e 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -26,9 +26,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index d6f1637e5..ab4be0034 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -26,9 +26,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 5f6c3bddd..cc5572874 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -77,27 +77,6 @@ # Used by the release job staging-profile-id: a6909c75719b7 -- project: - name: sxp-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: oxygen - project: 'sxp' - project-name: 'sxp' - branch: 'stable/oxygen' - - 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]' - disable-job: true - - # Used by the release job - staging-profile-id: a6909c75719b7 - - project: name: sxp-sonar jobs: diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 28af13039..0f844d556 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -71,24 +71,6 @@ # Used by the release job staging-profile-id: a6927323fa3d4 -- project: - name: transportpce-oxygen - jobs: - - odl-maven-jobs - - project: 'transportpce' - project-name: 'transportpce' - stream: oxygen - branch: 'stable/oxygen' - 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]' - disable-job: true - - # 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 2916a91ca..172e03ab1 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -27,9 +27,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index 2be946c3e..29fe32e26 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -27,9 +27,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index 875cef301..96b2b2080 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -27,9 +27,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index d4e215410..7db3bab5b 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -27,9 +27,6 @@ karaf-version: 'odl' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.tsdr/features-tsdr//xml/features' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 5d6fa15ba..c90043f8c 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -65,25 +65,6 @@ # Used by the release job staging-profile-id: a69373036303c -- project: - name: tsdr-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: oxygen - project: 'tsdr' - project-name: 'tsdr' - branch: 'stable/oxygen' - mvn-settings: 'tsdr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[tsdr]' - disable-job: true - - # Used by the release job - staging-profile-id: a69373036303c - - project: name: tsdr-sonar jobs: diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index 53cd5aa8d..0b373cc7e 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -21,9 +21,6 @@ branch: 'stable/fluorine' # yamllint disable-line rule:line-length repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - all: diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 2675421c0..bdbebca14 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -53,26 +53,6 @@ # Used by the release job staging-profile-id: a697b633b3ffe -- project: - name: usc-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: oxygen - project: 'usc' - project-name: 'usc' - branch: 'stable/oxygen' - 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]' - disable-job: true - - # Used by the release job - staging-profile-id: a697b633b3ffe - - project: name: usc-sonar jobs: diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index 50deb04dc..58c2bb48c 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -18,9 +18,6 @@ branch: 'stable/neon' - fluorine: branch: 'stable/fluorine' - - oxygen: - branch: 'stable/oxygen' - disable-job: true install: - only: diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml index 461f03e19..2491d1630 100644 --- a/jjb/yangtools/yangtools-patch-test.yaml +++ b/jjb/yangtools/yangtools-patch-test.yaml @@ -16,10 +16,6 @@ - fluorine: branch: 'stable/fluorine' os-branch: 'queens' - - oxygen: - branch: 'stable/oxygen' - os-branch: 'queens' - disable-job: true jdk: 'openjdk8' -- 2.36.6