From: Thanh Ha Date: Mon, 18 Jan 2016 17:13:43 +0000 (+0000) Subject: Merge "BUG-2625: validate nic using jdk8 only" X-Git-Tag: release/beryllium~157 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=676c00acfd6bb59b835b6791a71331107d0a0fd2;hp=2b735cc9cfcceccf4c6d704e26a0889d576f9272;p=releng%2Fbuilder.git Merge "BUG-2625: validate nic using jdk8 only" --- diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index b0ba0ec7b..bf6977798 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -46,8 +46,10 @@ # Project branches stream: - - beryllium: + - boron: branch: 'master' + - beryllium: + branch: 'stable/beryllium' - stable-lithium: branch: 'stable/lithium' diff --git a/jjb/capwap/capwap.cfg b/jjb/capwap/capwap.cfg index 1e2e1ed7c..452fdc980 100644 --- a/jjb/capwap/capwap.cfg +++ b/jjb/capwap/capwap.cfg @@ -2,9 +2,11 @@ STREAMS: - boron: branch: master jdks: openjdk7,openjdk8 + autorelease: true - beryllium: branch: beryllium jdks: openjdk7,openjdk8 + autorelease: true - stable-lithium: branch: stable/lithium jdks: openjdk7 diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index 3ab13a0e2..43f5dace8 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -25,14 +25,14 @@ jdks: - openjdk7 - openjdk8 - disable_autorelease: True + disable_autorelease: False - beryllium: branch: 'beryllium' jdk: openjdk7 jdks: - openjdk7 - openjdk8 - disable_autorelease: True + disable_autorelease: False - stable-lithium: branch: 'stable/lithium' jdk: openjdk7 diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml new file mode 100644 index 000000000..1bdcfcbca --- /dev/null +++ b/jjb/didm/didm-csit-discovery.yaml @@ -0,0 +1,33 @@ +- project: + name: didm-csit-discovery + jobs: + - '{project}-csit-1node-{functionality}-{install}-{stream}' + - '{project}-csit-verify-1node-{functionality}' + + # The project name + project: 'didm' + + # The functionality under test + functionality: 'discovery' + + # Project branches + stream: + - boron: + branch: 'master' + - beryllium: + branch: 'stable/beryllium' + - stable-lithium: + branch: 'stable/lithium' + + install: + - only: + scope: 'only' + + # Features to install + install-features: 'odl-didm-all' + + # Robot custom options + robot-options: '' + + # Trigger jobs (upstream dependencies) + trigger-jobs: 'didm-distribution-{stream},openflowplugin-distribution-{stream}' diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-devstack_verify.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-devstack_verify.yaml new file mode 100644 index 000000000..8c29a01c4 --- /dev/null +++ b/jjb/groupbasedpolicy/groupbasedpolicy-devstack_verify.yaml @@ -0,0 +1,22 @@ +- project: + name: groupbasedpolicy-csit-netvirt + jobs: + - '{project}-csit-verify-1node-{functionality}' + + # The project name + project: 'groupbasedpolicy' + + # The functionality under test + functionality: 'devstack' + + # Mininet configuration + mininet-image: 'rk-c7-devstack' + mininet-cloud-name: 'Rackspace DFW - Devstack' + mininet-vms: 1 + + # Features to install + install-features: 'odl-groupbasedpolicy-neutronmapper,odl-restconf' + + # Robot custom options + robot-options: '' + diff --git a/jjb/integration/include-raw-integration-deploy-controller-offline.sh b/jjb/integration/include-raw-integration-deploy-controller-offline.sh index 97c4f548a..c91f3f301 100644 --- a/jjb/integration/include-raw-integration-deploy-controller-offline.sh +++ b/jjb/integration/include-raw-integration-deploy-controller-offline.sh @@ -48,9 +48,12 @@ sleep 10 echo "Installing all features..." sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf "feature:install ${ACTUALFEATURES}" || echo $? > ${WORKSPACE}/error.txt -echo "Killing ODL and fetching Karaf log..." -tail --bytes=1M "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" > "karaf.log" +echo "dumping first 500K bytes of karaf log..." +head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" > "karaf.log" +echo "dumping last 500K bytes of karaf log..." +tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" > "karaf.log" # TODO: Do we want different name for karaf.log chunk to signal it may be not complete? +echo "killing karaf process..." ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh sleep 5 xz -9ekvv "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh index 7f0faa453..536458cf7 100644 --- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh +++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh @@ -88,8 +88,10 @@ while true; do break elif (( "\$COUNT" > "600" )); then echo Timeout Controller DOWN - echo "Dumping Karaf log..." - tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" + 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 -natu exit 1 @@ -110,8 +112,10 @@ 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 Karaf log..." - tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" + 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 } diff --git a/jjb/integration/include-raw-integration-deploy-controller-verify.sh b/jjb/integration/include-raw-integration-deploy-controller-verify.sh index de1aee364..d7b57d004 100644 --- a/jjb/integration/include-raw-integration-deploy-controller-verify.sh +++ b/jjb/integration/include-raw-integration-deploy-controller-verify.sh @@ -76,8 +76,10 @@ function exit_on_log_file_message { echo "looking for \"$1\" in karaf.log file" if grep --quiet "$1" ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log; then echo ABORTING: found "$1" - echo "Dumping first 1M of karaf.log..." - tail --bytes=1M ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log + echo "Dumping first 500K bytes of karaf log..." + head --bytes=500K ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log + echo "Dumping last 500K bytes of karaf log..." + tail --bytes=500K ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log . cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log . exit 1 @@ -86,8 +88,10 @@ function exit_on_log_file_message { echo "looking for \"$1\" in karaf_console.log file" if grep --quiet "$1" ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log; then echo ABORTING: found "$1" - echo "Dumping first 1M of karaf_console.log..." - tail --bytes=1M ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log + echo "Dumping first 500K bytes of karaf log..." + head --bytes=500K ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log + echo "Dumping last 500K bytes of karaf log..." + tail --bytes=500K ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log . cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log . exit 1 diff --git a/jjb/integration/include-raw-integration-start-cluster-run-test.sh b/jjb/integration/include-raw-integration-start-cluster-run-test.sh index 154d1261f..d6d1bfb04 100644 --- a/jjb/integration/include-raw-integration-start-cluster-run-test.sh +++ b/jjb/integration/include-raw-integration-start-cluster-run-test.sh @@ -25,8 +25,10 @@ while true; do break elif (( "\$COUNT" > "600" )); then echo Timeout Controller DOWN - echo "Dumping Karaf log..." - tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" + 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 -natu exit 1 @@ -44,8 +46,10 @@ 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 Karaf log..." - tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" + 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 } @@ -94,12 +98,15 @@ TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} ${tools_variables} -v NUM_TOOLS_SYSTEM:${NUM_ -v MININET:${TOOLS_SYSTEM_IP} -v MININET1:${TOOLS_SYSTEM_2_IP} -v MININET2:${TOOLS_SYSTEM_3_IP} -v MININET_USER:${USER} \ -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true -echo "Killing ODL and fetching Karaf log..." set +e # We do not want to create red dot just because something went wrong while fetching logs. for i in `seq 1 ${NUM_ODL_SYSTEM}` do CONTROLLERIP=ODL_SYSTEM_${i}_IP - ssh "${!CONTROLLERIP}" tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" > "odl${i}_karaf.log" + echo "dumping first 500K bytes of karaf log..." > "odl${i}_karaf.log" + ssh "${!CONTROLLERIP}" head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" >> "odl${i}_karaf.log" + echo "dumping last 500K bytes of karaf log..." >> "odl${i}_karaf.log" + ssh "${!CONTROLLERIP}" tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" >> "odl${i}_karaf.log" + echo "killing karaf process..." ssh "${!CONTROLLERIP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh' done sleep 5 diff --git a/jjb/lispflowmapping/lispflowmapping.cfg b/jjb/lispflowmapping/lispflowmapping.cfg index a5ad2b6c7..d1ba0edc1 100644 --- a/jjb/lispflowmapping/lispflowmapping.cfg +++ b/jjb/lispflowmapping/lispflowmapping.cfg @@ -2,7 +2,7 @@ MVN_GOALS: clean install findbugs:findbugs javadoc:aggregate -DrepoBuild -Dmaven STREAMS: - boron: branch: master - jdks: openjdk7,openjdk8 + jdks: openjdk8 autorelease: true - beryllium: branch: stable/beryllium diff --git a/jjb/messaging4transport/messaging4transport.cfg b/jjb/messaging4transport/messaging4transport.cfg index 1f7a0d7ff..b0c3a1d77 100644 --- a/jjb/messaging4transport/messaging4transport.cfg +++ b/jjb/messaging4transport/messaging4transport.cfg @@ -2,7 +2,7 @@ DEPENDENCIES: yangtools,aaa,controller,odlparent STREAMS: - boron: branch: master - jdks: openjdk7,openjdk8 + jdks: openjdk8 autorelease: true - beryllium: branch: stable/beryllium diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index 5dfc5ac62..ccff81660 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -21,9 +21,8 @@ stream: - boron: branch: 'master' - jdk: openjdk7 + jdk: openjdk8 jdks: - - openjdk7 - openjdk8 disable_autorelease: False - beryllium: diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml new file mode 100644 index 000000000..7e04d5773 --- /dev/null +++ b/jjb/netconf/netconf-clustering.yaml @@ -0,0 +1,32 @@ +- project: + name: netconf-csit-clustering + jobs: + - '{project}-csit-3node-{functionality}-{install}-{stream}' + + # The project name + project: 'netconf' + + # The functionality under test + functionality: 'clustering' + + # Project branches + stream: + - boron: + branch: 'master' + - beryllium: + branch: 'stable/beryllium' + + install: + - only: + scope: 'only' + - all: + scope: 'all' + + # Features to install + install-features: 'odl-restconf,odl-netconf-clustered-topology' + + # Robot custom options + robot-options: '' + + # Trigger jobs (upstream dependencies) + trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},netconf-distribution-{stream},mdsal-distribution-{stream}' diff --git a/jjb/neutron/neutron-daily-openstack-beryllium.yaml b/jjb/neutron/neutron-daily-openstack-beryllium.yaml index 9c4bc6e7d..8ff295cd5 100644 --- a/jjb/neutron/neutron-daily-openstack-beryllium.yaml +++ b/jjb/neutron/neutron-daily-openstack-beryllium.yaml @@ -1,6 +1,7 @@ - project: name: neutron-daily-openstack jobs: + # TODO: Do we want boron job too? - 'neutron-daily-openstack-beryllium' project: 'neutron' diff --git a/jjb/ofextensions/circuitsw/circuitsw.cfg b/jjb/ofextensions/circuitsw/circuitsw.cfg index ab4492c79..f00432601 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.cfg +++ b/jjb/ofextensions/circuitsw/circuitsw.cfg @@ -2,7 +2,9 @@ STREAMS: - boron: branch: master jdks: openjdk7,openjdk8 + autorelease: true - beryllium: branch: stable/beryllium jdks: openjdk7,openjdk8 + autorelease: true DEPENDENCIES: yangtools,controller,openflowplugin diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index f3b54b504..f8faaf736 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -25,14 +25,14 @@ jdks: - openjdk7 - openjdk8 - disable_autorelease: True + disable_autorelease: False - beryllium: branch: 'stable/beryllium' jdk: openjdk7 jdks: - openjdk7 - openjdk8 - disable_autorelease: True + disable_autorelease: False project: 'ofextensions/circuitsw' diff --git a/jjb/openflowjava/openflowjava.cfg b/jjb/openflowjava/openflowjava.cfg index 8f5dc6c3d..92831127c 100644 --- a/jjb/openflowjava/openflowjava.cfg +++ b/jjb/openflowjava/openflowjava.cfg @@ -1,7 +1,7 @@ STREAMS: - boron: branch: master - jdks: openjdk7,openjdk8 + jdks: openjdk8 autorelease: true - beryllium: branch: stable/beryllium diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml similarity index 94% rename from jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml rename to jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 9d9002584..d311dc6f6 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-beryllium.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -1,5 +1,5 @@ - project: - name: openflowplugin-csit-flow-services-beryllium + name: openflowplugin-csit-flow-services jobs: - '{project}-csit-1node-{functionality}-{install}-{stream}' - '{project}-csit-verify-1node-{functionality}' diff --git a/jjb/reservation/reservation.cfg b/jjb/reservation/reservation.cfg index c8c584494..2f144d842 100644 --- a/jjb/reservation/reservation.cfg +++ b/jjb/reservation/reservation.cfg @@ -1,7 +1,7 @@ STREAMS: - boron: branch: master - jdks: openjdk7,openjdk8 + jdks: openjdk8 autorelease: true - beryllium: branch: stable/beryllium diff --git a/jjb/unimgr/unimgr.cfg b/jjb/unimgr/unimgr.cfg index 075716814..16be8f30f 100644 --- a/jjb/unimgr/unimgr.cfg +++ b/jjb/unimgr/unimgr.cfg @@ -1,7 +1,7 @@ STREAMS: - boron: branch: master - jdks: openjdk7,openjdk8 + jdks: openjdk8 autorelease: true - beryllium: branch: stable/beryllium diff --git a/jjb/vtn/vtn.cfg b/jjb/vtn/vtn.cfg index 843bfa6b6..72df9f84b 100644 --- a/jjb/vtn/vtn.cfg +++ b/jjb/vtn/vtn.cfg @@ -1,7 +1,7 @@ STREAMS: - boron: branch: master - jdks: openjdk7,openjdk8 + jdks: openjdk8 autorelease: true - beryllium: branch: stable/beryllium diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index 847ce3fd3..a97004c09 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -21,9 +21,8 @@ stream: - boron: branch: 'master' - jdk: openjdk7 + jdk: openjdk8 jdks: - - openjdk7 - openjdk8 disable_autorelease: False - beryllium: diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml index a0c7ed464..364f35509 100644 --- a/jjb/yangtools/yangtools-verify.yaml +++ b/jjb/yangtools/yangtools-verify.yaml @@ -1,3 +1,24 @@ +- project: + name: yangtools-verify-boron + jobs: + - 'yangtools-verify-{stream}-{maven}-{jdk}' + + jdk: + - openjdk8 + + # {mvn*} values are defined in releng/builder jjb/releng-defaults.yaml + maven: + - mvn32: + mvnver: '{mvn32}' + - mvn33: + mvnver: '{mvn33}' + + stream: + - boron: + branch: master + + project: 'yangtools' + - project: name: yangtools-verify-beryllium jobs: @@ -17,8 +38,6 @@ mvnver: '{mvn33}' stream: - - boron: - branch: master - beryllium: branch: stable/beryllium diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py index a7143aa77..417049d3b 100644 --- a/scripts/jjb-init-project.py +++ b/scripts/jjb-init-project.py @@ -69,7 +69,7 @@ if cfg.get("STREAMS"): # this is a list of single-key dicts for stream_dict in cfg.get("STREAMS"): streams.update(stream_dict) else: - streams = {"beryllium": jjblib.STREAM_DEFAULTS["beryllium"]} + streams = {"boron": jjblib.STREAM_DEFAULTS["boron"]} first_stream = streams.iterkeys().next() # Keep master branch at top. sonar_branch = streams[first_stream]["branch"] diff --git a/scripts/jjblib.py b/scripts/jjblib.py index 56e98d6aa..50c564370 100644 --- a/scripts/jjblib.py +++ b/scripts/jjblib.py @@ -32,7 +32,8 @@ def parse_jjb_args(): STREAM_DEFAULTS = collections.OrderedDict([ - ("beryllium", {"branch": "master", "jdks": "openjdk8"}), + ("boron", {"branch": "master", "jdks": "openjdk8"}), + ("beryllium", {"branch": "stable/beryllium", "jdks": "openjdk8"}), ("stable-lithium", {"branch": "stable/lithium", "jdks": "openjdk7"}), ("stable-helium", {"branch": "stable/helium", "jdks": "openjdk7"}), ])