MAAS

Merge ~adam-collard/maas:debug-machine-resources-build into maas:master

Proposed by Adam Collard on 2020-11-18

Status:	Rejected
Rejected by:	Adam Collard on 2020-11-20
Proposed branch:	~adam-collard/maas:debug-machine-resources-build
Merge into:	maas:master
Diff against target:	152 lines (+68/-8) 3 files modified snap/snapcraft.yaml (+2/-0) src/machine-resources/Makefile (+6/-1) src/machine-resources/src/machine-resources/Gopkg.lock (+60/-7)
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
MAAS Lander	unittests		Pending
MAAS Maintainers		2020-11-18	Pending
Review via email: mp+394118@code.launchpad.net

Commit message

Add debug information when building machine-resources

~adam-collard/maas:debug-machine-resources-build updated on 2020-11-19

b7a7e87... by Adam Collard on 2020-11-19: Reduce number of parallel jobs when building machine-resources
1e140f0... by Adam Collard on 2020-11-19: Sync the FS after building
2248265... by Adam Collard on 2020-11-19: Add gcc-multilib as build-time dependency for machine-resource
26d493f... by Adam Collard on 2020-11-19: Revert previous commit, try bumping deps
b7b5a27... by Adam Collard on 2020-11-19: print workdir
4d8e766... by Adam Collard on 2020-11-19: More debugging :(
2cdf9ed... by Adam Collard on 2020-11-19: More debugging :((
a120b6b... by Adam Collard on 2020-11-19: More debugging :(((
caf437b... by Adam Collard on 2020-11-19: Try explicit output dir

Unmerged commits

caf437b... by Adam Collard on 2020-11-19: Try explicit output dir
a120b6b... by Adam Collard on 2020-11-19: More debugging :(((
2cdf9ed... by Adam Collard on 2020-11-19: More debugging :((
4d8e766... by Adam Collard on 2020-11-19: More debugging :(
b7b5a27... by Adam Collard on 2020-11-19: print workdir
26d493f... by Adam Collard on 2020-11-19: Revert previous commit, try bumping deps
2248265... by Adam Collard on 2020-11-19: Add gcc-multilib as build-time dependency for machine-resource
1e140f0... by Adam Collard on 2020-11-19: Sync the FS after building
b7a7e87... by Adam Collard on 2020-11-19: Reduce number of parallel jobs when building machine-resources
8cc9513... by Adam Collard on 2020-11-18: Add debug information when building machine-resources

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Adam Collard

MAAS Committers

Matvej Jurbin

Shane Holloman

 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
 index c0a11c4..3e05cac 100644
 --- a/snap/snapcraft.yaml
 +++ b/snap/snapcraft.yaml
@@ -233,6 +233,8 @@ parts:
    machine-resources:
      plugin: make
++    make-parameters:
++      - --jobs=1
      source: src/machine-resources
      build-snaps:
        - go
 diff --git a/src/machine-resources/Makefile b/src/machine-resources/Makefile
 index 25a12d8..876f3b8 100644
 --- a/src/machine-resources/Makefile
 +++ b/src/machine-resources/Makefile
@@ -28,7 +28,12 @@ build: $(BINARIES)
  .PHONY: build
  $(BINARIES): $(PACKAGE_VENDOR_DIR) $(PACKAGE_DIR)/main.go
--	GOCACHE=$(GO_CACHE_DIR) GOARCH=$(GOARCH_$(notdir $@)) go build -ldflags '-s -w' -o $@ machine-resources
++	pwd
++	echo $(GOPATH)
++	GOCACHE=$(GO_CACHE_DIR) GOARCH=$(GOARCH_$(notdir $@)) go build -work -x -ldflags '-s -w' -o $(CURDIR)/$@ machine-resources 2>&1 | sed -e 's/^/[$(GOARCH_$(notdir $@))] /' 1>&2
++	sync
++	sync
++	ls -la
  $(PACKAGE_VENDOR_DIR) vendor:
  	rm -rf $(PACKAGE_VENDOR_DIR)
 diff --git a/src/machine-resources/src/machine-resources/Gopkg.lock b/src/machine-resources/src/machine-resources/Gopkg.lock
 index fbd28e4..b061b5b 100644
 --- a/src/machine-resources/src/machine-resources/Gopkg.lock
 +++ b/src/machine-resources/src/machine-resources/Gopkg.lock
@@ -2,56 +2,109 @@
  [[projects]]
++  digest = "1:0675c37c9ab84b1be69979619609bfb3b3fa008679b36cd34944c71b5295af4a"
    name = "github.com/flosch/pongo2"
    packages = ["."]
--  revision = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9"
--  version = "v3.0"
++  pruneopts = ""
++  revision = "f946812ec8d53b724e4daeb888c95ab63c98b3c0"
++  version = "v4.0.0"
  [[projects]]
++  digest = "1:25eec675540d3cf690b593f161626a8bbf1d25e60d5cc8f8d51f38c467a32766"
++  name = "github.com/google/uuid"
++  packages = ["."]
++  pruneopts = ""
++  revision = "0e4e31197428a347842d152773b4cace4645ca25"
++  version = "v1.1.2"
++
++[[projects]]
++  digest = "1:5122b0b5a933bd0e16b887aa7844933c8a09fb5ba9b5f5651253cb5336c6462a"
    name = "github.com/gorilla/websocket"
    packages = ["."]
++  pruneopts = ""
    revision = "b65e62901fc1c0d968042419e74789f6af455eb9"
    version = "v1.4.2"
  [[projects]]
++  digest = "1:0c9cf259a0f3c81866f5fd5f8c11827542f7b8c917d59dafa0730f1bc73b66a8"
    name = "github.com/jaypipes/pcidb"
    packages = ["."]
++  pruneopts = ""
    revision = "98ef3ee36c69f20650fe7855047ad042338c6983"
    version = "v0.5.0"
  [[projects]]
    branch = "master"
++  digest = "1:0ab775b6006b2d1951209ef559c5add147195d0f77b284105961f78f097466ce"
    name = "github.com/lxc/lxd"
--  packages = ["lxd/include","lxd/resources","shared","shared/api","shared/cancel","shared/ioprogress","shared/logger","shared/osarch","shared/units","shared/usbid","shared/validate","shared/version"]
--  revision = "4c7cd25c6842f49f3a29468aa745ee97651d42bd"
++  packages = [
++    "lxd/include",
++    "lxd/resources",
++    "shared",
++    "shared/api",
++    "shared/cancel",
++    "shared/ioprogress",
++    "shared/logger",
++    "shared/osarch",
++    "shared/units",
++    "shared/usbid",
++    "shared/validate",
++    "shared/version",
++  ]
++  pruneopts = ""
++  revision = "0213e78fbad4c1f4c549bcef84ba54fb4df54348"
  [[projects]]
++  digest = "1:6dbb0eb72090871f2e58d1e37973fe3cb8c0f45f49459398d3fc740cb30e13bd"
    name = "github.com/mitchellh/go-homedir"
    packages = ["."]
++  pruneopts = ""
    revision = "af06845cf3004701891bf4fdb884bfe4920b3727"
    version = "v1.1.0"
  [[projects]]
++  digest = "1:ce2a988688eca16ba1646676d3880b2e27cec585c1c4d63d31281c2c0001b1a6"
++  name = "github.com/pborman/uuid"
++  packages = ["."]
++  pruneopts = ""
++  revision = "5b6091a6a160ee5ce12917b21ab96acec2a4fdc0"
++  version = "v1.2.1"
++
++[[projects]]
++  digest = "1:c45802472e0c06928cd997661f2af610accd85217023b1d5f6331bebce0671d3"
    name = "github.com/pkg/errors"
    packages = ["."]
++  pruneopts = ""
    revision = "614d223910a179a466c1767a985424175c39b465"
    version = "v0.9.1"
  [[projects]]
    branch = "master"
++  digest = "1:3d2a2835773ff2a9149219731e5acb01cc3dd0f46cc503bf2575c584eea4dfac"
    name = "golang.org/x/sys"
--  packages = ["internal/unsafeheader","unix","windows"]
--  revision = "0cf7623e9dbd9bc79267b27a7e6c5757ef550423"
++  packages = [
++    "internal/unsafeheader",
++    "unix",
++    "windows",
++  ]
++  pruneopts = ""
++  revision = "f84b799fce68db3cb46a8f6f819c1e56377181df"
  [[projects]]
    branch = "v2"
++  digest = "1:92a9d3d81fc5b50d5ccf0c72b9888cd27acf277894f8aa18f4c9c41de8311555"
    name = "gopkg.in/robfig/cron.v2"
    packages = ["."]
++  pruneopts = ""
    revision = "be2e0b0deed5a68ffee390b4583a13aff8321535"
  [solve-meta]
    analyzer-name = "dep"
    analyzer-version = 1
--  inputs-digest = "0aa702d9956536c2ac11ab31b412046932bc18980bb395c40153f94d457e48c6"
++  input-imports = [
++    "github.com/lxc/lxd/lxd/resources",
++    "github.com/lxc/lxd/shared",
++    "github.com/lxc/lxd/shared/version",
++  ]
    solver-name = "gps-cdcl"
    solver-version = 1