Merge "Fix autorelease staging job"
authorThanh Ha <thanh.ha@linuxfoundation.org>
Wed, 12 Oct 2016 02:04:53 +0000 (02:04 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 12 Oct 2016 02:04:53 +0000 (02:04 +0000)
51 files changed:
jjb/autorelease/autorelease-templates.yaml
jjb/integration/include-raw-integration-configure-clustering.sh
jjb/integration/include-raw-integration-deploy-controller-offline.sh
jjb/integration/include-raw-integration-deploy-controller-run-test.sh
jjb/integration/include-raw-integration-deploy-controller-verify.sh
jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
jjb/integration/include-raw-integration-distribution-check.sh
jjb/integration/include-raw-integration-install-robotframework.sh
jjb/integration/include-raw-integration-start-cluster-run-test.sh
jjb/integration/integration-macros.yaml
jjb/netconf/netconf-scale.yaml
jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml
jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-clustering-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-clustering-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-config-performance-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-flow-services-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-scalability-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-helium-redesign.yaml [deleted file]
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign-old.yaml [deleted file]
jjb/opflex/include-raw-openvswitch_tgz-build.sh
jjb/opflex/include-raw-opflex-dep_rpm-build.sh [deleted file]
jjb/opflex/include-raw-ovs_rpm-build.sh [deleted file]
jjb/opflex/include-raw-rapidjson_tgz-build.sh
jjb/opflex/opflex-dependencies-rpm.yaml [deleted file]
jjb/opflex/opflex-dependencies.yaml
jjb/releng-templates-java.yaml

index 00c93f3332d9f3c156fcbbdfd5daad8465c739ce..d8245517491f8f98e49b484ea4599f51d5445c66 100644 (file)
             cp *.log *.prop $_
 
     publishers:
-    - email-notification:
-        email-prefix: '[autorelease]'
-    - trigger-parameterized-builds:
-        - project: 'integration-distribution-test-{integration-test}'
-          condition: UNSTABLE_OR_BETTER
-          property-file: variables.prop
-          fail-on-missing: true
-    - opendaylight-infra-shiplogs:
-        maven-version: '{mvn33}'
+        - email-notification:
+            email-prefix: '[autorelease]'
+        - trigger-parameterized-builds:
+            - project: 'integration-distribution-test-{integration-test}'
+              condition: UNSTABLE_OR_BETTER
+              property-file: variables.prop
+              fail-on-missing: true
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'
 
 - job-template:
     name: 'autorelease-project-report-{stream}'
         - autorelease-sys-stats
 
     publishers:
-    - email-ext:
-        attachments: 'project-reports/*.log'
-        recipients: 'skitt@redhat.com thanh.ha@linuxfoundation.org'
-        reply-to: dev@lists.opendaylight.org
-        content-type: default
-        subject: '[releng] ODL {stream} project report for ${{ENV, var="DATE"}}'
-        body: |
-            This is a project report generated on $DATE listing the commit
-            history of ODL projects for the past week. See attached
-            git-report.log
-
-            Archive also available on Jenkins at $BUILD_URL
-        always: true
-    - opendaylight-infra-shiplogs:
-        maven-version: '{mvn33}'
+        - email-ext:
+            attachments: 'project-reports/*.log'
+            recipients: 'skitt@redhat.com thanh.ha@linuxfoundation.org'
+            reply-to: dev@lists.opendaylight.org
+            content-type: default
+            subject: '[releng] ODL {stream} project report for ${{ENV, var="DATE"}}'
+            body: |
+                This is a project report generated on $DATE listing the commit
+                history of ODL projects for the past week. See attached
+                git-report.log
+                Archive also available on Jenkins at $BUILD_URL
+            always: true
+        - opendaylight-infra-shiplogs:
+            maven-version: '{mvn33}'
index 657ee718f30976be25afd427a893c8ba26e47c3c..d11a9e4740a045c16fe4167ed4842059c20f8c53 100644 (file)
@@ -131,6 +131,9 @@ EOF
 # Create the startup script to be run on controllers.
 cat > ${WORKSPACE}/startup-script.sh <<EOF
 
+echo "Redirecting karaf console output to karaf_console.log"
+export KARAF_REDIRECT="/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log"
+
 echo "Starting controller..."
 /tmp/${BUNDLEFOLDER}/bin/start
 
index e5f7fa9d71a9572ef7c97cdc0cbf58d8a09a6dcf..bc525171f46ffeafdce86692d40a613eec67ccf6 100644 (file)
@@ -51,6 +51,9 @@ readlink -e "${JAVA_HOME}/bin/java"
 echo "Default JDK Version, JAVA_HOME should override"
 java -version
 
+echo "Redirecting karaf console output to karaf_console.log"
+export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
+
 echo "Starting controller..."
 ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
 
@@ -65,7 +68,9 @@ ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
 sleep 5
 
 echo "Fetching Karaf logs"
+# TODO: Move instead of copy? Gzip?
 cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
+cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
 
 echo "Exit with error"
 if [ -f ${WORKSPACE}/error.txt ]; then
index 53dbb002d7b1fe370e05809ca01046410d9e4c43..0b48b807becd1d4fb7e97c36ba59ea3385d60d46 100644 (file)
@@ -85,6 +85,9 @@ EOF
 # Create the startup script to be run on controller.
 cat > ${WORKSPACE}/startup-script.sh <<EOF
 
+echo "Redirecting karaf console output to karaf_console.log"
+export KARAF_REDIRECT="/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log"
+
 echo "Starting controller..."
 /tmp/${BUNDLEFOLDER}/bin/start
 
@@ -162,7 +165,7 @@ fi
 
 echo "Lets's take the karaf thread dump"
 KARAF_PID=$(ssh ${ODL_SYSTEM_IP} "ps aux | grep 'distribution-karaf' | grep -v grep | tr -s ' ' | cut -f2 -d' '")
-ssh ${ODL_SYSTEM_IP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_threads_before.log
+ssh ${ODL_SYSTEM_IP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_threads_before.log || true
 
 echo "Locating test plan to use..."
 testplan_filepath="${WORKSPACE}/test/csit/testplans/${STREAMTESTPLAN}"
@@ -190,13 +193,18 @@ pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v W
 
 echo "Lets's take the karaf thread dump again"
 KARAF_PID=$(ssh ${ODL_SYSTEM_IP} "ps aux | grep 'distribution-karaf' | grep -v grep | tr -s ' ' | cut -f2 -d' '")
-ssh ${ODL_SYSTEM_IP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_threads_after.log
+ssh ${ODL_SYSTEM_IP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_threads_after.log || true
 
-echo "Killing ODL and fetching Karaf log..."
+echo "Killing ODL"
 set +e  # We do not want to create red dot just because something went wrong while fetching logs.
 ssh "${ODL_SYSTEM_IP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
 sleep 5
-scp "${ODL_SYSTEM_IP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log" .
+echo "Compressing karaf.log"
+ssh ${ODL_SYSTEM_IP} gzip --best "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+echo "Fetching compressed karaf.log"
+scp "${ODL_SYSTEM_IP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log.gz" .
+# TODO: Should we compress the output log file as well?
+scp "${ODL_SYSTEM_IP}:/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log" .
 true  # perhaps Jenkins is testing last exit code
 
 # vim: ts=4 sw=4 sts=4 et ft=sh :
index 03f02ddb51bb104dd54f72b6334f68ae76b46c5c..f2ab9051bf7ef85e4da3ba46fe76dcdda35aebf9 100644 (file)
@@ -50,6 +50,9 @@ readlink -e "${JAVA_HOME}/bin/java"
 echo "Default JDK Version, JAVA_HOME should override"
 java -version
 
+echo "Redirecting karaf console output to karaf_console.log"
+export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
+
 echo "Starting controller..."
 ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
 
@@ -115,6 +118,7 @@ exit_on_log_file_message 'BindException: Address already in use'
 exit_on_log_file_message 'server is unhealthy'
 
 echo "Fetching Karaf logs"
+# TODO: Move instead of copy? Gzip?
 cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
 cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
 
index 6d37b0b7bd46b1df7564a1c22ab8a48a358ec62d..ea00cfc4e8a8aceea48c5f82523d12c8ee2a646f 100644 (file)
@@ -282,6 +282,7 @@ do
 done
 
 sleep 5
+# FIXME: Do not create .tar and gzip before copying.
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
index 0b079ff1c8ece1cbfd2f428af34b7816fe3a1f31..82c50b07b32f70358ecd845ae3a2ae96c1dd3c23 100644 (file)
@@ -54,6 +54,9 @@ readlink -e "${JAVA_HOME}/bin/java"
 echo "JDK Version should be overriden by JAVA_HOME"
 java -version
 
+echo "Redirecting karaf console output to karaf_console.log"
+export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
+
 echo "Starting controller..."
 ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
 
@@ -119,6 +122,7 @@ exit_on_log_file_message 'BindException: Address already in use'
 exit_on_log_file_message 'server is unhealthy'
 
 echo "Fetching Karaf logs"
+# TODO: Move instead of copy? Gzip?
 cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
 cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
 
index 11739f8068be52f2eed0db3dafe73d417d04fc2f..1566f03981d870743048d220029a473794607ce0 100644 (file)
@@ -25,7 +25,8 @@ set -exu
 pip install --upgrade pip
 
 pip install --upgrade docker-py importlib requests scapy netifaces netaddr ipaddr
-pip install --upgrade robotframework{,-{httplibrary,requests,sshlibrary,selenium2library}}
+pip install --upgrade robotframework{,-{httplibrary,requests,selenium2library}}
+pip install --upgrade robotframework-sshlibrary pycparser==2.13  # TODO: Unfreeze when cryptography stops failing on pycparser-2.14-py2.py3-none-any.whl
 
 # Module jsonpath is needed by current AAA idmlite suite.
 pip install --upgrade jsonpath-rw
@@ -34,7 +35,7 @@ pip install --upgrade jsonpath-rw
 pip install elasticsearch==1.7.0 elasticsearch-dsl==0.0.11
 
 # Module for pyangbind used by lispflowmapping project
-pip install pyangbind==0.5.6
+pip install pyangbind
 
 # Print installed versions.
 pip freeze
index 2e39579ad916d6c1f9c034f9f1f1465ce9252ba4..bbcd8dea909aec03fe2c76f39ff0d29b803c6bb3 100644 (file)
@@ -87,7 +87,7 @@ do
     odl_variables=${odl_variables}" -v ${CONTROLLERIP}:${!CONTROLLERIP}"
     echo "Lets's take the karaf thread dump"
     KARAF_PID=$(ssh ${!CONTROLLERIP} "ps aux | grep 'distribution-karaf' | grep -v grep | tr -s ' ' | cut -f2 -d' '")
-    ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_before.log
+    ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_before.log || true
 done
 
 echo "Generating mininet variables..."
@@ -126,7 +126,7 @@ do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
     echo "Lets's take the karaf thread dump again"
     KARAF_PID=$(ssh ${!CONTROLLERIP} "ps aux | grep 'distribution-karaf' | grep -v grep | tr -s ' ' | cut -f2 -d' '")
-    ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_after.log
+    ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_after.log || true
     echo "killing karaf process..."
     ssh "${!CONTROLLERIP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
 done
@@ -134,7 +134,12 @@ sleep 5
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
-    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log" "odl${i}_karaf.log"
+    echo "Compressing karaf.log ${i}"
+    ssh ${!CONTROLLERIP} gzip --best /tmp/${BUNDLEFOLDER}/data/log/karaf.log
+    echo "Fetching compressed karaf.log ${i}"
+    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log.gz" "odl${i}_karaf.log.gz"
+    # TODO: Gzip also these?
+    scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log" "odl${i}_karaf_console.log"
 done
 true  # perhaps Jenkins is testing last exit code
 
index 46ccd1269ec7953ef89c23950cecb8aebb20e8c9..83daad88bdfbfe1b864d2540a43452f326453463 100644 (file)
                     mkdir $WORKSPACE/archives
                     curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
                     unzip -d $WORKSPACE/archives robot-plugin.zip
-                    mv *log* *.log *.csv *.png $WORKSPACE/archives || true  # Don't fail if file missing
+                    mv *log* *.log *.log.gz *.csv *.png $WORKSPACE/archives || true  # Don't fail if file missing
             script-only-if-succeeded: False
             script-only-if-failed: False
             mark-unstable-if-failed: True
index d4ec07fbb403f91e82eff9b704ec14235bcc0748..8678b011bc259b7fefb94ead391969d3ebd606c1 100644 (file)
@@ -37,3 +37,6 @@
     # so the job is defined to run once a day.
     # Trigger jobs (daily)
     schedule: 'H H * * *'
+
+    # ODL system configuration
+    controller-image: 'centos7-java-builder-2c-8g'
index 2ea4cbef5ecdf6e6ada483de2615a3de1c9e0848..e25f66ebaa8427b2bb73546e5dd0500f9c82939e 100644 (file)
@@ -24,9 +24,9 @@
         - mitaka:
             openstack-branch: 'stable/mitaka'
             odl-ml2-version:  'stable/mitaka'
-        - liberty:
-            openstack-branch: 'stable/liberty'
-            odl-ml2-version:  'stable/liberty'
+        - newton:
+            openstack-branch: 'stable/newton'
+            odl-ml2-version:  'master'
 
     openstack-vms: 3
 
@@ -44,4 +44,4 @@
 
     tenant-network-type: 'vxlan'
 
-    security-group-mode: 'none'
\ No newline at end of file
+    security-group-mode: 'none'
index b00958e85c1a625d335fd0581d9a35969cc05b9a..d518096f256623b5ca63704779a465fd41cc528a 100644 (file)
@@ -24,9 +24,9 @@
         - mitaka:
             openstack-branch: 'stable/mitaka'
             odl-ml2-version:  'stable/mitaka'
-        - liberty:
-            openstack-branch: 'stable/liberty'
-            odl-ml2-version:  'stable/liberty'
+        - newton:
+            openstack-branch: 'stable/newton'
+            odl-ml2-version:  'master'
 
     openstack-vms: 4
 
@@ -46,4 +46,4 @@
 
     tenant-network-type: 'vxlan'
 
-    security-group-mode: 'none'
\ No newline at end of file
+    security-group-mode: 'none'
index 4798f9340df04b841b45c7cb7286fa36533a68a2..a87bc589df51c755ac2f96e57da9e67c709c5bfd 100644 (file)
@@ -23,9 +23,9 @@
 
         - current:
             csit-list: >
-                netvirt-vpnservice-csit-1node-openstack-mitaka-openstack-{stream}
+                netvirt-vpnservice-csit-1node-openstack-mitaka-transparent-{stream}
 
         - all:
             csit-list: >
-                netvirt-vpnservice-csit-1node-openstack-mitaka-openstack-{stream},
+                netvirt-vpnservice-csit-1node-openstack-mitaka-transparent-{stream},
                 netvirt-csit-1node-openstack-mitaka-openstack-{stream}
index 23b297d938b98be557a30cf10f76664ef1a6d4f4..407051640da893352bb89dfc6a935cc2a2111e8f 100644 (file)
@@ -22,9 +22,9 @@
         - mitaka:
             openstack-branch: 'stable/mitaka'
             odl-ml2-version:  'stable/mitaka'
-        - liberty:
-            openstack-branch: 'stable/liberty'
-            odl-ml2-version:  'stable/liberty'
+        - newton:
+            openstack-branch: 'stable/newton'
+            odl-ml2-version:  'master'
 
     openstack-vms: 3
 
index a2d128c8f30bc01a312bfb2ef80542d796462e03..50fad15eeb256ad1a6032c3f715b8cd041454890 100644 (file)
@@ -21,9 +21,9 @@
         - mitaka:
             openstack-branch: 'stable/mitaka'
             odl-ml2-version:  'stable/mitaka'
-        - liberty:
-            openstack-branch: 'stable/liberty'
-            odl-ml2-version:  'stable/liberty'
+        - newton:
+            openstack-branch: 'stable/newton'
+            odl-ml2-version:  'master'
 
     openstack-vms: 4
 
@@ -43,4 +43,4 @@
 
     tenant-network-type: 'vxlan'
 
-    security-group-mode: 'transparent'
\ No newline at end of file
+    security-group-mode: 'transparent'
diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-helium-redesign.yaml
deleted file mode 100644 (file)
index 42ff20a..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-- project:
-    name: openflowplugin-csit-bulk-matic-ds-daily-helium-redesign
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'bulk-matic-ds-daily-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-app-bulk-o-matic-he'
-
-    # Robot custom options
-    robot-options: '-v flnr:50000'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'REST setup rate (for 100k flows)'
-    01-plot-yaxis: 'setup time[s], req[flows/s]'
-    01-plot-group: 'Performance Rate'
-    01-plot-data-file: 'flows_setup_time.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 4b96c6b..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-- project:
-    name: openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'bulk-matic-ds-daily-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li,odl-openflowplugin-app-bulk-o-matic-li'
-
-    # Robot custom options
-    robot-options: '-v flnr:50000'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'REST setup rate (for 100k flows)'
-    01-plot-yaxis: 'setup time[s], req[flows/s]'
-    01-plot-group: 'Performance Rate'
-    01-plot-data-file: 'flows_setup_time.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign.yaml
deleted file mode 100644 (file)
index 300aadb..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-- project:
-    name: openflowplugin-csit-bulkomatic-clustering-daily-helium-redesign
-    jobs:
-        - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'bulkomatic-clustering-daily-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-app-bulk-o-matic-he'
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:helium'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
diff --git a/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-bulkomatic-clustering-daily-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 21fc82a..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-- project:
-    name: openflowplugin-csit-bulkomatic-clustering-daily-lithium-redesign-old
-    jobs:
-        - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'bulkomatic-clustering-daily-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li,odl-openflowplugin-app-bulk-o-matic-li'
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:lithium'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-helium-redesign.yaml
deleted file mode 100644 (file)
index 6468a1b..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-- project:
-    name: openflowplugin-csit-cbench-helium-redesign-daily
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'cbench-daily-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-drop-test-he'
-
-    # Robot custom options
-    robot-options: '-v duration_in_secs:180 -v throughput_threshold:20000 -v latency_threshold:5000'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Throughput Mode'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Cbench Performance'
-    01-plot-data-file: 'throughput.csv'
-    02-plot-title: 'Latency Mode'
-    02-plot-yaxis: 'flow_mods/sec'
-    02-plot-group: 'Cbench Performance'
-    02-plot-data-file: 'latency.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 2ae81ad..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-- project:
-    name: openflowplugin-csit-cbench-daily-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'cbench-daily-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li,odl-openflowplugin-drop-test-li'
-
-    # Robot custom options
-    robot-options: '-v duration_in_secs:180 -v throughput_threshold:20000 -v latency_threshold:5000'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Throughput Mode'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Cbench Performance'
-    01-plot-data-file: 'throughput.csv'
-    02-plot-title: 'Latency Mode'
-    02-plot-yaxis: 'flow_mods/sec'
-    02-plot-group: 'Cbench Performance'
-    02-plot-data-file: 'latency.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-helium-redesign.yaml
deleted file mode 100644 (file)
index 1d76820..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-- project:
-    name: openflowplugin-csit-cbench-performance-helium-redesign
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'cbench-performance-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-drop-test-he'
-
-    # Robot custom options
-    robot-options: '-v throughput_threshold:20000 -v latency_threshold:5000'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
-    # Plot Info
-    01-plot-title: 'Throughput Mode'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Cbench Performance'
-    01-plot-data-file: 'throughput.csv'
-    02-plot-title: 'Latency Mode'
-    02-plot-yaxis: 'flow_mods/sec'
-    02-plot-group: 'Cbench Performance'
-    02-plot-data-file: 'latency.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 26090e6..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-- project:
-    name: openflowplugin-csit-cbench-performance-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'cbench-performance-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li,odl-openflowplugin-drop-test-li'
-
-    # Robot custom options
-    robot-options: '-v throughput_threshold:20000 -v latency_threshold:5000'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
-    # Plot Info
-    01-plot-title: 'Throughput Mode'
-    01-plot-yaxis: 'flow_mods/sec'
-    01-plot-group: 'Cbench Performance'
-    01-plot-data-file: 'throughput.csv'
-    02-plot-title: 'Latency Mode'
-    02-plot-yaxis: 'flow_mods/sec'
-    02-plot-group: 'Cbench Performance'
-    02-plot-data-file: 'latency.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-helium-redesign.yaml
deleted file mode 100644 (file)
index 2f1fe13..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-- project:
-    name: openflowplugin-csit-clustering-helium-redesign
-    jobs:
-        - '{project}-csit-3node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'clustering-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he'
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:helium'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index f186ba6..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-- project:
-    name: openflowplugin-csit-clustering-lithium-redesign-old
-    jobs:
-        - '{project}-csit-3node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'clustering-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
-
-    # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:lithium'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-helium-redesign.yaml
deleted file mode 100644 (file)
index a969e9a..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-- project:
-    name: openflowplugin-csit-config-performance-helium-redesign
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'config-performance-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
-    # Plot Info
-    01-plot-title: 'Flow REST API Rate'
-    01-plot-yaxis: 'http_req/sec'
-    01-plot-group: 'Flow Config Performance'
-    01-plot-data-file: 'rates.csv'
-    02-plot-title: 'Flow Stats Collect Time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'Stats Collect Performance'
-    02-plot-data-file: 'times.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 8f349d8..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-- project:
-    name: openflowplugin-csit-config-performance-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'config-performance-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-
-    # Plot Info
-    01-plot-title: 'Flow REST API Rate'
-    01-plot-yaxis: 'http_req/sec'
-    01-plot-group: 'Flow Config Performance'
-    01-plot-data-file: 'rates.csv'
-    02-plot-title: 'Flow Stats Collect Time'
-    02-plot-yaxis: 'seconds'
-    02-plot-group: 'Stats Collect Performance'
-    02-plot-data-file: 'times.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-helium-redesign.yaml
deleted file mode 100644 (file)
index 832afd7..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-- project:
-    name: openflowplugin-csit-flow-services-helium-redesign
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'flow-services-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 00f01f5..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-- project:
-    name: openflowplugin-csit-flow-services-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'flow-services-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-helium-redesign.yaml
deleted file mode 100644 (file)
index 0e39cbe..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-- project:
-    name: openflowplugin-csit-link-scalability-daily-helium-redesign
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'link-scalability-daily-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Max number of switch links'
-    01-plot-yaxis: 'Links'
-    01-plot-group: 'Inventory Switch Link Scalability'
-    01-plot-data-file: 'links.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index d2cc97b..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-- project:
-    name: openflowplugin-csit-link-scalability-daily-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'link-scalability-daily-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Max number of switch links'
-    01-plot-yaxis: 'Links'
-    01-plot-group: 'Inventory Switch Link Scalability'
-    01-plot-data-file: 'links.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-helium-redesign.yaml
deleted file mode 100644 (file)
index 449a37f..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-- project:
-    name: openflowplugin-csit-longevity-helium-redesign
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-    build-timeout: 1440
-
-    # The functionality under test
-    functionality: 'longevity-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    # Robot custom options
-    robot-options: '-v TEST_LENGTH:23@hours --escape space:@'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index e5378a7..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-- project:
-    name: openflowplugin-csit-longevity-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-    build-timeout: 1440
-
-    # The functionality under test
-    functionality: 'longevity-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    # Robot custom options
-    robot-options: '-v TEST_LENGTH:23@hours --escape space:@'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-helium-redesign.yaml
deleted file mode 100644 (file)
index d904beb..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-- project:
-    name: openflowplugin-csit-rpc-time-measure-daily-helium-redesign
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'rpc-time-measure-daily-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he,odl-openflowplugin-app-bulk-o-matic-he'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'REST setup rate (for 100k flows)'
-    01-plot-yaxis: 'setup time[s], req[flows/s]'
-    01-plot-group: 'Performance Rate'
-    01-plot-data-file: 'flows_setup_time.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 52f9794..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-- project:
-    name: openflowplugin-csit-rpc-time-measure-daily-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'rpc-time-measure-daily-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li,odl-openflowplugin-app-bulk-o-matic-li'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'REST setup rate (for 100k flows)'
-    01-plot-yaxis: 'setup time[s], req[flows/s]'
-    01-plot-group: 'Performance Rate'
-    01-plot-data-file: 'flows_setup_time.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-helium-redesign.yaml
deleted file mode 100644 (file)
index ad4504c..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-- project:
-    name: openflowplugin-csit-scalability-daily-helium-redesign
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scalability-daily-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he'
-
-    # Robot custom options
-    robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:400 -v STEP_SWITCHES:50'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Max number of Switches'
-    01-plot-yaxis: 'OpenFlow Switches'
-    01-plot-group: 'Inventory Scalability'
-    01-plot-data-file: 'switches.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index e81006b..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-- project:
-    name: openflowplugin-csit-scalability-daily-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scalability-daily-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
-
-    # Robot custom options
-    robot-options: '-v MIN_SWITCHES:100 -v MAX_SWITCHES:400 -v STEP_SWITCHES:50'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Max number of Switches'
-    01-plot-yaxis: 'OpenFlow Switches'
-    01-plot-group: 'Inventory Scalability'
-    01-plot-data-file: 'switches.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-helium-redesign.yaml
deleted file mode 100644 (file)
index 6b4b7ab..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-- project:
-    name: openflowplugin-csit-scalability-helium-redesign
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scalability-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    # Robot custom options
-    robot-options: '-v TOPO_TREE_DEPTH:7'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 0b9aac6..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-- project:
-    name: openflowplugin-csit-scalability-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scalability-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li,decanter-collector-jmx,decanter-appender-elasticsearch'
-
-    # Robot custom options
-    robot-options: '-v TOPO_TREE_DEPTH:7'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-helium-redesign.yaml
deleted file mode 100644 (file)
index dd00f65..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-- project:
-    name: openflowplugin-csit-scale-stats-collection-daily-helium-redesign
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scale-stats-collection-daily-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he'
-
-    # Robot custom options
-    robot-options: '-v flnr:50000'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Flows (100k) Setup Time'
-    01-plot-yaxis: '[s]'
-    01-plot-group: 'Config Performance'
-    01-plot-data-file: 'flows_setup_time.csv'
-
-    02-plot-title: 'REST setup rate (for 100k flows)'
-    02-plot-yaxis: 'setup time[s], req[flows/s]'
-    02-plot-group: 'Performance Rate'
-    02-plot-data-file: 'flows_install_rate.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 076bfd7..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-- project:
-    name: openflowplugin-csit-scale-stats-collection-daily-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'scale-stats-collection-daily-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
-
-    # Robot custom options
-    robot-options: '-v flnr:50000'
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Flows (100k) Setup Time'
-    01-plot-yaxis: '[s]'
-    01-plot-group: 'Config Performance'
-    01-plot-data-file: 'flows_setup_time.csv'
-
-    02-plot-title: 'REST setup rate (for 100k flows)'
-    02-plot-yaxis: 'setup time[s], req[flows/s]'
-    02-plot-group: 'Performance Rate'
-    02-plot-data-file: 'flows_install_rate.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-helium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-helium-redesign.yaml
deleted file mode 100644 (file)
index a401309..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-- project:
-    name: openflowplugin-csit-sw-scalability-daily-helium-redesign
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'sw-scalability-daily-helium-redesign'
-
-    # Project branches
-    stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-he'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Max number of Switches'
-    01-plot-yaxis: 'OpenFlow Switches'
-    01-plot-group: 'Inventory Scalability'
-    01-plot-data-file: 'max_found.csv'
diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign-old.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign-old.yaml
deleted file mode 100644 (file)
index 6c706b3..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-- project:
-    name: openflowplugin-csit-sw-scalability-daily-lithium-redesign-old
-    jobs:
-        - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-
-    # The project name
-    project: 'openflowplugin'
-
-    # The functionality under test
-    functionality: 'sw-scalability-daily-lithium-redesign'
-
-    # Project branches
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-
-    install:
-        - only:
-            scope: 'only'
-
-    # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui-li'
-
-    # Robot custom options
-    robot-options: ''
-
-    # Trigger jobs (daily)
-    schedule: 'H H * * *'
-
-    # Plot Info
-    01-plot-title: 'Max number of Switches'
-    01-plot-yaxis: 'OpenFlow Switches'
-    01-plot-group: 'Inventory Scalability'
-    01-plot-data-file: 'max_found.csv'
index a0d2e1094ec7969095e4fcfc07c0330d6a068c67..ba8d7af5e30ecc0dfac59ce7c9b3e86baffc1233 100644 (file)
@@ -11,9 +11,8 @@ mkdir -p "$DESTDIR"
 
 ./boot.sh
 ./configure --prefix="$ROOT" --enable-shared
-make -j8
+make -j4
 DESTDIR=`pwd`/$DESTDIR make install
-find lib ofproto -name "*.h" -exec cp --parents -t "$DESTDIR/$ROOT/include/openvswitch/" {} \;
 
 pushd $DESTDIR
 tar -czf openvswitch.tgz *
diff --git a/jjb/opflex/include-raw-opflex-dep_rpm-build.sh b/jjb/opflex/include-raw-opflex-dep_rpm-build.sh
deleted file mode 100644 (file)
index 63aa052..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-LIBUV_VERSION=1.5.0
-wget https://github.com/libuv/libuv/archive/v$LIBUV_VERSION.tar.gz
-mock --define="buildversion $BUILD_NUMBER" -r $MOCK_TARGET --resultdir target/srpm --buildsrpm --spec libuv.spec --sources v$LIBUV_VERSION.tar.gz
-
-RAPIDJSON_VERSION=1.0.2
-wget https://github.com/miloyip/rapidjson/archive/v$RAPIDJSON_VERSION.tar.gz
-mock --define="buildversion $BUILD_NUMBER" -r $TARGET --resultdir target/srpm --buildsrpm --spec rapidjson-devel.spec --sources v$RAPIDJSON_VERSION.tar.gz
-
-mockchain -m --define="buildversion $BUILD_NUMBER" -r $MOCK_TARGET -l target/rpm target/srpm/*.src.rpm
-find target/rpm/results -name "*.rpm" -exec mv {} . \;
diff --git a/jjb/opflex/include-raw-ovs_rpm-build.sh b/jjb/opflex/include-raw-ovs_rpm-build.sh
deleted file mode 100644 (file)
index 9dbe487..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# Build OVS RPMs
-
-set -e
-set -x
-
-TARGET=epel-7-x86_64
-BASEKERNEL=3.10.0-229.14.1.el7.x86_64
-BVDEFINE=--define="buildversion $BUILD_NUMBER"
-KMDEFINE=--define="kversion $BASEKERNEL"
-
-./boot.sh
-./configure
-make dist
-
-SOURCE_FILE=$(ls *.tar.gz)
-
-mock -r $TARGET --resultdir target/srpm --buildsrpm --spec rhel/openvswitch-gbp-rhel.spec --sources $SOURCE_FILE "$BVDEFINE" "$KMDEFINE"
-mock -r $TARGET --resultdir target/srpm --buildsrpm --spec rhel/openvswitch-gbp-kmod-rhel.spec --sources $SOURCE_FILE "$BVDEFINE" "$KMDEFINE"
-mockchain -r $TARGET -l target/rpm -m --nocheck -m "$BVDEFINE" -m "$KMDEFINE" target/srpm/*.src.rpm
-
-find target/rpm/results -name "*.rpm" -exec mv {} . \;
index e173dc8d12828aa392a3ce0265e201541a5838e7..47b1fa0b374aabf5cb0290c1283d34c24344a9f8 100644 (file)
@@ -13,7 +13,7 @@ mkdir -p "$DESTDIR/$ROOT/include"
 cp -R include/rapidjson "$DESTDIR/$ROOT/include"
 sed -e "s|@INCLUDE_INSTALL_DIR@|$ROOT/include|" \
     -e "s|@PROJECT_NAME@|RapidJSON|" \
-    -e "s|@LIB_VERSION_STRING@|1.0.1|" RapidJSON.pc.in > \
+    -e "s|@LIB_VERSION_STRING@|1.0.2|" RapidJSON.pc.in > \
     "$DESTDIR/$ROOT/lib/pkgconfig/RapidJSON.pc"
 
 pushd $DESTDIR
diff --git a/jjb/opflex/opflex-dependencies-rpm.yaml b/jjb/opflex/opflex-dependencies-rpm.yaml
deleted file mode 100644 (file)
index 866e46c..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-- project:
-    name: opflex-dependencies-rpm
-    jobs:
-        - 'opflex-dep_rpm-{stream}'
-        - 'opflex-openvswitch_rpm-{stream}'
-
-    stream:
-        - carbon:
-            branch: 'master'
-            jdk: openjdk7
-        - boron:
-            branch: 'stable/boron'
-            jdk: openjdk7
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-
-    project: 'opflex'
-
-- parameter:
-    name: mock-target-parameter
-    parameters:
-        - string:
-            name: MOCK_TARGET
-            default: 'epel-7-x86_64'
-            description: "Target architecture for mock RPM builds"
-
-- scm:
-    name: 'git-opflex-3rdparty'
-    scm:
-        - git:
-            url: https://github.com/noironetworks/3rdparty-rpm.git
-            branches:
-                - 'origin/master'
-            wipe-workspace: true
-
-- job-template:
-    name: 'opflex-dep_rpm-{stream}'
-
-    project-type: freestyle
-    node: centos7-java-builder-2c-8g
-    concurrent: true
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    scm:
-        - git-opflex-3rdparty
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    parameters:
-        - mock-target-parameter
-
-    builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-opflex-dep_rpm-build.sh
-
-    publishers:
-        - email-notification:
-            email-prefix: '[opflex]'
-        - archive:
-            artifacts: '*.rpm'
-
-- job-template:
-    name: 'opflex-openvswitch_rpm-{stream}'
-
-    project-type: freestyle
-    node: centos7-java-builder-2c-8g
-    concurrent: true
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    scm:
-        - git-opflex-ovs
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    parameters:
-        - mock-target-parameter
-
-    builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-ovs_rpm-build.sh
-
-    publishers:
-        - email-notification:
-            email-prefix: '[opflex]'
-        - archive:
-            artifacts: '*.rpm'
index 41795f9a7db933cbe854380ee8170463fb20e6a1..5fb9da7e76ede2aae19237669c5989a1615e1793 100644 (file)
@@ -24,7 +24,7 @@
         - git:
             url: https://github.com/libuv/libuv.git
             branches:
-                - 'refs/tags/v1.7.5'
+                - 'refs/tags/v1.8.0'
             wipe-workspace: true
 
 - scm:
         - git:
             url: https://github.com/miloyip/rapidjson.git
             branches:
-                - 'refs/tags/v1.0.1'
+                - 'refs/tags/v1.0.2'
             wipe-workspace: true
 
 - scm:
-    name: 'git-opflex-ovs'
+    name: 'git-ovs'
     scm:
         - git:
-            url: https://github.com/noironetworks/ovs.git
+            url: https://github.com/openvswitch/ovs.git
             branches:
-                - 'origin/noiro'
+                - 'refs/tags/v2.6.0'
             wipe-workspace: true
 
 - job-template:
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     scm:
-        - git-opflex-ovs
+        - git-ovs
 
     wrappers:
         - opendaylight-infra-wrappers:
index 1226b9ca8b6ac0ed8bd51148cfe75f4b2f7d2e04..4930d7136364369d404f9c5cb64ab32fd044a18e 100644 (file)
                 - patchset-created-event:
                     exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'true'
+                    exclude-no-code-change: 'false'
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'test-distribution'