Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes the functional test suite #113

Merged
merged 1 commit into from
Dec 15, 2015
Merged

Fixes the functional test suite #113

merged 1 commit into from
Dec 15, 2015

Conversation

adamhjk
Copy link
Contributor

@adamhjk adamhjk commented Dec 15, 2015

This commit fixes the functional test suite, along with some cleanup for
bldr-build as a whole.

  • It adds a 'make bldr' target in plans, which will generate a bldr
    package and image.
  • It checks for the gnu version of sort and mktemp. This fixes a bug if busybox is
    installed.
  • It prefers installed packages over the repository. If a pacakge for a
    dep already exists, we use it. We only install if we don't have one.
    This is probably not the right behavior long term (you would want to
    look at the local version and the remote, make sure they are the same,
    and install if they aren't)
  • Adds a plan for patchelf
  • Adds a set_rpath() function to bldr-build that uses patchelf to patch
    binaries if it exists.
  • Fixes a bug with the generated docker container that was not using the
    qualified form of a service on startup
  • Restores the Dockerfile needed to build a bldr/base image.
  • Copies only the files that make up the latest package for every
    package we need in the base image, making the resulting image small
    again.
  • Lets the bldr package not install bldr twice; assumes we either have
    the dependencies, or we are building from scratch.
  • Ignores a doc-test that was failing due to not having a macro
    imported, that wasn't trying to run prior to rust 1.5.

gif-keyboard-13819046243916520702

This commit fixes the functional test suite, along with some cleanup for
bldr-build as a whole.

* It adds a 'make bldr' target in plans, which will generate a bldr
  package and image.
* It checks for the gnu version of sort and mktemp. This fixes a bug if busybox is
  installed.
* It prefers installed packages over the repository. If a pacakge for a
  dep already exists, we use it. We only install if we don't have one.
  This is probably not the right behavior long term (you would want to
  look at the local version and the remote, make sure they are the same,
  and install if they aren't)
* Adds a plan for patchelf
* Adds a set_rpath() function to bldr-build that uses patchelf to patch
  binaries if it exists.
* Fixes a bug with the generated docker container that was not using the
  qualified form of a service on startup
* Restores the Dockerfile needed to build a bldr/base image.
* Copies only the files that make up the latest package for every
  package we need in the base image, making the resulting image small
  again.
* Lets the bldr package not install bldr twice; assumes we either have
  the dependencies, or we are building from scratch.
* Ignores a doc-test that was failing due to not having a macro
  imported, that wasn't trying to run prior to rust 1.5.
@@ -4,12 +4,13 @@ pkg_version=5.2.1
pkg_license=('GPLv2' 'LGPLv2.1')
pkg_source=http://ftp.gnu.org/gnu/libc/${pkg_name}-${pkg_version}.tar.bz2
pkg_deps=(chef/glibc chef/libgcc)
pkg_dev_deps=(chef/patchelf)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably pkg_build_deps=(chef/patchelf)?

@chef-delivery
Copy link
Contributor

This PR has passed 'Verify' and is ready for review and approval!
Use: '@delivery approve' when code review is complete.

@fnichol
Copy link
Collaborator

fnichol commented Dec 15, 2015

A few small things here, but I'll circle back to these on my next PR. In the interests of a green pipeline, I'm going to @delivery approve

gif-keyboard-14493012628933367797

@chef-delivery
Copy link
Contributor

Failed to unknown change: afd293a2-0443-4773-9e08-9b67609a14c7
Delivery does not understand this command. @fnichol

@fnichol
Copy link
Collaborator

fnichol commented Dec 15, 2015

@delivery approve

chef-delivery added a commit that referenced this pull request Dec 15, 2015
Merged change afd293a2-0443-4773-9e08-9b67609a14c7

From review branch fix-tests into master

Signed-off-by: fnichol <[email protected]>
@chef-delivery chef-delivery merged commit 5333676 into master Dec 15, 2015
@chef-delivery chef-delivery deleted the fix-tests branch December 15, 2015 21:56
@chef-delivery
Copy link
Contributor

Change: afd293a2-0443-4773-9e08-9b67609a14c7 approved by: @fnichol

@fnichol
Copy link
Collaborator

fnichol commented Dec 15, 2015

Geez @delivery, get with the GIFs why don't 'cha?

@chef-delivery
Copy link
Contributor

Failed to unknown change: afd293a2-0443-4773-9e08-9b67609a14c7
Delivery does not understand this command. @fnichol

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants