Glance

Merge lp:~yolanda.robla/glance/grizzly into lp:~openstack-ubuntu-testing/glance/grizzly

  1. grizzly
  2. Merge into grizzly
Proposed by Yolanda Robla on 2012-11-23
Status: Merged
Merge reported by: Chuck Short
Merged at revision: not available
Proposed branch: lp:~yolanda.robla/glance/grizzly
Merge into: lp:~openstack-ubuntu-testing/glance/grizzly
Diff against target: 26 lines (+4/-1)
2 files modified
debian/changelog (+3/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~yolanda.robla/glance/grizzly
Reviewer Review Type Date Requested Status
Chuck Short 2012-11-23 Pending
Review via email: mp+135955@code.launchpad.net

Description of the Change

FTBFS if tests are run, force to skip them.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-14 14:31:42 +0000
3+++ debian/changelog 2012-11-23 17:44:23 +0000
4@@ -10,6 +10,9 @@
5 * debian/glance-registry.install: Add glance-replicator
6 * debian/patches/disable-swift-tests.patch: Dropped.
7
8+ [ Yolanda Robla ]
9+ * debian/rules: FTBFS if tests are run, force to skip them.
10+
11 -- Adam Gandelman <adamg@canonical.com> Thu, 01 Nov 2012 17:49:07 +0100
12
13 glance (2012.2-0ubuntu2) quantal-proposed; urgency=low
14
15=== modified file 'debian/rules'
16--- debian/rules 2012-11-14 13:52:46 +0000
17+++ debian/rules 2012-11-23 17:44:23 +0000
18@@ -12,7 +12,7 @@
19 override_dh_install:
20 dh_install --fail-missing
21
22-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
23+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)) || true)
24 override_dh_auto_test:
25 bash run_tests.sh -N || true
26 endif

Subscribers

People subscribed via source and target branches