Remove all Oxygen Jobs. 37/79137/6
authorAnil Belur <abelur@linuxfoundation.org>
Wed, 27 Mar 2019 08:43:44 +0000 (18:43 +1000)
committerAnil Belur <abelur@linuxfoundation.org>
Wed, 27 Mar 2019 08:43:44 +0000 (18:43 +1000)
Oxygen is EOL-ed with Neon released, remove all
Oxygen jobs from the infra.

Change-Id: I2d7f8a9e7c6a405324059719ce6d7c60f5bf9d8c
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
148 files changed:
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-patch-test.yaml
jjb/aaa/aaa.yaml
jjb/alto/alto-csit-setup.yaml
jjb/alto/alto.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/autorelease-version-management.yaml
jjb/autorelease/validate-autorelease-oxygen.yaml [deleted file]
jjb/autorelease/view-autorelease-oxygen.yaml [deleted file]
jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
jjb/bgpcep/bgpcep-csit-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-userfeatures.yaml
jjb/bgpcep/bgpcep-patch-test.yaml
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier-csit-basic.yaml
jjb/bier/bier.yaml
jjb/coe/coe-csit.yaml
jjb/coe/coe-patch-test.yaml
jjb/coe/coe.yaml
jjb/controller/controller-csit-akka1.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-cs-chasing-leader.yaml
jjb/controller/controller-csit-cs-partnheal.yaml
jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
jjb/controller/controller-csit-dnb-noloss.yaml
jjb/controller/controller-csit-drb-partnheal.yaml
jjb/controller/controller-csit-drb-precedence.yaml
jjb/controller/controller-csit-dsbenchmark-cluster.yaml
jjb/controller/controller-csit-dsbenchmark.yaml
jjb/controller/controller-csit-rest-cars-perf.yaml
jjb/controller/controller-csit-rest-clust-cars-perf.yaml
jjb/controller/controller-patch-test.yaml
jjb/controller/controller.yaml
jjb/daexim/daexim-csit-basic.yaml
jjb/daexim/daexim-csit-clustering-basic.yaml
jjb/daexim/daexim.yaml
jjb/defaults.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps-csit-yangman.yaml
jjb/dluxapps/dluxapps.yaml
jjb/docs/docs-rtd.yaml
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius-patch-test.yaml
jjb/genius/genius.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/infrautils/infrautils-patch-test.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/csit-jobs-oxygen.lst [deleted file]
jjb/integration/distribution/distribution-csit-userfeatures.yaml
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/integration-test-jobs.yaml
jjb/jsonrpc/jsonrpc-csit-basic.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch-patch-test.yaml
jjb/l2switch/l2switch.yaml
jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal-csit-bindingv1.yaml
jjb/mdsal/mdsal-patch-test.yaml
jjb/mdsal/mdsal.yaml
jjb/nemo/nemo-csit-engine.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf-clustering-scale.yaml
jjb/netconf/netconf-clustering.yaml
jjb/netconf/netconf-csit-callhome.yaml
jjb/netconf/netconf-patch-test.yaml
jjb/netconf/netconf-scale.yaml
jjb/netconf/netconf-userfeatures.yaml
jjb/netconf/netconf.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-apex.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-job-reports.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron-patch-test.yaml
jjb/neutron/neutron.yaml
jjb/odlparent/odlparent-patch-test.yaml
jjb/of-config/of-config.yaml
jjb/openflowplugin/openflowplugin-csit-bundle-based-reconciliation.yaml
jjb/openflowplugin/openflowplugin-csit-cbench.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
jjb/openflowplugin/openflowplugin-csit-sanity.yaml
jjb/openflowplugin/openflowplugin-csit-scale-link.yaml
jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
jjb/openflowplugin/openflowplugin-csit-scale.yaml
jjb/openflowplugin/openflowplugin-patch-test.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/opflex/opflex-custom.yaml
jjb/opflex/opflex.yaml
jjb/ovsdb/ovsdb-csit-clustering.yaml
jjb/ovsdb/ovsdb-csit-southbound.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-patch-test.yaml
jjb/ovsdb/ovsdb.yaml
jjb/p4plugin/p4plugin.yaml
jjb/packaging/build-rpm-snap.sh
jjb/packaging/packaging-puppet.yaml
jjb/packaging/packaging.yaml
jjb/packaging/test-rpm-docker.sh
jjb/packetcable/packetcable-csit-pcmm.yaml
jjb/packetcable/packetcable.yaml
jjb/serviceutils/serviceutils-patch-test.yaml
jjb/serviceutils/serviceutils.yaml
jjb/sfc/sfc-csit-full-deploy.yaml
jjb/sfc/sfc-csit-rest-basic.yaml
jjb/sfc/sfc-patch-test.yaml
jjb/sfc/sfc-python.yaml
jjb/sfc/sfc.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp-csit-basic.yaml
jjb/sxp/sxp-csit-clustering.yaml
jjb/sxp/sxp-csit-filtering.yaml
jjb/sxp/sxp-csit-performance.yaml
jjb/sxp/sxp-csit-topology.yaml
jjb/sxp/sxp.yaml
jjb/transportpce/transportpce.yaml
jjb/tsdr/tsdr-csit-cassandra.yaml
jjb/tsdr/tsdr-csit-elasticsearch.yaml
jjb/tsdr/tsdr-csit-hbase.yaml
jjb/tsdr/tsdr-csit-hsqldb.yaml
jjb/tsdr/tsdr.yaml
jjb/usc/usc-csit-tcp.yaml
jjb/usc/usc.yaml
jjb/yangtools/yangtools-csit-system.yaml
jjb/yangtools/yangtools-patch-test.yaml

index 5eecb1ef140fafb9da2f848ea03e25a8f53140db..8404aec2bb81b6c399bb8f66dfc739e34e69205b 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - all:
index 5f873c438ff037332662e98d4dc0bae52aa277d7..b873069078f44029a2a3f67b1c54289385166531 100644 (file)
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
-          disable-job: 'true'
 
     feature:
       - authn:
index bbebed1cae220bcb17c3899b888de35ddd5e6f16..5cd894b9abd9bcab2109ef9a8edc9bc971ebaf23 100644 (file)
     # 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:
index 9ca1ca048b50c5527353c6125edbd8e0169adc3a..ee913d8da6f5b9278d48e8bfebdfabdabc917bfb 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - all:
index 8aec1deccb4a0d1401372d43b3d34eae6aad3e20..bab58b8d080bfd29820fcf0499890283bb973637 100644 (file)
     # 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:
index 164d6eba9137d422db08f0d0f6e035b001adc165..d60c8cbd750de9a889f743392b0ac025b2a3e3cf 100644 (file)
       - fluorine:
           branch: 'stable/fluorine'
           integration-test: fluorine
-      - oxygen:
-          branch: 'stable/oxygen'
-          integration-test: oxygen
-          disable-job: 'true'
 
     project: releng/autorelease
     project-name: autorelease
index 5974c7616717e9b04c0e6ce57c66b889447bf805..20f0a74b60fa4cf7f2787c2633a6b5ccefa63102 100644 (file)
           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'
index 4427eacf1865da22ac4a3b8cd6080af643611b8b..9b1203b71c38a586e22898836e290dbee1aa245c 100644 (file)
@@ -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 (file)
index 06bad80..0000000
+++ /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 (file)
index 9138f0e..0000000
+++ /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
index 51fd4d44ecc6c7856bbc23b6df2e1bdf1c6d5a07..2a6b8cc6ccaab8b5cc0d378ef30b17bc66a28704 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - all:
index 2655b30e6fbd0f764a89f06633004863f74e1f12..01fa4f6689858e16f04ca3e182e1667645cf745d 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - all:
index 598415ec4a435b7cd903ed0633e98cf6978b203f..bbfa54b5531fc0c74eb12b16dac09c6b04a439e7 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - only:
index 59963c7c6e753c1cf4e7c5e791c455cb4fec5ca6..41bc854b92420f73d33ad38752592e1569d455bf 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - only:
index 582af12aba246f5ded8ba775862f37dec44cc613..222032dff5c35e4458fc6b2515b469dbdd0dbc24 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - all:
index 9a7c9ba39a4c44251c6b85248f23cee598c49920..cb07e4a3dba4f05a0886615b8a5543ec8c883504 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - all:
index a80a7845d4f38e8cc45207b50ea9ad17af234e46..ed80862a4f56d911d9b956ff0a378afc566d1808 100644 (file)
@@ -21,9 +21,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - all:
index 767bbef084a5630d99b74dd8b81b418962f5d28a..36ef21235050e4692faf192b62637ff94db8ec5b 100644 (file)
@@ -15,9 +15,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     feature:
       - bgp:
