X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Flispflowmapping%2Flispflowmapping.yaml;h=6b6f17fb149e6324948517e98698a0b2e3bb4090;hb=923224801df212827c0f80f670904370f0a346bf;hp=337fd5546d9af4f94ec91e9ac44ad6b00f97e1a0;hpb=a922381d030c5d57647f3412f77aee4c8479d458;p=releng%2Fbuilder.git

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 337fd5546..6b6f17fb1 100644
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -9,11 +9,11 @@
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
-      - odl-maven-jobs
+      - odl-maven-jobs:
+          java-version:
+            - openjdk8
+            - openjdk11
 
-    java-version:
-      - openjdk8
-      - openjdk11
     stream: sodium
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
@@ -42,11 +42,11 @@
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
-      - odl-maven-jobs
+      - odl-maven-jobs:
+          java-version:
+            - openjdk8
+            - openjdk11
 
-    java-version:
-      - openjdk8
-      - openjdk11
     stream: neon
     project: 'lispflowmapping'
     project-name: 'lispflowmapping'
@@ -95,31 +95,6 @@
     # Used by the release job
     staging-profile-id: 96fff2503b766
 
-- project:
-    name: lispflowmapping-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'lispflowmapping'
-    project-name: 'lispflowmapping'
-    branch: 'stable/oxygen'
-    mvn-settings: 'lispflowmapping-settings'
-    mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
-    dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
-    email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
-    archive-artifacts: >
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-
-    build-node: centos7-builder-8c-8g
-    disable-job: true
-    # Used by the release job
-    staging-profile-id: 96fff2503b766
-
 - project:
     name: lispflowmapping-sonar
     jobs: