Merge "Enable Signing and Maven Central"

diff --git a/global-jjb b/global-jjb
index 1a45fc8ab4c2022ce42400b769aaad302baefd8f..c87fbe5ca854c0a882133be67e10ce92fead6464 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 1a45fc8ab4c2022ce42400b769aaad302baefd8f
+Subproject commit c87fbe5ca854c0a882133be67e10ce92fead6464

diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml
deleted file mode 100644 (file)
index 5e6aba7..0000000
--- a/jjb/aaa/aaa-csit-keystone.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- project:
-    name: aaa-csit-keystone
-    jobs:
-      - inttest-csit-1node
-      - inttest-csit-verify-1node
-
-    # The project name
-    project: 'aaa'
-
-    # The functionality under test
-    functionality: 'keystone'
-
-    # Project branches
-    stream:
-      - sodium:
-          branch: 'master'
-      - neon:
-          branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf-all'
-
-    tools_system_count: '1'
-    tools_system_flavor: 'odl-highcpu-2'
-    tools_system_image: 'ZZCI - CentOS 7 - docker - 20180723-235456.035'
-
-    # Robot custom options
-    robot-options: ''

diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml
deleted file mode 100644 (file)
index b856640..0000000
--- a/jjb/aaa/aaa-csit-tls.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- project:
-    name: aaa-csit-tls
-    jobs:
-      - inttest-csit-1node
-
-    # The project name
-    project: 'aaa'
-
-    # The functionality under test
-    functionality: 'tls'
-
-    # Project branches
-    stream:
-      - sodium:
-          branch: 'master'
-      - neon:
-          branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: 'true'
-
-    install:
-      - only:
-          scope: 'only'
-
-    # Features to install
-    install-features: odl-ovsdb-southbound-impl-rest
-
-    # Robot custom options
-    robot-options: ''
-
-    # mininet image
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190201-040143.366

diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml
index d8d32fcba9171647c4cea2ae8eb138bd59164f9e..9ca1ca048b50c5527353c6125edbd8e0169adc3a 100644 (file)
--- a/jjb/alto/alto-csit-setup.yaml
+++ b/jjb/alto/alto-csit-setup.yaml
@@ -10,6 +10,8 @@
     # The functionality under test
     functionality: 'setup'
 
+    disable-job: true
+
     # Project branches
     stream:
       - sodium:

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 8b2a4278d12ed1aadfd4096f32d5617d97638260..8aec1deccb4a0d1401372d43b3d34eae6aad3e20 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -13,6 +13,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 931eabae9693c
@@ -31,6 +32,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 931eabae9693c
@@ -49,6 +51,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 931eabae9693c
@@ -84,6 +87,7 @@
     build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    disable-job: true
 
 - project:
     name: alto-view

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 8c52bfe6d10ef66c5ffc5de76a4b597a1babfe12..164d6eba9137d422db08f0d0f6e035b001adc165 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -17,28 +17,16 @@
       - sodium:
           branch: 'master'
           integration-test: sodium
-          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
-              -Dskip.karaf.featureTest=true
-          java-version: openjdk11
       - neon:
           branch: 'stable/neon'
           integration-test: neon
-          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
-              -Dskip.karaf.featureTest=true
-          java-version: openjdk8
       - fluorine:
           branch: 'stable/fluorine'
           integration-test: fluorine
-          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
-              -Dskip.karaf.featureTest=true
-          java-version: openjdk8
       - oxygen:
           branch: 'stable/oxygen'
           integration-test: oxygen
-          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
-              -Dskip.karaf.featureTest=true
           disable-job: 'true'
-          java-version: openjdk8
 
     project: releng/autorelease
     project-name: autorelease
@@ -53,6 +41,49 @@
         **/target/feature/feature.xml
     staging-profile-id: 425e43800fea70
     # TODO: **/*.hprof is too large, compress with xz first
+    mvn-params: >
+        -Pintegrationtests,repoBuild
+        -P!karaf
+        -Pignore-lispflowmapping-integrationtest
+        -Dcheckstyle.skip=true
+        -Dskip.karaf.featureTest=true
+        -Dsft.heap.max=4g
+    java-version: openjdk8
+
+
+- project:
+    name: autorelease-projects-openjdk11
+    jobs:
+      - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
+          build-node: centos7-autorelease-4c-16g
+
+    stream:
+      - sodium:
+          branch: 'master'
+          integration-test: sodium
+          java-version: openjdk11
+
+    project: releng/autorelease
+    project-name: autorelease
+    build-node: centos7-builder-2c-8g
+    # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/target/failsafe-reports/failsafe-summary.xml
+        **/hs_err_*.log
+        **/target/feature/feature.xml
+    staging-profile-id: 425e43800fea70
+    # TODO: **/*.hprof is too large, compress with xz first
+    mvn-params: >
+        -Pintegrationtests,repoBuild
+        -P!karaf
+        -Pignore-lispflowmapping-integrationtest
+        -Dcheckstyle.skip=true
+        -Dskip.karaf.featureTest=true
+        -Dsft.heap.max=4g
+    java-version: openjdk8
 
 - project:
     name: autorelease-view

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index c4499548591ba33706231afac9da9fa99fe0be10..8e2e41a921ea595ac7bc83aa47eeaa4d7340c667 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -65,7 +65,7 @@
     mvn-global-settings: global-settings
     mvn-goals: clean deploy
     mvn-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-    mvn-params: '-Pintegrationtests,repoBuild -Dcheckstyle.skip=true'
+    mvn-params: ''
     mvn-settings: autorelease-settings
     mvn-version: mvn35
     sign-artifacts: true
@@ -159,9 +159,12 @@
       - lf-sigul-sign-dir:
           sign-artifacts: '{sign-artifacts}'
           sign-dir: '$WORKSPACE/m2repo'
+          sign-mode: serial
       - lf-maven-stage
       - lf-maven-central:
           mvn-central: '{mvn-central}'
+          mvn-global-settings: '{mvn-global-settings}'
+          mvn-settings: '{mvn-settings}'
           ossrh-profile-id: '{ossrh-profile-id}'
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:

diff --git a/jjb/autorelease/update-autorelease-projects-views.sh b/jjb/autorelease/update-autorelease-projects-views.sh
index 8e8cf21471dafaf628033ec144ec431409492074..e34bb6d55b35f1e17ec99ef89f47fc5989d466b5 100755 (executable)
--- a/jjb/autorelease/update-autorelease-projects-views.sh
+++ b/jjb/autorelease/update-autorelease-projects-views.sh
@@ -54,7 +54,7 @@ EOF
 
 for module in "${modules[@]}"; do
     echo "Include project:$module to autorelease view"
-    echo "      - '$module-maven-merge-${STREAM}'" >> "$VIEWS_AR_YAML_FILE"
+    echo "      - '$module-merge-${STREAM}'" >> "$VIEWS_AR_YAML_FILE"
 done
 echo "    <<: *releng_autorelease_view_common_${STREAM}" >> "$VIEWS_AR_YAML_FILE"
 

diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml
index 10aa7156f261a3d969f0b2ddb529d6e111b68db4..715b63cbab64b9cf0fffaf80554d72614f1811b0 100644 (file)
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -7,6 +7,7 @@
 
     # The project name
     project: 'bier'
+    disable-job: true
 
     # The functionality under test
     functionality: 'basic'

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 90b9bdbb6865d7c22b815b88e15c7a9e0cda5a4c..959acae106a684ff92192fd0d5ba4697dd539470 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -14,6 +14,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[bier]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
@@ -33,6 +34,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[bier]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
@@ -52,6 +54,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[bier]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
@@ -88,6 +91,7 @@
     build-node: centos7-builder-2c-8g
     mvn-settings: 'bier-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    disable-job: true
 
 - project:
     name: bier-view

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 737c6e0ab649c96d38a16c9726fad8f5ed179a06..b3313cb786eb1be71e2a155719789a3869c48c9b 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -3,7 +3,6 @@
     name: controller-csit-clustering
     jobs:
       - inttest-csit-3node