index cb7c9f20636c87ceb1350df773ef2f83b1bfe92a..94f5515089f6a6689909c6e7ccc98167f6bbd866 100644 (file)
     # 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:
index 715b63cbab64b9cf0fffaf80554d72614f1811b0..ba7a52179e2c495c3bbca1704831022d527bfcd2 100644 (file)
           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:
index 959acae106a684ff92192fd0d5ba4697dd539470..fc3e31d9ba51421bdbf43bd23566bde116dbba43 100644 (file)
     # 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:
index 2880906af1fb5b3b086c76c8923ed4ac8579270e..d5f3ad426030d74fe8aebb9f1b9b56c63a72dfef 100644 (file)
@@ -17,9 +17,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - only:
index eaf4993755297a01b8e6f5c1175fe00f3ec64dfc..11672aeb94c98ff989e993d3ddfd92a751d32989 100644 (file)
@@ -13,9 +13,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     jdk: 'openjdk8'
 
index 980591d75c784e8b9554e2eccff5f227cc18c46b..4621f57cd02052bb210356d0ff68573e052c1362 100644 (file)
     # 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:
index 2e6f70ea99e98e203cc15dc1debcf66cc90b10f9..e47fa75302dc3d0f60675cb867b7143a1dc9399c 100644 (file)
@@ -17,9 +17,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - all:
index b3313cb786eb1be71e2a155719789a3869c48c9b..f5531d4cf984016ce4760c3c389f4a205e6f6464 100644 (file)
@@ -16,9 +16,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - all:
index 0ed748e67f05f2646aab98908c3670d4a0dd94b7..c6751a3f2a84573f793e0a541cfe62b3140bfd3e 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - only:
index 6528e045aa5dea331bc435af8112b05d50e8b445..ce92ead15b56d12681ab033d7ecd2f3fb11b2e7b 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - only:
index 8de3ceab21465ba68150108089b853c1b4368445..5bb582fe04e34a7496baa4d1d25b158f26cc8e21 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - only:
index b9f9c78d3813eebc626d7f7c7209736b6488a4d8..ef0ecc07ca9cd3c0d50f83dd97dffec8d147c418 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - only:
index 0e1dcf30ffa31c1161bed8bed65ae9cf29efd169..b8bd04743bf41a92d34c9e87a001bc30b6bb8853 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - only:
index ee0cd3a58e7a1cabb5aa90c2dea078bc4a4aeebb..4f2aad082810eac1ef1f87a9f0b6e5dce928925e 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - only:
index 2537cca6028f1602e1dbadaf3261c06c26cf7f65..de95463be12b906bca67b1840dce799fe2a1021d 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - all:
index 70b35bf85faf45681da2c0379f4e70586e892ccd..16e29821f4e5b2c5617d385ef4e2a77f9c847684 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - all:
index 61a7e187fa87eba62391032e347e56bb65d03dc1..d78dbdbad03fb989e9594d825b35d3cf3038ccc2 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - all:
index 8daba62ce227f1e056e83524c855981b20eb54cf..89fe12dc156a46e7acd48a819b0be48b28ae9215 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - only:
index 174be29045294e43b3e948928024f0686abeeb64..d9ea876b7d67432257005a2469c1e864d346785b 100644 (file)
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
-          disable-job: 'true'
 
     jdk: 'openjdk8'
 
index 81fa9f84fc8234a9b11379811edcf8760d86e588..2115e9bbe726a97508ab162cca1b4c5ecfe1f2e7 100644 (file)
     # 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:
index 3f7539d55dd16e7b9569ef4e4d857ad4abaca54f..e84f71cc5339c20001ca2ddf742b421fc533f2c4 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - only:
index 4078d6989adb94b4188de092a2dfc508971ee5c2..6eb81685de50f7abb61be8d2db5654b07beb3343 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - only:
index 7fed129bf99b06d018563d17035b0d1d9b7221d9..c62c4b7943f9b301a764c91e2de93cd025eae969 100644 (file)
     # 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:
index 7f96145604411bb481654e20263d6ca6f0f1028f..95df192e1adf077704dee6b86ddd8050dd4f57eb 100644 (file)
         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
     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,
         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
index c9f0688c22af1e2620e369df9a648674ad9a2099..fd9b0d9ee257bd50a0236edd3a8c080d97026ee0 100644 (file)
     # 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:
index fd7a203de36f2887bf5e5ac92e8065caf9e66c57..8fa8dd24eb44ec2c6f15fc669b398fd35410ad8e 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - all:
index 0b9ccc08b0d3ed2752abb8c3439fe43df54890fe..a478078d727abfd146d9dfb37035e71d192bba41 100644 (file)
     # 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:
index 510f268d08334a4e5c76f35278c2835ca360dcec..dcaeb7bfd980ffab5759c7a903419f6560f7fd58 100644 (file)
@@ -12,9 +12,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     project: docs
     project-name: docs
index 56c6069aa2fe0548127f6ac5da95b4cc829a0e81..1c3fe7def58692fac530d84ebfc5faa467e14bcc 100644 (file)
@@ -22,9 +22,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - only:
index d38db902740c7670f43e94c30443fc0695b478f0..716664463ad465ab34f8e84c30b42f7bf4bc92d6 100644 (file)
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
-          disable-job: 'true'
 
     jdk: 'openjdk8'
 
index ff1ec5ce0c2b683d97937401ba572464eddacbdd..2e75ccf3be848a85288942ad47ecf9fa858a427e 100644 (file)
     # 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:
index 591d3c9da4fb1b470162e93653b50ef20a5ffac4..26e52ffb9c3e381cb647981b1f3f1d925c088752 100644 (file)
       - 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:
index edf23ff9f66777cea19c61376d8468741cb67a8c..90e9866ffe689bb04a89dda67e8df7c08cc9575f 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - all:
index 506c090673af37d1789266a70f9fd4ccafc94bdb..c955dbccf8be2feaa9b5c03ecd5bb019e7270ee4 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - all:
index a2b8eaf40cf9ae5aadff548414ec90947b42e269..6202a755beef6cd1d00b2e8ec4abca92b94e93e4 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - all:
index 69c304e50614d36a452656e5d71e4fe4c4ab195f..c80c65d248a34710465cc25aebbfd52877d1923c 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
 
     install:
       - only:
index 3292b54cec1280df8cae9562a5a469ac5e6ce646..36b12ad69b7741a6b4fc2f3b7235d66c8605a304 100644 (file)
     # 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:
index 71010fa2430041b116dc145e5168a6025700008e..e3d869d73abc1eb435859d39d1bdbbaa3c5f0ca5 100644 (file)
     # 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:
index 72fa951ab818aed7e724bb08080de4287342f738..f49c2d6c1cfb1dcb13c7f5cb7770612761fe51f7 100644 (file)
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
-          disable-job: 'true'
 
     jdk: 'openjdk8'
 
index 0dd9a4aef619aa1f6e9121112437f883910ba0bb..c391f02a022f826a6388a51d26fecd32c36a254d 100644 (file)
     # 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 (file)
index a71aae8..0000000
+++ /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,
index f8eaf14f492ccec9aa7400d9a6b5ec4739dacbe9..8bb89d2a9ffafe0006d1c98ea5153c35192c35a7 100644 (file)
@@ -18,8 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
 
     install:
       - all:
index 85ac347ca32ad8e61f6f34983e075ae7132cc1c8..3f7646034f2741660a9a36e5f837b208523d89e6 100644 (file)
               odl-transportpce-ordmodels,
               odl-transportpce-stubmodels
 
-      - oxygen:
-          branch: 'stable/oxygen'
-          karaf-version: karaf4
-          disable-job: 'true'
-
 - project:
     name: distribution-managed
     jobs:
               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:
index be7e06e5d9cfa93f0418ac3591288f839773eaa1..fb2caf47ee1fc44da8d6ad3680057d26f194ae31 100644 (file)
               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
           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
           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'
index f0d77cc85d46a8c7a5c2b1773807fcda0cbe6f63..443dd1807d3fcee6dce4bf14b3237744fa8ccc08 100644 (file)
@@ -21,9 +21,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index 41522921f345e23577fc920fde449627c3e412ee..093115b8048eaddcafb3b44f572c65a49147e438 100644 (file)
     # 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:
index 94afbf13cdcbfd306d25abb8519eb9f291a865f3..a1cde7a89af93015fb7d40f6ab8feffd60dde121 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index c800e5af2d4f1f36958b4b5e0a0a82a0ca319fa0..679a9b30fe959285585675b6c07f0b7982387cc1 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - all:
index 208f5c6918e265771ba838f53495f995414fa1c2..acc6bff9bfba30d8154bf7203f1a09f4e32abbdb 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - all:
index 3f8b2ea246a934a7e91b444ecae0ef721ee5396d..4984e5ee1d2a7e201602316c549eb61ad61726c5 100644 (file)
@@ -17,9 +17,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     feature:
       - all:
index 30f1487e2779165c04256b2e961e8fce2d3194d5..b317c206ed2e9daf427168f53dbb2253b8d28c7d 100644 (file)
     # 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:
index 1902a1f11d8b2eb148f03c9f1d5b59071edf7f8e..edbb8f03f5dcab8cdfb0999616fc2d8cf2f3ea25 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - all:
index 55f008e6ac2a8b9ca0410a047873215987acfd3d..c8b05965bc0bbf1c44584804830d5f725a40f2c4 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index 6febcdaf4909be280c8115cee3a6eb50d18eb2c4..6b6f17fb149e6324948517e98698a0b2e3bb4090 100644 (file)
     # 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:
index c7a3344d21a735435860d8da88895af85df5bd9f..1dc5719ffd46498e6a7172244c6aad24b4d24be5 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index d7ec6f12dc3e63d0ca5d02c9e45d94112afbafdd..c2440770384942e7540e501561eaff54cbabc336 100644 (file)
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
-          disable-job: true
 
     jdk: 'openjdk8'
 
index f34c3b9b7e5ca0104100cab0404938a93a9b7042..4c28ccca2032b3ee0faf93a9fc783dd23ab3caab 100644 (file)
     # 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:
index c13b8502e5ae08033f53e090656367c55e85bef8..ecf7605caea1cb50054faa07ca0f855de4155fc2 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - all:
index 4584f017ca6431d4f4ff179d2b62df03cf24750e..d47144d06fd3c9300080940ee907eb2e6b3a62b2 100644 (file)
     # 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:
index 79fcc3cf7c48b317b498426f2ddc9dd657f172e0..5fd3de7c71ee1a184a5f0ef4d6ef05c1e944cfec 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index 62be81de97baf4fd0d39fab6e8581a9a62cc68a6..c2c36726c814d06cf78e890d1967936d0307a9a7 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index 41145bd74337760e549af5547ad8b2480ebf7d6a..4012b53e367f0d7d591b42c52f8c7d2b151a0ddc 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index e732525416ffd84e84ffba93945e752810bb8c45..756b9b1bc09280c90d54f712a03d51e6376a59ec 100644 (file)
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
-          disable-job: true
 
     feature:
       - core:
index efffbcd54e326c23b5ba54245a5f79990a53846d..6e610acf677cb623643812c38fb9d15fe6f632dd 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index f49c4f5a4fc286392b7ef6234ff667832c4ce006..5b41d7dc62b4620583697d06ec8f7e3baee5f590 100644 (file)
@@ -21,9 +21,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - all:
index 7fb3c583c6edfef9cf9a20971881f79668eceb6f..b5c6843211aae0ef1cd9c3398f2869ae0a22ca10 100644 (file)
     # 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:
index 7e34fe6b3414fc3453551bbf7ca4cd229c2f6f46..cb652a30e9e0c2bc09546715b4a754aea1a4d026 100644 (file)
           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}'
index efc2b804bdf043249a17a9faa59ddfa42dcb671c..7274d996a3d2f3b9274902b4e3b6f5336ed26f58 100644 (file)
@@ -12,9 +12,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     testplan: '{project}-{topology}-openstack.txt'
 
index 56c2f10d44ca8b4cd67f3f007a8d98429262ad1e..22b40f4e03d5921637114e8b4a75b6d7d23c5a70 100644 (file)
           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:
       - 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
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     topology:
       - 1node:
index 0cde5fc5ca9f55d3a4336c30814bd733288eaf03..3e1363ebc3ae1f8b747f5c9396e1bf13ef6d1e58 100644 (file)
@@ -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'
index 1aa204505871cf55708c6d13c67980443aa23398..6065a5abcecb0a2f434839dc0fdb71fa2e8e6bae 100644 (file)
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
-          disable-job: true
 
     jdk: 'openjdk8'
 
index 97877eea5ab070d5469a92a001c8c333219d36fd..967564c311bef9836edc02bcee8bd8fbae5f11ff 100644 (file)
@@ -23,9 +23,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     project: 'netvirt'
     project-name: 'netvirt'
index 68c612ae3674a98e8df56302f322a99e27541074..9b1b75e37f363455e5b93fdc79d83dc03c5f7c1e 100644 (file)
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
-          disable-job: true
 
     jdk: 'openjdk8'
 
index c42101443a58716977972cd087d7fe89a4c1ebaa..23f7620ca81b19c5dea9201f47a2914e425f2e57 100644 (file)
     # 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:
index 9a7fe3fb01ac468406350d9b4175725544b9c272..88c47d85f7a4b09e04b467803ab93f9cfb1c153f 100644 (file)
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
-          disable-job: true
 
     jdk: 'openjdk8'
 
index e18db3f1a38d0a597d50973df06833953e28dc66..c4040d9509e1bb47a2dc1353e1c2e45d44ea6bb3 100644 (file)
     # 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:
index 061eda8374c962b3279e1f318d982045e9681d97..a96aeb92aea9df265f9fd86671116893d4454ad2 100644 (file)
@@ -16,9 +16,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - all:
index d83bf837c0e10718c81cfc04ecf39a5b3bd5091a..b7f322e54310cc41a7416a0ac22351b3d62b0f62 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index 5c3caa2e7e0521e12752644c1cfd5d0856ffc0fb..2d1b48091c1dec966e294242ecae5875dbe9381b 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index 431b246488913756df72301aa209e4ef0f8bc625..8def413783794f1502358cfedeef56d604f44991 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index 9ec743cda0f11cea15ba2fdd44ab68242d812c26..736f080570edfadc2dd2122030ba186a42930465 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index 7a5acaf3f7593ffac6938df6679ef50781d9e39e..7820b795ff83f9233cef95acbd577673c2f4deb4 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - all:
index 7df4298dba227a2be66c157984d915b96e7b2d14..ef3a6ec22ee20804ebdab6af70608e701314c2ca 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index 79df63be04d3f495dcba87fd98c55fe0f99409d6..947a34406738f08006827128b7b1ab92abe3a5da 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index 0c6e97d7b317f83f8c3e318389e20d335b9475f2..566a6b01f8b6848c44bed98aaa8505a1b85f03a7 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index c6a90e064940d8ae3c384805c3123be080617324..c69615b3927c0108b56c0871f4e88916742079c3 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index 9e2efa5d35d3ba12500cc6297e74d81aad0323af..ba7bc2b594ae341e86e0727e8ec4dacc9c5a0561 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index 0a6f65f3a160e8b0e0dc68394933761c3f33207a..be686f303cc602c7b6814606b7b50a3e126a3a9f 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index db0cc1610387864a6cf214911927f8e5a0f03dc5..2eafdfe3b666b9de6eade70f06e96093c3494441 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index 80f63abbf46bb10910fbb15b4161966440b8adfb..f0ce435bc96726d911e110a73c908fcce0145aea 100644 (file)
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
-          disable-job: true
 
     jdk: 'openjdk8'
 
index e18ea7e828162ebc3fd60e1d10191e199a847a49..bdf2513567ee9778e3f903b3ca0dd22cd6eb3817 100644 (file)
     # 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:
     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'
index f920b3d4aa093a20b778b61461d1701f5e86b806..217de21b5ea61059bc40b9f41fbb3d3e26a5b790 100644 (file)
           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'
index 9f621b041dbaf4d46def7d21098d0ea929cced00..ddca4e02dc2cd544cb1f787dbaa6660a087dc924 100644 (file)
           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'
index 4ee50847bdb9007145f475ad860012b661f2e3e1..bade29c759dee212ec927549c5f8006506fa2621 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index 1acd4cb2e54d187a04e22b18b05be3ef0acd9ecc..96d4a5f81f399c2dc71d1fb993db62c0e8f29057 100644 (file)
@@ -20,9 +20,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - all:
index 4bc2181f1ca58c1449c9be8772cf1a86ee32bca9..803116ad7fbc3b0385347d3db9670321544e998e 100644 (file)
@@ -11,9 +11,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
index fb2c5b41751b2936699bc04eef6a90a7e1a6a36d..c80f878beaef4c48543cdeaedc0e9173eafd9177 100644 (file)
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
-          disable-job: true
 
     jdk: 'openjdk8'
 
index a47e7e2d4b42e666e317fea679b6d71b35f565ba..991e030e79d5fd44dc864b3015375eb8b00c7d3f 100644 (file)
     # 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:
index 0f6c51852864bf4a47cc40ba1358850cf0a164ba..cf9c19ca2921fa6e9d52775750539b3de1f8b9f8 100644 (file)
     # 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:
index 7076350381c4057f3a25b5b6b4cc6c462342bb60..57b8de52e7e026975c0e68ec738ace45bb0202c3 100644 (file)
@@ -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
index 5179fcc1660eb486ed8e6172687df26bec7c0846..3752bd0f819e2c1114bab67624483f8cba2fa264 100644 (file)
@@ -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}'
index 0b3673e43ad734108540c960348ca0608bd0934e..197731d337986c2194aa5cb6ff9a25fdfc4abda1 100644 (file)
@@ -27,8 +27,6 @@
     stream:
       - neon
       - fluorine
-      - oxygen:
-          disable-job: 'true'
 
     distro:
       - opensuse-42
index a7faeb446229094923f756f0160c521ab3959b2e..980011d00bccbcc2f5d9675a5b06dc6f1f40029f 100644 (file)
@@ -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
index a5b7e36eebfb57f029776f0f9d5f82e9db1fd612..c8ed2020054067e3f8fdfcb71dcff931bed0fed8 100644 (file)
@@ -21,9 +21,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - all:
index 895f07b599109f1f0711790778ea2350d4aebb7f..fb1e2d6896c5bc7662efedf4aef9c2eab1fd3615 100644 (file)
     # 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:
index d3e1e84382bafebeac54d84ade71c8d34b47f8f7..450cbc2ba226e65d5a978625a4aa49d45ecf46b0 100644 (file)
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
-          disable-job: false
 
     jdk: 'openjdk8'
 
index c28579e5c807b650ebb08c934e12705243934f3d..2a69a930919ce1808dfc7f06baf132a5760eba1c 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     project: 'serviceutils'
     project-name: 'serviceutils'
index 0718a03d980163b25176c951efcce56aca98f07f..bca4fbc0f5a4a24a65872cb0f5a40eeab57ac633 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - all:
index 9f22e8643ddefa2cce4e4e1d074dfef78787a253..9c2a82031709800c9b0cc26ed137cb9066f4e40f 100644 (file)
@@ -19,9 +19,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - all:
index 0ab5eaf658e68bcbb56aa99bc905643c81a4da6c..597bba707c550b4aee7105dd6d143dbed75882b5 100644 (file)
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
-          disable-job: true
 
     feature:
       - basic:
