Merge "Add example for release-notes param description"

diff --git a/global-jjb b/global-jjb
index 905318304cfc9faed813df54965b0b32d4abc3c1..8ed761356296d6dfb78f01bbe44d5bbb75be11a1 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 905318304cfc9faed813df54965b0b32d4abc3c1
+Subproject commit 8ed761356296d6dfb78f01bbe44d5bbb75be11a1

diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh
index 7d81b33a24929ef7a53ff149ac14ad594bef943f..a4844be2662f65a8e58b5c2d57b148db39c97b8e 100644 (file)
--- a/jjb/autorelease/version-bump.sh
+++ b/jjb/autorelease/version-bump.sh
@@ -59,9 +59,9 @@ fi
 lftools version bump "$RELEASE_TAG"
 
 # Ignore changes to Final distribution since that will be released separately
-pushd integration/distribution || exit 1
-    git checkout -f opendaylight/pom.xml
-popd || exit 1
+pushd integration/distribution || true
+    git checkout -f opendaylight/pom.xml || true
+popd || true
 
 git submodule foreach "git commit -asm 'Bump versions by x.y.(z+1)'"
 # Only submodules need to be bumped, we can ignore autorelease's bump information

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 6912484e3ff33213e3ddd5937e931f333442caf7..afc86d26eec2183ebba46f9237f7e62380f347ad 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -850,6 +850,7 @@ for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
         # but in the meantime do it ourselves
         ssh ${!CONTROLIP} "sudo ovs-vsctl set Open_vSwitch . external_ids:of-tunnel=true"
     fi
+    fix_libvirt_python_build ${!CONTROLIP}
     echo "Stack the control node ${i} of ${NUM_OPENSTACK_CONTROL_NODES}: ${CONTROLIP}"
     ssh ${!CONTROLIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh ${!CONTROLIP} "ps -ef | grep stack.sh"

diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh
index 26e68becdf2288c4d89f867986242fe309cbdb68..e1e398ab05395f568510efa5272ed674a5979ed8 100644 (file)
--- a/jjb/opendaylight-infra-stack.sh
+++ b/jjb/opendaylight-infra-stack.sh
@@ -16,6 +16,9 @@ else
     cd /builder/openstack-hot || exit 1
 fi
 
+# openstack cli is failing with the decorator package
+sudo pip install --upgrade --quiet decorator
+
 JOB_SUM=$(echo "$JOB_NAME" | sum | awk '{{ print $1 }}')
 VM_NAME="$JOB_SUM-$BUILD_NUMBER"
 

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 2f120cdcbf78c25c6ae89cc14af37016f9cd3813..9cea36fac69b2dcf03d53573b908bca89707b77d 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -161,6 +161,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - inject:
           properties-content: |
               STREAM={stream}
@@ -615,6 +616,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - shell: !include-raw: build-deb.sh
       - install-test-uninstall-deb
       - lf-infra-deploy-maven-file: