Merge "Update global-jjb to the latest v0.55.2"

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 76550aa83fdad803f3eb5c5db1ded7436ee23f6a..d5fca6febd5b0be7de424c0e0c9f45a4feaa0fab 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -62,7 +62,7 @@
     stream:
       - aluminium:
           branch: 'master'
-          csit-blacklist: >
+          csit-blocklist: >
               alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal
               nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
@@ -78,7 +78,7 @@
           csit-weekly-list: '{csit-weekly-list-aluminium}'
       - magnesium:
           branch: 'stable/magnesium'
-          csit-blacklist: >
+          csit-blocklist: >
               alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo
               p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
@@ -94,7 +94,7 @@
           csit-weekly-list: '{csit-weekly-list-magnesium}'
       - sodium:
           branch: 'stable/sodium'
-          csit-blacklist: >
+          csit-blocklist: >
               alto bier dluxapps groupbasedpolicy jsonrpc l2switch mdsal nemo
               p4plugin packetcable sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
@@ -573,9 +573,9 @@
           branch: master  # Hardcode as releng/builder only has master
           lftools-version: '{lftools-version}'
       - string:
-          name: CSIT_BLACKLIST
-          default: '{csit-blacklist}'
-          description: Space separated list of jobs strings to blacklist.
+          name: CSIT_BLOCKLIST
+          default: '{csit-blocklist}'
+          description: Space separated list of jobs strings to blocklist.
 
     scm:
       - lf-infra-gerrit-scm:

diff --git a/jjb/integration/update-csit-tests.sh b/jjb/integration/update-csit-tests.sh
index 92bfe1e45c077b41c026ce807cb65e5dfac4b4a6..8d2c46a6d399bb7279a179117c18ab349f965eb9 100644 (file)
--- a/jjb/integration/update-csit-tests.sh
+++ b/jjb/integration/update-csit-tests.sh
@@ -22,8 +22,8 @@ jobs=($(xmlstarlet sel -t -m '//hudson/job' \
 job_list="${WORKSPACE}/jjb/integration/csit-jobs-${STREAM}.lst"
 rm "$job_list"
 for job in "${jobs[@]}"; do
-    echo "Checking if $job is blacklisted."
-    if [[ ! $job =~ update-csit-tests|${CSIT_BLACKLIST// /\|} ]]; then
+    echo "Checking if $job is blocklisted."
+    if [[ ! $job =~ update-csit-tests|${CSIT_BLOCKLIST// /\|} ]]; then
         echo "${job}," >> "$job_list"
         echo "    Added $job to job list."
     fi

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 002fbb415246ee1c1003b6f5ac2e9ba70597eab7..244360c83a3893537fad44f4a817595d2965d328 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -33,6 +33,38 @@
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
+- project:
+    name: mdsal-6.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-jdk11
+      - odl-maven-verify-jobs
+
+    project: mdsal
+    project-name: mdsal
+    branch: 6.0.x
+    stream: 6.0.x
+
+    java-version: 'openjdk11'
+    mvn-settings: 'mdsal-settings'
+    mvn-version: mvn36
+    build-timeout: 90
+
+    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-5.0.x
     jobs:

diff --git a/jjb/odlguice/odlguice.yaml b/jjb/odlguice/odlguice.yaml
index 003456ac7aa79794278bd1d1b39e5d411badf9ee..795a2ee10dd50cd1e47fca11be37916884e41f41 100644 (file)
--- a/jjb/odlguice/odlguice.yaml
+++ b/jjb/odlguice/odlguice.yaml
@@ -2,8 +2,6 @@
 - project:
     name: odlguice-aluminium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
       - gerrit-release-merge
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
@@ -17,12 +15,7 @@
     java-version: 'openjdk11'
     mvn-settings: 'odlguice-settings'
     mvn-opts: '-Xmx2048m'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        mdsal-merge-{stream}
-    email-upstream: '[kernel-dev] [app-dev]'
+    email-upstream: '[app-dev]'
 
     # Used by the release job
     staging-profile-id: 44ce7d1aad49e

diff --git a/jjb/odlmicro/odlmicro.yaml b/jjb/odlmicro/odlmicro.yaml
index fca18b02f4b12c610cfc37ecb3cfb11e99e983c6..e5ed8ba2f83d16444b2300d8e11a06547afc1485 100644 (file)
--- a/jjb/odlmicro/odlmicro.yaml
+++ b/jjb/odlmicro/odlmicro.yaml
@@ -3,7 +3,8 @@
     name: odlmicro
     jobs:
       - gerrit-release-merge
-      - gerrit-tox-verify
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
     stream:
       - aluminium:

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index da81f9e39e3dce47720c203b50bd83186e927415..37f06d56900a50cd66876fe02908a13084e85cdb 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -28,6 +28,7 @@
           scope: 'only'
 
     # Job images
+    odl_system_flavor: 'odl-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881'
 
     # Features to install

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index a5ab4b127399716dea1e287a9f90675c305775db..b2a332e6181d5d001b30a8780e9c140a5ab38e2a 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -33,7 +33,7 @@
     build-node: centos7-builder-2c-2g
     archive-artifacts: '**/*.log'
     build-timeout: 30
-    jjb-version: 2.9.1
+    jjb-version: 3.5.0
 
 - project:
     name: builder-openstack

diff --git a/tox.ini b/tox.ini
index 9cea7543a286f3c533fd6067f7792cc83116dbd3..bf47e3e0e3f52880c82deef646e48781f9de6af3 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -20,7 +20,7 @@ commands = sphinx-build -b html -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs
 
 [testenv:jenkins-jobs]
 deps =
-    jenkins-job-builder=={env:JJB_VERSION:2.9.1}
+    jenkins-job-builder=={env:JJB_VERSION:3.5.0}
 commands =
     jenkins-jobs {posargs:--help}