Merge "Fix iotdm.yaml for nitrogen and carbon"

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 67652eab39080ec48a5ecad38272d00881685931..f88c21a5013e60f22059c985d10f3db2eadadf82 100644 (file)
--- 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 01af1d3c98eab34e62133b5e2fccf8ca59ccfb2c..524a67a3dcdff69e82bf3bc6d142df74659b56f5 100644 (file)
--- 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 ee96bf9d31e7aae02b5852f47f8875663a876be1..9723dd4cbec0e1e318fecb820fd1e88463090e0a 100644 (file)
--- 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 f33d2b28133564fbd0fa9d6a448559b2aa1ba089..c3e110fd5d5fdb15f559cfc5b68c339238723b61 100644 (file)
--- 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 9d49887547e572786b2a1630f122963cde9303ab..a7bd4afdfd039bebfc343ae7d7f28e40eb4df2c8 100644 (file)
--- 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 9697659c20c620e70b5bfd4df1b147efeef6d3e9..1fd19e887fd4ff46c17de24bc463ffe1b49eb6cf 100644 (file)
--- 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 57bcc1227314ab732de45b042158ae1d1377824c..ad0ef81e2e242142bc3c5b0475ab17fc02df7f9a 100644 (file)
--- 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