Merge "add support for JVM monitoring"

diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml
new file mode 100644 (file)
index 0000000..68de249
--- /dev/null
+++ b/jjb/coretutorials/coretutorials.yaml
@@ -0,0 +1,37 @@
+---
+- project:
+    name: coretutorials-neon
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: neon
+    project: 'coretutorials'
+    project-name: 'coretutorials'
+    branch: 'master'
+    mvn-settings: 'coretutorials-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: ''
+    email-upstream: '[coretutorials]'
+    build-timeout: 120
+
+    # Used by the release job
+    staging-profile-id: 96cd299563ec6
+
+- project:
+    name: coretutorials-sonar
+    jobs:
+      - gerrit-maven-sonar
+
+    project: 'coretutorials'
+    project-name: 'coretutorials'
+    branch: master
+    mvn-settings: 'coretutorials-settings'
+    mvn-opts: '-Xmx1024m'
+    build-timeout: 120
+
+- project:
+    name: coretutorials-view
+    views:
+      - project-view
+    project-name: coretutorials

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index bff3a9846f8508161f52c69b94b460b86eb03788..d739dbb8a9a71985a994f9a90a8be13b312133ae 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -123,6 +123,10 @@
     # Python
     toxdir: ''
 
+    # Sonarcloud config
+    sonarcloud_api_token: 9bc1618a11c4bbe474ac542af84f655c545627c1
+    sonarcloud_project_organization: opendaylight
+
     # Plot configuration
     01-plot-title: ''
     01-plot-yaxis: ''

diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
index c33a9b0506023ad10596bfc767e6334c27ee642b..143b830fefe258430e3d768e9124f06c2123a302 100644 (file)
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -976,11 +976,9 @@ function copy_and_run_post_startup_script() {
     done
 }
 
-function create_controller_variables() {
-    echo "Generating controller variables..."
+function dump_controller_threads() {
     for i in $(seq 1 "${NUM_ODL_SYSTEM}"); do
         CONTROLLERIP="ODL_SYSTEM_${i}_IP"
-        odl_variables=${odl_variables}" -v ${CONTROLLERIP}:${!CONTROLLERIP}"
         echo "Lets's take the karaf thread dump"
         ssh "${!CONTROLLERIP}" "sudo ps aux" > "${WORKSPACE}"/ps_before.log
         pid=$(grep org.apache.karaf.main.Main "${WORKSPACE}"/ps_before.log | grep -v grep | tr -s ' ' | cut -f2 -d' ')

diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh
index 55dd103973ee5825e52ab7353cb28babfd8f05da..e04cfd7bddb100c014704f8941e6d691c5271942 100755 (executable)
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -34,7 +34,7 @@ copy_and_run_startup_script
 
 copy_and_run_post_startup_script
 
-create_controller_variables
+dump_controller_threads
 
 if [ "${NUM_OPENSTACK_SYSTEM}" -gt 0 ]; then
    echo "Exiting without running tests to deploy openstack for testing"
@@ -80,13 +80,7 @@ robot -N "${TESTPLAN}" \
       -v ODL_SYSTEM_IP:"${ODL_SYSTEM_IP}" \
       -v ODL_SYSTEM_USER:"${USER}" \
       -v SUITES:"${SUITES}" \
-      -v TOOLS_SYSTEM_1_IP:"${TOOLS_SYSTEM_IP}" \
-      -v TOOLS_SYSTEM_2_IP:"${TOOLS_SYSTEM_2_IP}" \
-      -v TOOLS_SYSTEM_3_IP:"${TOOLS_SYSTEM_3_IP}" \
-      -v TOOLS_SYSTEM_4_IP:"${TOOLS_SYSTEM_4_IP}" \
-      -v TOOLS_SYSTEM_5_IP:"${TOOLS_SYSTEM_5_IP}" \
-      -v TOOLS_SYSTEM_6_IP:"${TOOLS_SYSTEM_6_IP}" \
-      -v TOOLS_SYSTEM_IP:"${TOOLS_SYSTEM_IP}" \
+      -v TOOLS_SYSTEM_IP:"${TOOLS_SYSTEM_IP}" ${tools_variables} \
       -v TOOLS_SYSTEM_USER:"${USER}" \
       -v USER_HOME:"${HOME}" \
       -v WORKSPACE:/tmp \

diff --git a/jjb/integration/integration-start-cluster-run-test.sh b/jjb/integration/integration-start-cluster-run-test.sh
index 16c1eb9710448d1d46d9da09a6643d12aa0a246f..368e151bfed5e74d3b4cf9f34d401d029ed8504e 100644 (file)
--- a/jjb/integration/integration-start-cluster-run-test.sh
+++ b/jjb/integration/integration-start-cluster-run-test.sh
@@ -13,92 +13,22 @@ echo "#################################################"
 echo "##         Verify Cluster is UP                ##"
 echo "#################################################"
 
-cat > "${WORKSPACE}/verify-cluster-is-up.sh" <<EOF
-
-CONTROLLERID="member-\$1"
-ODL_SYSTEM_IP_PATH=\$2
-
-echo "Waiting for controller to come up..."
-COUNT="0"
-while true; do
-    RESP="\$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null )"
-    echo \$RESP
-    SHARD="\$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/jolokia/read/org.opendaylight.controller:Category=Shards,name=\$CONTROLLERID-shard-inventory-config,type=DistributedConfigDatastore)"
-    echo \$SHARD
-    if ([[ \$RESP == *"200"* ]] && [[ \$SHARD  == *'"status":200'* ]]); then
-        echo Controller is UP
-        break
-    elif (( "\$COUNT" > "600" )); then
-        echo Timeout Controller DOWN
-        echo "Dumping first 500K bytes of karaf log..."
-        head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
-        echo "Dumping last 500K bytes of karaf log..."
-        tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
-        echo "Listing all open ports on controller system"
-        netstat -pnatu
-        exit 1
-    else
-        COUNT=\$(( \${COUNT} + 1 ))
-        sleep 1
-        if [[ \$((\$COUNT % 5)) == 0 ]]; then
-            echo already waited \${COUNT} seconds...
-        fi
-    fi
-done
-
-echo "Listing all open ports on controller system.."
-netstat -pnatu
+create_post_startup_script
 
-function exit_on_log_file_message {
-    echo "looking for \"\$1\" in log file"
-    if grep --quiet "\$1" "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"; then
-        echo ABORTING: found "\$1"
-        echo "Dumping first 500K bytes of karaf log..."
-        head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
-        echo "Dumping last 500K bytes of karaf log..."
-        tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
-        exit 1
-    fi
-}
+copy_and_run_post_startup_script
 
-exit_on_log_file_message 'BindException: Address already in use'
-exit_on_log_file_message 'server is unhealthy'
-
-EOF
-
-for i in $(seq 1 "${NUM_ODL_SYSTEM}")
-do
-    CONTROLLERIP=ODL_SYSTEM_${i}_IP
-    echo "Verifying member-${i} with IP address ${!CONTROLLERIP} is UP"
-    scp "${WORKSPACE}/verify-cluster-is-up.sh" "${!CONTROLLERIP}:/tmp"
-    # shellcheck disable=SC2029
-    ssh "${!CONTROLLERIP}" "bash /tmp/verify-cluster-is-up.sh ${i} ${!CONTROLLERIP}"
-done
+dump_controller_threads
 
 if [ "${NUM_OPENSTACK_SYSTEM}" -gt 0 ]; then
    echo "Exiting without running tests to deploy openstack for testing"
    exit
 fi
 
-if [ "${CONTROLLERSCOPE}" == 'all' ]; then
-    COOLDOWN_PERIOD="180"
-else
-    COOLDOWN_PERIOD="60"
-fi
-echo "Cool down for ${COOLDOWN_PERIOD} seconds :)..."
-sleep "${COOLDOWN_PERIOD}"
-
 echo "Generating controller variables..."
 for i in $(seq 1 "${NUM_ODL_SYSTEM}")
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
     odl_variables=${odl_variables}" -v ${CONTROLLERIP}:${!CONTROLLERIP}"
-    echo "Lets's take the karaf thread dump"
-    ssh "${!CONTROLLERIP}" "sudo ps aux" > "${WORKSPACE}/ps_before.log"
-    pid=$(grep org.apache.karaf.main.Main "${WORKSPACE}/ps_before.log" | grep -v grep | tr -s ' ' | cut -f2 -d' ')
-    echo "karaf main: org.apache.karaf.main.Main, pid:${pid}"
-    # shellcheck disable=SC2029
-    ssh "${!CONTROLLERIP}" "${JAVA_HOME}/bin/jstack -l ${pid}" > "${WORKSPACE}/karaf_${i}_${pid}_threads_before.log" || true
 done
 
 echo "Generating mininet variables..."

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 30d5c9916e375b42df300cfb91994dab5de54b31..c91bf39afdc7fcf473f2b6e877e499c40b4da638 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -578,7 +578,6 @@
     job-name:
       - aaa-csit-1node-authn-all-neon
       - bgpcep-csit-1node-throughpcep-all-neon
-      - coe-csit-1node-container-networking-only-neon
       - controller-csit-1node-akka1-all-neon
       - controller-csit-1node-benchmark-all-neon
       - controller-csit-1node-notifications-longevity-only-neon

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index fd1d902c874f9c3971f080a031dd7f6b7e43497b..5a339fb0627ffe7309b9b9b2071e1b4a4defef87 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -8,12 +8,13 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
           rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d
       - gerrit-release-merge
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
     stream: magnesium
+    java-version: 'openjdk11'
     branch: 'master'
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m'

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index f5bc6fe6eec35d42e142a5d5ec3e47488a2e5895..e141afbc2c1a344d53f28104e239a8b9ed86db0f 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -42,9 +42,6 @@
       - tdd-wip:
           csit-list: >
               netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tdd-wip-{stream}
-      - coe:
-          csit-list: >
-              coe-csit-1node-gate-container-networking-only-{stream}
       - itm-direct-tunnels:
           csit-list: >
               netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-itm-direct-tunnels-{stream}

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index b0f64babd60ed842b3d1a562b9f5a27eb871e17a..e685258d6e782cb60ffb6db5164a43d603a8b3ad 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -96,36 +96,6 @@
     javadoc-path: org.opendaylight.$PROJECT/$STREAM
     staging-profile-id: 880d5ac25eaa
 
-- project:
-    name: odlparent-3.1.x
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-      - gerrit-tox-verify
-
-    project: odlparent
-    project-name: odlparent
-    stream: 3.1.x
-    branch: 3.1.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/plastic/plastic.yaml b/jjb/plastic/plastic.yaml
new file mode 100644 (file)
index 0000000..77586be
--- /dev/null
+++ b/jjb/plastic/plastic.yaml
@@ -0,0 +1,40 @@
+---
+- project:
+    name: plastic-master
+    jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: plastic
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-plastic/102307/
+          rtd-token: 963a1745b909ae6a1eae01f814c4983d17fdd44c
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: master
+    project: plastic
+    project-name: plastic
+    branch: master
+    java-version: openjdk8
+    mvn-settings: plastic-settings
+    mvn-opts: '-Xmx1024m'
+
+    # Used by the release job
+    staging-profile-id: 380d129f253e1
+
+- project:
+    name: plastic-sonar
+    jobs:
+      - gerrit-maven-sonar
+
+    project: plastic
+    project-name: plastic
+    branch: master
+    java-version: openjdk8
+    mvn-settings: plastic-settings
+    mvn-opts: '-Xmx1024m'
+
+- project:
+    name: plastic-view
+    views:
+      - project-view
+    project-name: plastic

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 37a2f3336b8ccac5fcfb1ad22f95cb0298ee9a15..5facaeae0629119a1f81524438950a0b0abd54bb 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.0.x
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    project: yangtools
-    project-name: yangtools
-    branch: v2.0.x
-    stream: v2.0.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: