From: Vratko Polák Date: Thu, 4 May 2017 08:22:41 +0000 (+0000) Subject: Merge "Fix iotdm.yaml for nitrogen and carbon" X-Git-Tag: release/carbon~65 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=78480bb36c6d78f1b68263b01be08330ecb46395;hp=548875c8d124218c4f8b1c0decb47880db2f2506;p=releng%2Fbuilder.git Merge "Fix iotdm.yaml for nitrogen and carbon" --- diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index 67652eab3..f88c21a50 100644 --- a/jjb/autorelease/autorelease-macros.yaml +++ b/jjb/autorelease/autorelease-macros.yaml @@ -133,8 +133,12 @@ name: autorelease-generate-release-notes builders: - shell: | - cd $WORKSPACE/scripts/release_notes_management - java -jar target/autonotes.jar + # TODO: Remove this condition once stable/beryllium is no longer + # officially maintained. + if [ "$GERRIT_BRANCH" != "stable/beryllium" ]; then + cd $WORKSPACE/scripts/release_notes_management + java -jar target/autonotes.jar + fi - publisher: # include-raw-autorelease-notify-build-failure.sh searches console log for diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 01af1d3c9..524a67a3d 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -493,6 +493,7 @@ -Pintegrationtests,docs,repoBuild -Dcheckstyle.skip=true -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage + -Dskip.karaf.featureTest=true -fn {opendaylight-infra-mvn-opts} java-opts: diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index ee96bf9d3..9723dd4cb 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -128,14 +128,14 @@ fail-on-missing: true - project: 'integration-distribution-test-{integration-test}' condition: FAILED - predefined-parameters: BUNDLE_URL=last + trigger-with-no-params: true - project: 'integration-sanity-test-{integration-test}' condition: UNSTABLE_OR_BETTER property-file: variables.jenkins-trigger fail-on-missing: true - project: 'integration-sanity-test-{integration-test}' condition: FAILED - predefined-parameters: BUNDLE_URL=last + trigger-with-no-params: true - project: 'packaging-build-rpm-master' condition: UNSTABLE_OR_BETTER predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh index f33d2b281..c3e110fd5 100644 --- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh +++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh @@ -389,6 +389,8 @@ do ${SSH} "${!CONTROLLERIP}" "cp -r /tmp/${BUNDLEFOLDER}/data/log /tmp/odl_log" ${SSH} "${!CONTROLLERIP}" "tar -cf /tmp/odl${i}_karaf.log.tar /tmp/odl_log/*" scp "${!CONTROLLERIP}:/tmp/odl${i}_karaf.log.tar" "${WORKSPACE}/odl${i}_karaf.log.tar" + ${SSH} "${!CONTROLLERIP}" "tar -cf /tmp/odl${i}_zrpcd.log.tar /tmp/zrpcd.init.log" + scp "${!CONTROLLERIP}:/tmp/odl${i}_zrpcd.log.tar" "${WORKSPACE}/odl${i}_zrpcd.log.tar" tar -xvf ${WORKSPACE}/odl${i}_karaf.log.tar -C . --strip-components 2 --transform s/karaf/odl${i}_karaf/g grep "ROBOT MESSAGE\| ERROR " odl${i}_karaf.log > odl${i}_err.log grep "ROBOT MESSAGE\|Exception" odl${i}_karaf.log > odl${i}_exception.log diff --git a/jjb/opendaylight-infra-push-gerrit-patch.sh b/jjb/opendaylight-infra-push-gerrit-patch.sh index 9d4988754..a7bd4afdf 100644 --- a/jjb/opendaylight-infra-push-gerrit-patch.sh +++ b/jjb/opendaylight-infra-push-gerrit-patch.sh @@ -19,4 +19,4 @@ git remote add gerrit "ssh://jenkins-$SILO@git.opendaylight.org:29418/releng/bui # Don't fail the build if this command fails because it's possible that there # is no changes since last update. # shellcheck disable=SC1083 -git review --yes -t {gerrit-topic} || true +git review --yes -t {gerrit-topic} --reviewers jluhrsen@redhat.com || true diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index 9697659c2..1fd19e887 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -294,10 +294,6 @@ netvirt-csit-1node-openstack-newton-upstream-stateful-nitrogen, netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-nitrogen, netvirt-csit-1node-openstack-newton-upstream-transparent-nitrogen, - netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-learn-nitrogen, - netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-nitrogen, - netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-learn-nitrogen, - netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-nitrogen, netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-nitrogen, netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-nitrogen, netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-nitrogen, @@ -493,10 +489,6 @@ netvirt-csit-1node-openstack-newton-upstream-stateful-carbon, netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-carbon, netvirt-csit-1node-openstack-newton-upstream-transparent-carbon, - netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-learn-carbon, - netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-carbon, - netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-learn-carbon, - netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-carbon, netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-carbon, netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-carbon, netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-carbon, @@ -677,10 +669,6 @@ netvirt-csit-1node-openstack-newton-upstream-stateful-boron, netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-boron, netvirt-csit-1node-openstack-newton-upstream-transparent-boron, - netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-learn-boron, - netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-boron, - netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-learn-boron, - netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-boron, netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-boron, netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-boron, netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-boron, diff --git a/packer/provision/java-builder.sh b/packer/provision/java-builder.sh index 57bcc1227..ad0ef81e2 100644 --- a/packer/provision/java-builder.sh +++ b/packer/provision/java-builder.sh @@ -19,6 +19,9 @@ yum install -y python34-{devel,virtualenv,setuptools,pip} # Install python dependencies, useful generally yum install -y python-{devel,virtualenv,setuptools,pip} +# Use pip to install newer version of git-review +pip install git-review --upgrade + # Needed by autorelease scripts yum install -y xmlstarlet