-      - inttest-csit-verify-3node
 
     project: 'controller'
     functionality:

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index faae28c67068496bf99f3bdba1bf332b4b9863dd..2537cca6028f1602e1dbadaf3261c06c26cf7f65 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
@@ -32,7 +32,7 @@
         odl-mdsal-benchmark
 
     # Robot custom options
-    robot-options: '--exclude singlenode_setup'
+    robot-options: '--exclude singlenode_setup -v WARMUPS:1 -v RUNS:3'
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index d08be1a915f2a50c94258a060f286f37af500ad4..7f96145604411bb481654e20263d6ca6f0f1028f 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -95,9 +95,9 @@
 
     # Data for csit-verify jobs
     # Branch for "last" version detection
-    verify-branch: stable/oxygen
+    verify-branch: stable/fluorine
     # Value for ODL_STREAM
-    verify-stream: oxygen
+    verify-stream: fluorine
     verify-karaf-version: karaf4
     verify-jdkversion: openjdk8
 

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index f5896cdeab40465146ba3a032366f03c1446c6e7..c9f0688c22af1e2620e369df9a648674ad9a2099 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -12,6 +12,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
@@ -29,6 +30,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
@@ -46,6 +48,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
@@ -78,6 +81,7 @@
     branch: 'master'
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    disable-job: true
 
 - project:
     name: dlux-view

diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml
index 21dd9eae0203dde82251b0ec6a41f37d0011e81f..fd7a203de36f2887bf5e5ac92e8065caf9e66c57 100644 (file)
--- a/jjb/dluxapps/dluxapps-csit-yangman.yaml
+++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml
@@ -7,6 +7,7 @@
 
     # The project name
     project: 'dluxapps'
+    disable-job: true
 
     # The functionality under test
     functionality: 'yangman'

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index da00339d9bd59f9fc84af55aa0c8a9cbc41bb3f3..0b9ccc08b0d3ed2752abb8c3439fe43df54890fe 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -13,6 +13,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
@@ -31,6 +32,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
@@ -49,6 +51,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index a7e0ab08d56b80025f42de905aefa5605e5ae426..56c6069aa2fe0548127f6ac5da95b4cc829a0e81 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -49,8 +49,8 @@
       - fluorine:
           branch: 'master'
 
-    verify-stream: 'oxygen'
-    verify-branch: 'stable/oxygen'
+    verify-stream: 'neon'
+    verify-branch: 'stable/neon'
     verify-karaf-version: 'karaf4'
 
     install:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
index d2483d7a361969c3794479cf3cdb17cc20754254..591d3c9da4fb1b470162e93653b50ef20a5ffac4 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: 'groupbasedpolicy'
+    disable-job: true
 
     topology:
       - 1node:

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index 95bd59403ab77accab5c872ee004871e1a55ed07..edf23ff9f66777cea19c61376d8468741cb67a8c 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: 'groupbasedpolicy'
+    disable-job: true
 
     # The functionality under test
     functionality: '3-node'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index 7a316db82c19bc6de61a4defcf56cc269da94b0f..506c090673af37d1789266a70f9fd4ccafc94bdb 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -7,6 +7,7 @@
 
     # The project name
     project: 'groupbasedpolicy'
+    disable-job: true
 
     # The functionality under test
     functionality: '6node'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index a5207da2d3771a2d68a954594d7a0555d18808bf..a2b8eaf40cf9ae5aadff548414ec90947b42e269 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
@@ -7,6 +7,7 @@
 
     # The project name
     project: 'groupbasedpolicy'
+    disable-job: true
 
     # The functionality under test
     functionality: 'clustering'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
index 232105f16a96ff95a278aebdcaec0e17bd7e17e0..69c304e50614d36a452656e5d71e4fe4c4ab195f 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml
@@ -5,6 +5,7 @@
       - inttest-csit-1node
     # The project name
     project: 'groupbasedpolicy'
+    disable-job: true
 
     # The functionality under test
     functionality: 'sxp'

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 98611514d69f2cc04638be81601820b7d27c8708..3292b54cec1280df8cae9562a5a469ac5e6ce646 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -20,6 +20,7 @@
         sfc-merge-{stream},
         ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
@@ -45,6 +46,7 @@
         sfc-merge-{stream},
         ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
@@ -70,6 +72,7 @@
         sfc-merge-{stream},
         ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
@@ -112,6 +115,7 @@
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    disable-job: true
 
 - project:
     name: groupbasedpolicy-view

diff --git a/jjb/integration/csit-jobs-fluorine.lst b/jjb/integration/csit-jobs-fluorine.lst
index e422a5b08dc84474a97474ac6867b8a6ea7cfe23..37a2200e59e19859eeb63dfe9dbc7a59bd144ad8 100644 (file)
--- a/jjb/integration/csit-jobs-fluorine.lst
+++ b/jjb/integration/csit-jobs-fluorine.lst
@@ -1,5 +1,4 @@
 aaa-csit-1node-authn-all-fluorine,
-aaa-csit-1node-tls-only-fluorine,
 bgpcep-csit-1node-bgp-ingest-all-fluorine,
 bgpcep-csit-1node-bgp-ingest-mixed-all-fluorine,
 bgpcep-csit-1node-throughpcep-all-fluorine,

diff --git a/jjb/integration/csit-jobs-neon.lst b/jjb/integration/csit-jobs-neon.lst
index 9d95f6b5bba6c111291a62b4e2e7008fa669fc34..a003f9afa00b85035534a181bc088dccc0d188ea 100644 (file)
--- a/jjb/integration/csit-jobs-neon.lst
+++ b/jjb/integration/csit-jobs-neon.lst
@@ -1,5 +1,4 @@
 aaa-csit-1node-authn-all-neon,
-aaa-csit-1node-tls-only-neon,
 bgpcep-csit-1node-bgp-ingest-all-neon,
 bgpcep-csit-1node-bgp-ingest-mixed-all-neon,
 bgpcep-csit-1node-throughpcep-all-neon,

diff --git a/jjb/integration/csit-jobs-oxygen.lst b/jjb/integration/csit-jobs-oxygen.lst
index d39a0326ea17effa48bfe17262eed4ac03c45f65..a71aae80d78ce616786008afabb6fb4b36c7d4b7 100644 (file)
--- a/jjb/integration/csit-jobs-oxygen.lst
+++ b/jjb/integration/csit-jobs-oxygen.lst
@@ -1,5 +1,4 @@
 aaa-csit-1node-authn-all-oxygen,
-aaa-csit-1node-tls-only-oxygen,
 alto-csit-1node-setup-all-oxygen,
 bgpcep-csit-1node-bgp-ingest-all-oxygen,
 bgpcep-csit-1node-bgp-ingest-mixed-all-oxygen,

diff --git a/jjb/integration/csit-jobs-sodium.lst b/jjb/integration/csit-jobs-sodium.lst
index c2eafa8545bc7a0c0b7f2d3d574865ac7f2a4b72..7b7e06b8c6ab448766cdf41f7a0a8c059864c647 100644 (file)
--- a/jjb/integration/csit-jobs-sodium.lst
+++ b/jjb/integration/csit-jobs-sodium.lst
@@ -1,5 +1,4 @@
 aaa-csit-1node-authn-all-sodium,
-aaa-csit-1node-tls-only-sodium,
 bgpcep-csit-1node-bgp-ingest-all-sodium,
 bgpcep-csit-1node-bgp-ingest-mixed-all-sodium,
 bgpcep-csit-1node-throughpcep-all-sodium,

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 773ab3f6fb3cff29916cac9259b02a83fb318d05..aadae6ea6536322b7136d84290a0eff09813bc7d 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -35,10 +35,14 @@
           # Self-Managed projects repos and features:
           sm-repos: >
               mvn:org.opendaylight.telemetry/features-telemetry//xml/features
+              mvn:org.opendaylight.transportpce/features-transportpce//xml/features
           sm-features: >
               odl-telemetry-collector,
               odl-telemetry-configurator,
-              odl-telemetry-all
+              odl-telemetry-all,
+              odl-transportpce,
+              odl-transportpce-api,
+              odl-transportpce-ordmodels
       - fluorine:
           branch: 'stable/fluorine'
           karaf-version: odl
@@ -207,7 +211,8 @@
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
-              telemetry-merge-{stream}
+              telemetry-merge-{stream},
+              transportpce-merge-{stream}
       - fluorine:
           branch: 'stable/fluorine'
           karaf-version: odl

