Merge "Remove all Neon jobs"

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index cf2e9b68d16a5a7b824ddc7f92333c607dbb700d..685c0a21632594c235ae73e08b8deda06bb62b3c 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -18,6 +18,7 @@
 
     java-version: 'openjdk11'
     mvn-settings: 'mdsal-settings'
+    build-timeout: 90
 
     archive-artifacts: >
         **/*.prop
@@ -49,6 +50,7 @@
     java-version: 'openjdk11'
     mvn-settings: 'mdsal-settings'
     mvn-opts: '-Xmx2048m'
+    build-timeout: 90
 
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
@@ -81,38 +83,7 @@
 
     mvn-settings: 'mdsal-settings'
     mvn-opts: '-Xmx2048m'
-
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[mdsal] [odlparent] [yangtools]'
-    archive-artifacts: >
-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
-
-    # Used by the release job
-    staging-profile-id: a674173c7b29d
-
-- project:
-    name: mdsal-3.0.x
-    jobs:
-      - '{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
-      - odl-maven-verify-jobs
-
-    project: mdsal
-    project-name: mdsal
-    branch: v3.0.x
-    stream: v3.0.x
-
-    mvn-settings: 'mdsal-settings'
-    mvn-opts: '-Xmx2048m'
+    build-timeout: 90
 
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 08fc9eb9ab9ffed15aee56eab782c6c50613f2b0..aebfaa317a9c6a0a39fba282342f6eac89c3315e 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -101,36 +101,6 @@
     # Used by the release job
     staging-profile-id: 880d5ac25eaa
 
-- project:
-    name: odlparent-4.0.x
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-      - gerrit-tox-verify
-
-    project: odlparent
-    project-name: odlparent
-    stream: 4.0.x
-    branch: 4.0.x
-
-    mvn-settings: odlparent-settings
-    mvn-opts: '-Xmx1024m'
-
-    dependencies: ''
-    email-upstream: '[odlparent]'
-    archive-artifacts: >
-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
-
-    # Used by the release job
-    javadoc-path: org.opendaylight.$PROJECT/$STREAM
-    staging-profile-id: 880d5ac25eaa
-
 - project:
     name: odlparent-sonar
     jobs:

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 122de31adc695f049102187dd2e70cdb0079708e..a0ccafeee58318d991f0cb36f68c2723f14e3f46 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -81,33 +81,6 @@
     # Used by the release job
     staging-profile-id: 1271cf710cc09d
 
-- project:
-    name: yangtools-v2.1.x
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    project: yangtools
-    project-name: yangtools
-    branch: v2.1.x
-    stream: v2.1.x
-
-    mvn-settings: 'yangtools-settings'
-    mvn-opts: '-Xmx1024m'
-
-    dependencies: ''
-    email-upstream: '[yangtools]'
-    archive-artifacts: >
-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
-
-    # Used by the release job
-    staging-profile-id: 1271cf710cc09d
-
 - project:
     name: yangtools-sonar
     jobs: