Merge "Revert "Use javadoc:aggragate-no-fork in OFP jobs""

diff --git a/jjb/integration/distribution/distribution-check-bootup.sh b/jjb/integration/distribution/distribution-check-bootup.sh
index f6d57342e2ae0af49b138b47a83b3e286deee844..84ea9ea6e10378054a6f192971763b0ddc3bb617 100644 (file)
--- a/jjb/integration/distribution/distribution-check-bootup.sh
+++ b/jjb/integration/distribution/distribution-check-bootup.sh
@@ -64,7 +64,7 @@ netstat -pnatu
 
 if [ "$JDKVERSION" == 'openjdk11' ]; then
     echo "Preparing for JRE Version 11"
-    JAVA_HOME="/opt/jdk-11"
+    JAVA_HOME="/usr/lib/jvm/java-11-openjdk"
 elif [ "${JDKVERSION}" == 'openjdk8' ]; then
     echo "Setting the JRE Version to 8"
     # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start.

diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
index 3e8ada5dc668f0cd815a3dcd6d3356ebffceee70..dc4f1bbd722f4ccd14dff787c64ef949330ab07b 100644 (file)
--- a/jjb/lf-infra/lf-infra-jobs.yaml
+++ b/jjb/lf-infra/lf-infra-jobs.yaml
@@ -10,7 +10,7 @@
     build-timeout: 60
     stream: any
     branch: '*'
-    python-version: python2
+    python-version: python3
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index e685258d6e782cb60ffb6db5164a43d603a8b3ad..08fc9eb9ab9ffed15aee56eab782c6c50613f2b0 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -18,6 +18,41 @@
     stream: master
     branch: master
 
+    java-version: 'openjdk11'
+    mvn-settings: odlparent-settings
+    mvn-version: mvn36
+
+    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
+    staging-profile-id: 880d5ac25eaa
+
+- project:
+    name: odlparent-6.0.x
+    jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: odlparent
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-odlparent/50830/
+          rtd-token: e5afd4ac1ead64408d9e13cd1f628ade55512f8f
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+      - gerrit-tox-verify
+
+    project: odlparent
+    project-name: odlparent
+    stream: 6.0.x
+    branch: 6.0.x
+
     java-version: 'openjdk11'
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index a2bfdcbe30af502f11939ddf083f48be458f4563..46f8b7b30fcae0866edd22f28e27539c5bb3670a 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -11,13 +11,14 @@
           build-timeout: 120
           build-node: centos7-builder-8c-8g
       - gerrit-release-merge
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
     stream: magnesium
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'