diff --git a/jjb/integration/integration-install-robotframework.sh b/jjb/integration/integration-install-robotframework.sh
index 5c5a74e315dc6b974d9f2a7a09008be3442a709d..75e389d977f970af708eda7f4f26bc4d248e9565 100644 (file)
--- a/jjb/integration/integration-install-robotframework.sh
+++ b/jjb/integration/integration-install-robotframework.sh
@@ -45,11 +45,6 @@ pip install --upgrade pyangbind
 # Module for iso8601 datetime format
 pip install --upgrade isodate
 
-# Modules for tornado and jsonpointer used by client libraries of IoTDM project
-# Note: Could be removed when client running on tools VM is used instead
-#       of client libraries only.
-pip install --upgrade tornado jsonpointer
-
 # Module for TemplatedRequests.robot library
 pip install --upgrade jmespath
 

diff --git a/jjb/integration/multipatch-distribution.sh b/jjb/integration/multipatch-distribution.sh
index 682d0e301cc15eef286545a61ed287748ca9889b..9021af0655d6d7016a171ce0a7e7323d8d8bbde2 100755 (executable)
--- a/jjb/integration/multipatch-distribution.sh
+++ b/jjb/integration/multipatch-distribution.sh
@@ -42,9 +42,19 @@ if ${BUILD_FAST}; then
 else
     fast_option=""
 fi
-# check if topic exists, e.g. topic=binding-tlc-rpc
-if [[ "${PATCHES_TO_BUILD}" == *topic* ]]; then
-    TOPIC="${PATCHES_TO_BUILD#*=}"
+# check if topic exists:
+# if topic=binding-rpc, then checkout first patch in binding-rpc topic (if it exists)
+# if topic:binding-rpc, then cherry-pick first patch in binding-rpc topic (if it exists)
+if [[ "${PATCHES_TO_BUILD}" == *"topic"* ]]; then
+    if [[ "${PATCHES_TO_BUILD}" == *"topic="* ]]; then
+        CHERRY_PICK="false"
+        TOPIC="${PATCHES_TO_BUILD#*=}"
+    elif [[ "${PATCHES_TO_BUILD}" == *"topic:"* ]]; then
+        CHERRY_PICK="true"
+        TOPIC="${PATCHES_TO_BUILD#*:}"
+    else
+        echo "ERROR: Topic has wrong format" && exit 1
+    fi
     echo "Create topic ${TOPIC} patch list"
     PATCHES_TO_BUILD=""
     read -ra PROJECT_LIST <<< "${BUILD_ORDER}"
@@ -76,9 +86,16 @@ if [[ "${PATCHES_TO_BUILD}" == *topic* ]]; then
             IFS=$'\n' SORT_REF=$(sort <<<"${REF_LIST[*]}") && unset IFS
             read -rd '' -a SORT_REF_LIST <<< "${SORT_REF[*]}" || true
             # add refspec to patches to build list
+            COUNT=0
             for PATCH in "${SORT_REF_LIST[@]}"; do
-                # cherry-pick is better than checkout patch
-                PATCHES_TO_BUILD="${PATCHES_TO_BUILD}:${PATCH/*-/}"
+                COUNT=$((COUNT+1))
+                if [ "${COUNT}" == "1" ] && [ "${CHERRY_PICK}" == "false" ]; then
+                    # checkout patch
+                    PATCHES_TO_BUILD="${PATCHES_TO_BUILD}=${PATCH/*-/}"
+                else
+                    # cherry-pick is better than checkout patch
+                    PATCHES_TO_BUILD="${PATCHES_TO_BUILD}:${PATCH/*-/}"
+                fi
             done
         fi
     done

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index cce9831792c458147dbc31ab00a8bfa8eb55e1b3..94afbf13cdcbfd306d25abb8519eb9f291a865f3 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: 'l2switch'
+    disable-job: true
 
     # The functionality under test
     functionality: 'host-scalability-daily'

diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
index ce53408f42851e63ff590658e7e8a098f5d759e1..c800e5af2d4f1f36958b4b5e0a0a82a0ca319fa0 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: 'l2switch'
+    disable-job: true
 
     # The functionality under test
     functionality: 'scalability'

diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
index 5b68a71d1853ee7dea72c9218573701c7fff1147..208f5c6918e265771ba838f53495f995414fa1c2 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -7,6 +7,7 @@
 
     # The project name
     project: 'l2switch'
+    disable-job: true
 
     # The functionality under test
     functionality: 'switch'

diff --git a/jjb/l2switch/l2switch-patch-test.yaml b/jjb/l2switch/l2switch-patch-test.yaml
index 4449ca659220163a86c7a88ca180fc76a654f71d..3f8b2ea246a934a7e91b444ecae0ef721ee5396d 100644 (file)
--- a/jjb/l2switch/l2switch-patch-test.yaml
+++ b/jjb/l2switch/l2switch-patch-test.yaml
@@ -6,6 +6,7 @@
 
     # The project name
     project: 'l2switch'
+    disable-job: true
 
     # Project branches
     stream:

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 347e3f23a121d0e30b071dfe6c6b7272c8b8f4b7..30f1487e2779165c04256b2e961e8fce2d3194d5 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -17,6 +17,7 @@
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream}
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fee85953ca0
@@ -39,6 +40,7 @@
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream}
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fee85953ca0
@@ -61,6 +63,7 @@
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream}
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fee85953ca0
@@ -98,6 +101,7 @@
     branch: 'master'
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    disable-job: true
 
 - project:
     name: l2switch-view

diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml
index 2b1a3009cfbd1e181d2aa0040e900a842aae2d61..00e3ff15dc9ea9e38021d58b5b9988dfef046971 100644 (file)
--- a/jjb/lf-infra/lf-infra-jobs.yaml
+++ b/jjb/lf-infra/lf-infra-jobs.yaml
@@ -112,7 +112,18 @@
 - project:
     name: lf-infra-global-jjb
     jobs:
-      - '{project-name}-rtd-jobs'
+      - '{project-name}-rtd-jobs':
+          gerrit_trigger_file_paths:
+            - compare-type: REG_EXP
+              pattern: '.*\.css'
+            - compare-type: REG_EXP
+              pattern: '.*\.html'
+            - compare-type: REG_EXP
+              pattern: '.*\.rst'
+            - compare-type: REG_EXP
+              pattern: '.*\/conf.py'
+            - compare-type: REG_EXP
+              pattern: 'releasenotes/.*'
       - gerrit-tox-verify
 
     project-name: lf-infra-global-jjb

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 8b97b0c4efef4abd76b4143ece4d1ffeb6681a5e..f34c3b9b7e5ca0104100cab0404938a93a9b7042 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -2,7 +2,8 @@
 - project:
     name: mdsal-master
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-maven-javadoc-jobs':
+          disable-job: true
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
@@ -31,6 +32,39 @@
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
+- project:
+    name: mdsal-3.0.x
+    jobs:
+      - '{project-name}-maven-javadoc-jobs':
+          disable-job: true
+      - '{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
+
+    project: mdsal
+    project-name: mdsal
+    branch: v3.0.x
+    stream: v3.0.x
+
+    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-fluorine
     jobs:
@@ -38,6 +72,7 @@
           mvn-version: 'mvn35'
       - '{project-name}-maven-javadoc-jobs':
           mvn-version: 'mvn33'
+          disable-job: true
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal

diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml
index 6ac9518ac46f7bf06362c06d2c3009f440837bed..c13b8502e5ae08033f53e090656367c55e85bef8 100644 (file)
--- a/jjb/nemo/nemo-csit-engine.yaml
+++ b/jjb/nemo/nemo-csit-engine.yaml
@@ -7,6 +7,7 @@
 
     # The project name
     project: 'nemo'
+    disable-job: true
 
     # The functionality under test
     functionality: 'engine'

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index fd541c3846b7d68cd2222865b6be474bd6a116fa..4584f017ca6431d4f4ff179d2b62df03cf24750e 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -12,6 +12,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[nemo]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a67a9890f6202
@@ -29,6 +30,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[nemo]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a67a9890f6202
@@ -46,6 +48,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[nemo]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a67a9890f6202
@@ -78,6 +81,7 @@
     branch: 'master'
     mvn-settings: 'nemo-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    disable-job: true
 
 - project:
     name: nemo-view

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 8dbcaa052d448c0eca0973cd75e5c1be1451fb36..512fe25704b17cb2675eb5492390c42aae9d11a8 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -30,7 +30,7 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-3.1.x
+    name: odlparent-4.0.x
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
@@ -38,8 +38,8 @@
 
     project: odlparent
     project-name: odlparent
-    stream: 3.1.x
-    branch: 3.1.x
+    stream: 4.0.x
+    branch: 4.0.x
     distribution_branch: master
 
     mvn-settings: odlparent-settings
@@ -60,7 +60,7 @@
     staging-profile-id: 880d5ac25eaa
 
 - project:
-    name: odlparent-3.0.x
+    name: odlparent-3.1.x
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
@@ -68,8 +68,8 @@
 
     project: odlparent
     project-name: odlparent
-    stream: 3.0.x
-    branch: 3.0.x
+    stream: 3.1.x
+    branch: 3.1.x
     distribution_branch: master
 
     mvn-settings: odlparent-settings

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 7e896845dbabdc1c14ca5d2b6eb195207465bca2..e18db3f1a38d0a597d50973df06833953e28dc66 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -12,6 +12,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a6880455efe67
@@ -29,6 +30,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a6880455efe67
@@ -46,6 +48,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a6880455efe67
@@ -64,8 +67,8 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
-
     disable-job: true
+
     # Used by the release job
     staging-profile-id: a6880455efe67
 
@@ -78,6 +81,7 @@
     branch: 'master'
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    disable-job: true
 
 - project:
     name: of-config-view

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index 33161840e913f426f6680310a2752815d63a7f9f..d83bf837c0e10718c81cfc04ecf39a5b3bd5091a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -33,7 +33,7 @@
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'
 
     # Robot custom options
-    robot-options: '-v duration_in_secs:60 -v throughput_threshold:20000 -v latency_threshold:2000'
+    robot-options: '-v duration_in_secs:60 -v throughput_threshold:20000 -v latency_threshold:1000'
 
     # Plot Info
     01-plot-title: 'Throughput Mode'

diff --git a/jjb/packaging/test-ansible-deb-custom-config.sh b/jjb/packaging/test-ansible-deb-custom-config.sh
index 64b788e0dea5e7bc5e67f68032c345b8fc898b30..622fac40494a2bfc30d167c40094238619654448 100644 (file)
--- a/jjb/packaging/test-ansible-deb-custom-config.sh
+++ b/jjb/packaging/test-ansible-deb-custom-config.sh
@@ -19,4 +19,4 @@ sudo cp $WORKSPACE/packaging-ansible/library/odl_usermod.py /usr/share/ansible/p
 sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-users.yaml -v
 
 # Test the custom log configurations
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=DEBUG -e test_log_mechanism=console -v
+#sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=DEBUG -e test_log_mechanism=console -v

diff --git a/jjb/packaging/test-ansible-deb-default-config.sh b/jjb/packaging/test-ansible-deb-default-config.sh
index 8fabbb7d667ec86e17522eba192f3622768bdcdf..a0ba51d245bae63067fcf20a819d1ee8a8460aa1 100644 (file)
--- a/jjb/packaging/test-ansible-deb-default-config.sh
+++ b/jjb/packaging/test-ansible-deb-default-config.sh
@@ -19,4 +19,4 @@ sudo cp $WORKSPACE/packaging-ansible/library/odl_usermod.py /usr/share/ansible/p
 sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-users.yaml -v
 
 # Test the custom log configurations
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=INFO -e test_log_mechanism=file -v
+#sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=INFO -e test_log_mechanism=file -v

