X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-csit-userfeatures.yaml;h=5deaf61e74624a2e9866bc33b2001a1e11717e34;hb=04c3890554166f05b19226e546c86b654bb07bff;hp=e1f68aca986374a95e291afb34acf77977f46a3b;hpb=50b332126badd6367f31de578b299e87c7cd0b8d;p=releng%2Fbuilder.git diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index e1f68aca9..5deaf61e7 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -3,7 +3,6 @@ name: distribution-csit-userfeatures jobs: - '{project}-csit-1node-{functionality}-{install}-{stream}' - - '{project}-csit4-1node-{functionality}-{install}-carbon' # The project name project: 'distribution' @@ -13,9 +12,12 @@ # Project branches stream: - - nitrogen: + - oxygen: branch: 'master' jre: 'openjdk8' + - nitrogen: + branch: 'stable/nitrogen' + jre: 'openjdk8' - carbon: branch: 'stable/carbon' jre: 'openjdk8' @@ -26,12 +28,6 @@ karaf-version: karaf3 install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia' robot-options: '-v USE_NETCONF_CONNECTOR:True' - - beryllium: - branch: 'stable/beryllium' - jre: 'openjdk7' - karaf-version: karaf3 - install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia' - robot-options: '-v USE_NETCONF_CONNECTOR:True' # TODO: Add Beryllium when everything is backported there.