index 16752b0c4651a98a58758f28b5dd0a6d27a50db9..3152dfa38b9122750d8a27ff36f5edc48d6bff59 100644 (file)
@@ -11,9 +11,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     project: 'sfc'
     project-name: 'sfc'
index b160c492eff0ffb579e268b69012537773fb750e..cd9e992288c599f1024d5f6af937aaf9f5c99d27 100644 (file)
     # 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:
index 46ebba15d53282a44c3c21256ecb1a480d62d57e..996ea76c1611d009b9c316aa9b4854f4eecf556b 100644 (file)
     # 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:
index eab54f6977bc302ace8bc3b2d4f3a06c019b2093..9a45a18dd8ef0e9bf5421eb808f69aeb76201093 100644 (file)
     # 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:
index f10ead2a8a329e5c19345684c7eb437e4ae6add1..58a77943568268a15ab1100fddc48191298d93a6 100644 (file)
@@ -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:
index e9a7a7c1f8b8b5d9bd672b9044472ebc100b3347..09ac3079d164bf2dfd37ddfac46dd2000eca4ad3 100644 (file)
@@ -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:
index 754f9b0e719eabdb345264d962ca3e378f3f91d3..ef910c9d6391977310a4b5b10ed9809c0bfda23f 100644 (file)
@@ -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:
index fc876b8bbc1258d2b9d94f2fd6ca785d731787cd..7f970e61eaf1485551d6fc92552c8f42ea761775 100644 (file)
@@ -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:
index d6f1637e521e044f35678084a3dc5d9aa2d35b96..ab4be0034ca7078b6f2854a5a4ba96d1b219eb74 100644 (file)
@@ -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:
index 5f6c3bdddc812ffdf0b22dad06f19526f098af8e..cc55728741389659d656d4c0aaea2fe70508dd24 100644 (file)
     # 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:
index 28af1303937ab72dca7f4697daa82006be6e0c65..0f844d556f98389cb4dd72ef9c781acb5a6196a9 100644 (file)
     # 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:
index 2916a91cabf97e648661daf48d28d61c497dcd68..172e03ab170bf7a322e8eb47ec09c987e9bdc9a6 100644 (file)
@@ -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:
index 2be946c3e409d064b1c137454b6650a44e78d243..29fe32e26291225250ab26122c4106722dc23460 100644 (file)
@@ -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:
index 875cef3010ac939ab504827a866cc66942182d22..96b2b208020c4bc798c8378b9ed22f6e3bf6a512 100644 (file)
@@ -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:
index d4e215410421aee70bb3eeb1186b229958bb207a..7db3bab5bf9a3acf3c877fdc105267fb20f6bf05 100644 (file)
@@ -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:
index 5d6fa15bac8f000283946ca20fd94c03deaaede4..c90043f8c2f0d8815d506f4ec5b20d43fa8d9f82 100644 (file)
     # 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:
index 53cd5aa8dce7b068dfcec6a1123edf2f467f8e36..0b373cc7e46f526a73371a8f58796ab7c0cce5c5 100644 (file)
@@ -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:
index 2675421c0ecc81239f1992681ffa6410f320d322..bdbebca14c2652fe388ce90884286e2c644a03ff 100644 (file)
     # 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:
index 50deb04dc782899953a8cd2ecd9a76d76ed5a9ff..58c2bb48cd25cef4b9f6d5c304fe15544e75640a 100644 (file)
@@ -18,9 +18,6 @@
           branch: 'stable/neon'
       - fluorine:
           branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
 
     install:
       - only:
index 461f03e1945c09b2386dfa79c155800dd4332de1..2491d1630f2786e1cb7fabb964e08abea2fc0d9e 100644 (file)
       - fluorine:
           branch: 'stable/fluorine'
           os-branch: 'queens'
-      - oxygen:
-          branch: 'stable/oxygen'
-          os-branch: 'queens'
-          disable-job: true
 
     jdk: 'openjdk8'