Merge ~bryce/ubuntu/+source/heat:master into ubuntu/+source/heat:ubuntu/devel

Proposed by Bryce Harrington
Status: Merged
Merge reported by: Bryce Harrington
Merged at revision: 32a6115812f8669078b197429808de80905fc4a8
Proposed branch: ~bryce/ubuntu/+source/heat:master
Merge into: ubuntu/+source/heat:ubuntu/devel
Diff against target: 16 lines (+4/-0) (has conflicts)
1 file modified
debian/tests/heat-daemons (+4/-0)
Conflict in debian/tests/heat-daemons
Reviewer Review Type Date Requested Status
Christian Ehrhardt  (community) Needs Information
Review via email: mp+391390@code.launchpad.net

Description of the change

python-osprofiler and python-oslo.serialization are blocked from migration in groovy-proposed due to autotestpkg test failures for the heat package on s390x. The test passes on other architectures, and when run against earlier versions of these two packages.

The test log indicates the test is timing out after 25 seconds waiting for heat-engine to come out. However, unfortunately there is an error in the test code that makes it fail to display, so the actual error (if any) are not shown.

This patch changes 'tail -100' to 'tail -n 100' to correct this. Hopefully that will facilitate diagnosing the actual issue.

To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

This isn't really targetted at anyone - should this go to Chris maybe?
Also the diff has some oddities is the merge target right?
And finally
 python-osprofiler | 3.4.0-0ubuntu1 | groovy | source
migrated and
 python-oslo-serialization | 2.24.0-0ubuntu2 | bionic/universe | all
isn't in groovy at all.

Sorry I'm puzzled for now ...

review: Needs Information
Revision history for this message
Bryce Harrington (bryce) wrote :

Sorry, it's python-oslo.serialization not python-oslo-serialization

And yeah, I also submitted a MP to Chris with the fix for his tree.

Anyway, I went ahead and just uploaded the fix - it's trivial enough. Guessing the re-build didn't hit the timeout issue so it migrated. But next time this happens we'll have better log error messages.

Revision history for this message
Corey Bryant (corey.bryant) wrote :

Thanks Bryce, I've merged this into the real Vcs-Git branch, which lives at https://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/heat.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/tests/heat-daemons b/debian/tests/heat-daemons
2index 44c59a1..98b863b 100755
3--- a/debian/tests/heat-daemons
4+++ b/debian/tests/heat-daemons
5@@ -18,7 +18,11 @@ for daemon in "${DAEMONS[@]}"; do
6
7 if [ "$TIMEOUT" -le 0 ]; then
8 echo "ERROR: ${daemon} IS NOT RUNNING"
9+<<<<<<< debian/tests/heat-daemons
10 tail -100 /var/log/heat/*.log
11+=======
12+ tail -n 100 /var/log/heat/*.log
13+>>>>>>> debian/tests/heat-daemons
14 exit 1
15 fi
16 done

Subscribers

People subscribed via source and target branches