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.

Sign up for GitHub

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

Jump to bottom

terraform: 0.9.1 -> 0.9.2 #24505

Merged
merged 2 commits into from Apr 1, 2017
Merged

terraform: 0.9.1 -> 0.9.2 #24505

merged 2 commits into from Apr 1, 2017

Conversation

zimbatm
Copy link
Member

@zimbatm zimbatm commented Mar 31, 2017 •
edited

  • makes the generic builder open for extension
  • upgrades terraform and set the 0_9 series by default
Motivation for this change

The terraform 0.9.1 tests where failing for me.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@zimbatm, thanks for your PR! By analyzing the history of the files in this pull request, we identified @peterhoeg, @kamilchm and @siddharthist to be potential reviewers.

@zimbatm
Copy link
Member Author

zimbatm commented Mar 31, 2017 •
edited

Please don't merge yet, there is a flakey test in the kubenetes provider that needs fixing too.

=== RUN   TestDiffStringMap
=== RUN   TestDiffStringMap/0
=== RUN   TestDiffStringMap/1
=== RUN   TestDiffStringMap/2
=== RUN   TestDiffStringMap/3
=== RUN   TestDiffStringMap/4
=== RUN   TestDiffStringMap/5
--- FAIL: TestDiffStringMap (0.00s)
--
    --- PASS: TestDiffStringMap/0 (0.00s)
    --- PASS: TestDiffStringMap/1 (0.00s)
    --- PASS: TestDiffStringMap/2 (0.00s)
    --- PASS: TestDiffStringMap/3 (0.00s)
    --- PASS: TestDiffStringMap/4 (0.00s)
    --- FAIL: TestDiffStringMap/5 (0.00s)
--
=== RUN   TestIsInternalAnnotationKey/5
=== RUN   TestIsInternalAnnotationKey/6
--- PASS: TestIsInternalAnnotationKey (0.00s)
    --- PASS: TestIsInternalAnnotationKey/0 (0.00s)
    --- PASS: TestIsInternalAnnotationKey/1 (0.00s)
    --- PASS: TestIsInternalAnnotationKey/2 (0.00s)
    --- PASS: TestIsInternalAnnotationKey/3 (0.00s)
    --- PASS: TestIsInternalAnnotationKey/4 (0.00s)
    --- PASS: TestIsInternalAnnotationKey/5 (0.00s)
    --- PASS: TestIsInternalAnnotationKey/6 (0.00s)
FAIL
--
exit status 1
FAIL    github.com/hashicorp/terraform/builtin/providers/kubernetes     0.123s

@globin globin changed the title terraform: 0.9.1 -> 0.9.2 [WIP] terraform: 0.9.1 -> 0.9.2 Mar 31, 2017
@zimbatm
terraform: 0.9.1 -> 0.9.2
1afd3ce 
* makes the generic builder open for extension
* upgrades terraform and set the 0_9 series by default
@zimbatm zimbatm changed the title [WIP] terraform: 0.9.1 -> 0.9.2 terraform: 0.9.1 -> 0.9.2 Mar 31, 2017
@zimbatm
Copy link
Member Author

zimbatm commented Mar 31, 2017

all good now!

NeQuissimus
NeQuissimus reviewed Mar 31, 2017
View reviewed changes
pkgs/applications/networking/cluster/terraform/default.nix Outdated
sha256 = "1yj5x1d10028fm3v3gjyjdn128ps0as345hr50y8x3vn86n70lxl";

patches = [
(fetchurl {
Copy link
Member

Choose a reason for hiding this comment

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

Maybe use fetchPatch here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Do you mean extract it into a function? The only fetchPatch I could find in nixpkgs was at pkgs/applications/networking/irc/bip/default.nix

Copy link
Member

Choose a reason for hiding this comment

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

I think @NeQuissimus is referring to this:

pkgs/top-level/all-packages.nix
154:  fetchpatch = callPackage ../build-support/fetchpatch { };

Copy link
Member Author

Choose a reason for hiding this comment

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

My bad, case-sensitive grep :) Fixed in ae03402

@zimbatm
fixup! terraform: 0.9.1 -> 0.9.2
ae03402 
use fetchpatch to improve patch download hash stability
@NeQuissimus NeQuissimus merged commit 97210a1 into NixOS:master Apr 1, 2017
@zimbatm zimbatm deleted the terraform-0.9.2 branch April 3, 2017 00:00
@bdimcheff
Copy link
Contributor

I don't think this is working, at least on linux: https://hydra.nixos.org/job/nixpkgs/trunk/terraform_0_9_2.x86_64-linux/all

It seems to fail some test locally too.

@zimbatm
Copy link
Member Author

zimbatm commented Apr 3, 2017

Weird, I couldn't find the build logs either. Thanks for pointing it out @bdimcheff, I'll check it tonight when I have access to my Linux box

@globin
Copy link
Member

globin commented Apr 3, 2017

https://cache.nixos.org/log/am62rb1gf9w70xnk82vl9j11xhl0qjip-terraform-0.9.2.drv

A failure I'd expect, due to sandboxing:

		* data.dns_cname_record_set.foo: data.dns_cname_record_set.foo: error looking up CNAME records for "www.hashicorp.com": lookup www.hashicorp.com on [::1]:53: read udp [::1]:39299->[::1]:53: read: connection refused

@zimbatm
Copy link
Member Author

zimbatm commented Apr 3, 2017

Ah right, I suppose --option use-sandbox=true is ignored on Darwin

@zimbatm zimbatm mentioned this pull request Apr 3, 2017
Merged
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NeQuissimus NeQuissimus NeQuissimus left review comments

@peterhoeg peterhoeg peterhoeg left review comments

Assignees
No one assigned
Labels
8.has: package (update)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@zimbatm @mention-bot @bdimcheff @globin @NeQuissimus @peterhoeg