diff --git a/jjb/packaging/test-ansible-rpm-custom-config.sh b/jjb/packaging/test-ansible-rpm-custom-config.sh
index 36f7c8e5f5bf50d70b8777aa0e8620c5d189a671..a671fffb09bf42ee5e671dd7458febf7972dcfd3 100644 (file)
--- a/jjb/packaging/test-ansible-rpm-custom-config.sh
+++ b/jjb/packaging/test-ansible-rpm-custom-config.sh
@@ -19,4 +19,4 @@ sudo cp $WORKSPACE/packaging-ansible/library/odl_usermod.py /usr/share/ansible/p
 sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-users.yaml -v
 
 # Test the custom log configurations
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=DEBUG -e test_log_mechanism=console -v
+#sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=DEBUG -e test_log_mechanism=console -v

diff --git a/jjb/packaging/test-ansible-rpm-default-config.sh b/jjb/packaging/test-ansible-rpm-default-config.sh
index 8d352a80b3d5e61cc65a306a04bfe28c45184f7f..a0319c48b022cffe6742fb38490ddfc946b91705 100644 (file)
--- a/jjb/packaging/test-ansible-rpm-default-config.sh
+++ b/jjb/packaging/test-ansible-rpm-default-config.sh
@@ -19,4 +19,4 @@ sudo cp $WORKSPACE/packaging-ansible/library/odl_usermod.py /usr/share/ansible/p
 sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-users.yaml -v
 
 # Test the custom log configurations
-sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=INFO -e test_log_mechanism=file -v
+#sudo ansible-playbook -i "localhost," -c local $WORKSPACE/packaging-ansible/tests/test-odl-logs.yaml -e test_log_level=INFO -e test_log_mechanism=file -v

diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml
index b84be440257d8186efd84c3714b596e03c9053d7..a5b7e36eebfb57f029776f0f9d5f82e9db1fd612 100644 (file)
--- a/jjb/packetcable/packetcable-csit-pcmm.yaml
+++ b/jjb/packetcable/packetcable-csit-pcmm.yaml
@@ -11,6 +11,8 @@
     # The functionality under test
     functionality: 'pcmm'
 
+    disable-job: true
+
     # Project branches
     stream:
       - sodium:

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 1fafb5dc539d47fc31dd38374413a9f584ae47bd..895f07b599109f1f0711790778ea2350d4aebb7f 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -12,6 +12,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[packetcable]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a68ca4a24655c
@@ -29,6 +30,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[packetcable]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a68ca4a24655c
@@ -46,6 +48,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[packetcable]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a68ca4a24655c
@@ -78,6 +81,7 @@
     branch: 'master'
     mvn-settings: 'packetcable-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    disable-job: true
 
 - project:
     name: packetcable-view

diff --git a/jjb/releng-views.yaml b/jjb/releng-views.yaml
index 1dd8b35ddbcf11b0937639cf63194d41b70188c4..18e5efb10bb68955cdf71466f9395f1210455d15 100644 (file)
--- a/jjb/releng-views.yaml
+++ b/jjb/releng-views.yaml
@@ -169,24 +169,6 @@
     view-description: 'List of Patch-Test jobs, for prioritizing jobs via the Job Priorities plugin'
     view-regex: '.*-patch-test-.*'
 
-- project:
-    name: Periodic
-    project: Periodic
-    project-name: Periodic
-    view-name: Periodic
-    views:
-      - common-view
-    view-description: 'List of Periodic jobs'
-    view-regex: '[a-zA-Z0-9]+-periodic-[a-zA-Z0-9]+'
-
-- project:
-    name: Release
-    views:
-      - common-view
-    view-name: Release
-    view-description: 'List of Release jobs'
-    view-regex: '.*-release-.*'
-
 - project:
     name: Sanity
     views:

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 20bc4533d1befb9f439972ce7a340f5c43de7d7e..2ef1116850e537ff15633b0a444be52557b92eed 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -2,7 +2,8 @@
 - project:
     name: yangtools-master
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-maven-javadoc-jobs':
+          disable-job: true
       - odl-maven-jobs
 
     project: yangtools
@@ -29,7 +30,8 @@
 - project:
     name: yangtools-v2.1.x
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-maven-javadoc-jobs':
+          disable-job: true
       - odl-maven-jobs
 
     project: yangtools
@@ -56,7 +58,8 @@
 - project:
     name: yangtools-v2.0.x
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-maven-javadoc-jobs':
+          disable-job: true
       - odl-maven-jobs
 
     project: yangtools