diff options
| -rw-r--r-- | fuel/build/Makefile | 7 | ||||
| -rw-r--r-- | fuel/build/docker/ubuntu-builder/Dockerfile | 2 | ||||
| -rw-r--r-- | fuel/build/fuel-agent_1.patch | 36 |
3 files changed, 1 insertions, 44 deletions
diff --git a/fuel/build/Makefile b/fuel/build/Makefile index ba4beaf39..437b793b1 100644 --- a/fuel/build/Makefile +++ b/fuel/build/Makefile @@ -86,13 +86,6 @@ $(ISOCACHE): # cd /tmp/fuel-main && ./prepare-build-env.sh cd /tmp/fuel-main && make repos - # Patch for speeding up image creation in virtual environments, - # https://review.openstack.org/#/c/197943/ - cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-agent_1.patch - cd /tmp/fuel-main/build/repos/nailgun && git config --global user.email "build$opnfv.org" - cd /tmp/fuel-main/build/repos/nailgun && git config --global user.name "OPNFV build" - cd /tmp/fuel-main/build/repos/nailgun && git add -u . - cd /tmp/fuel-main/build/repos/nailgun && git commit -m "Added patch" # cd /tmp/fuel-main && make iso mv /tmp/fuel-main/build/artifacts/fuel*.iso . diff --git a/fuel/build/docker/ubuntu-builder/Dockerfile b/fuel/build/docker/ubuntu-builder/Dockerfile index 81cdc43fb..d568acd0e 100644 --- a/fuel/build/docker/ubuntu-builder/Dockerfile +++ b/fuel/build/docker/ubuntu-builder/Dockerfile @@ -14,7 +14,7 @@ RUN apt-get update RUN apt-get install -y software-properties-common python-software-properties \ make python-setuptools python-all dpkg-dev debhelper \ fuseiso git genisoimage bind9-host wget curl lintian tmux lxc iptables \ - ca-certificates sudo apt-utils lsb-release dosfstools + ca-certificates sudo apt-utils lsb-release dosfstools debmirror RUN echo "ALL ALL=NOPASSWD: ALL" > /etc/sudoers.d/open-sudo RUN chmod 0440 /etc/sudoers.d/open-sudo diff --git a/fuel/build/fuel-agent_1.patch b/fuel/build/fuel-agent_1.patch deleted file mode 100644 index b0808966f..000000000 --- a/fuel/build/fuel-agent_1.patch +++ /dev/null @@ -1,36 +0,0 @@ -*** build/repos/nailgun/fuel_agent/fuel_agent/manager.py.orig Thu Sep 24 11:08:38 2015 ---- build/repos/nailgun/fuel_agent/fuel_agent/manager.py Thu Sep 24 11:10:25 2015 -*************** -*** 541,546 **** ---- 541,552 ---- - fs_options=fs.options, - fs_label=fs.label, - dev=str(fs.device)) -+ if fs.type == 'ext4': -+ LOG.debug('Trying to disable journaling for ext4 ' -+ 'in order to speed up the build') -+ utils.execute('tune2fs', '-O', '^has_journal', -+ str(fs.device)) -+ - - # mounting all images into chroot tree - self.mount_target(chroot, treat_mtab=False, pseudo=False) -*************** -*** 631,636 **** ---- 637,652 ---- - self.umount_target(chroot, pseudo=False, try_lazy_umount=False) - - for image in self.driver.image_scheme.images: -+ # find fs with the same loop device object -+ # as image.target_device -+ fs = self.driver.partition_scheme.fs_by_device( -+ image.target_device) -+ -+ if fs.type == 'ext4': -+ LOG.debug('Trying to re-enable journaling for ext4') -+ utils.execute('tune2fs', '-O', 'has_journal', -+ str(fs.device)) -+ - LOG.debug('Deattaching loop device from file: %s', - image.img_tmp_file) - bu.deattach_loop(str(image.target_device)) |