MAAS

Merge lp:~allenap/maas/only-ignore-conf-in-run into lp:~maas-committers/maas/trunk

  1. only-ignore-conf-in-run
  2. Merge into trunk
Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 5669
Proposed branch: lp:~allenap/maas/only-ignore-conf-in-run
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 33 lines (+4/-8)
2 files modified
.bzrignore (+2/-4)
.gitignore (+2/-4)
To merge this branch: bzr merge lp:~allenap/maas/only-ignore-conf-in-run
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+315648@code.launchpad.net

Commit message

Ignore only etc/maas/{rackd,regiond}.conf in run/ now that each test runs with a pristine MAAS_ROOT.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) :
review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (1.7 MiB)

The attempt to merge lp:~allenap/maas/only-ignore-conf-in-run into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Hit:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease
Hit:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Get:4 http://security.ubuntu.com/ubuntu xenial-security InRelease [102 kB]
Fetched 102 kB in 0s (206 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind avahi-utils bash bind9 bind9utils build-essential bzr bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common isc-dhcp-server libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libnss-wrapper libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-attr python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-netaddr python3-netifaces python3-novaclient python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
authbind is already the newest version (2.1.1+nmu1).
avahi-utils is already the newest version (0.6.32~rc+dfsg-1ubuntu2).
build-essential is already the newest version (12.1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
git is already the newest version (1:2.7.4-0ubuntu1).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-yui3-full is already the newest version (3.5.1-1ubuntu3).
libjs-yui3-min is already the newest version (3.5.1-1ubuntu3).
make is already the newest version (4.1-6).
postgresql is already the newest version (9.5+173).
pxelinux is already the newest version (3:6.03+dfsg-11ubuntu1).
python-formencode is already the newest version (1.3.0-0ubuntu5).
python-lxml is already the newest version (3.5.0-1build1).
python-netaddr is already the newest version (0.7.18-1).
python-netifaces is already the newest version (0.10.4-0.1build2).
python-psycopg2 is alrea...

Revision history for this message
Gavin Panella (allenap) wrote :

Unrelated failure. Trying again.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2016-09-07 15:04:32 +0000
3+++ .bzrignore 2017-01-26 07:51:30 +0000
4@@ -36,10 +36,8 @@
5 ./run-e2e/*
6 ./run-e2e/etc/*
7 ./run-e2e/etc/maas/*
8-./run/*
9-./run/etc/*
10-./run/etc/maas/*
11-./run/etc/ntp/*
12+./run/etc/maas/rackd.conf
13+./run/etc/maas/regiond.conf
14 ./services/*/supervise
15 ./src/maasserver/static/js/enums.js
16 ./TAGS
17
18=== modified file '.gitignore'
19--- .gitignore 2016-09-07 15:04:32 +0000
20+++ .gitignore 2017-01-26 07:51:30 +0000
21@@ -36,10 +36,8 @@
22 /run-e2e/*
23 /run-e2e/etc/*
24 /run-e2e/etc/maas/*
25-/run/*
26-/run/etc/*
27-/run/etc/maas/*
28-/run/etc/ntp/*
29+/run/etc/maas/rackd.conf
30+/run/etc/maas/regiond.conf
31 /services/*/supervise
32 /src/maasserver/static/js/enums.js
33 /TAGS