MAAS

Merge ~cgrabowski/maas:revert_vendoring_and_backport_master_vendoring into maas:3.2

  1. Git
  2. lp:~cgrabowski/maas
  3. revert_vendoring_and_backport_master_vendoring
  4. Merge into 3.2
Proposed by Christian Grabowski
Status: Merged
Approved by: Christian Grabowski
Approved revision: 8d1ed20716d6fc60c0cdb261dcacf082da2d9402
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~cgrabowski/maas:revert_vendoring_and_backport_master_vendoring
Merge into: maas:3.2
Diff against target: 85 lines (+16/-11)
3 files modified
Makefile (+4/-8)
debian/rules (+2/-1)
src/host-info/Makefile (+10/-2)
Reviewer Review Type Date Requested Status
Diego Mascialino (community) Approve
MAAS Lander Approve
Review via email: mp+428870@code.launchpad.net

Commit message

fix go build in the snap (first vendor dependencies, then build binaries)
(cherry picked from commit 02cde9449e00b90929cd97b91f8d88ec96d9e105)

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b revert_vendoring_and_backport_master_vendoring lp:~cgrabowski/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 23b90a9a555c626a58e2b19f97ae89298b62ab82

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b revert_vendoring_and_backport_master_vendoring lp:~cgrabowski/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 8d1ed20716d6fc60c0cdb261dcacf082da2d9402

review: Approve
Revision history for this message
Diego Mascialino (dmascialino) wrote :

looks good

review: Approve

Update scan failed

At least one of the branches involved have failed to scan. You can manually schedule a rescan if required.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/Makefile b/Makefile
index 428458c..2826aba 100644
--- a/Makefile
+++ b/Makefile
@@ -117,12 +117,8 @@ $(UI_BUILD):
117$(OFFLINE_DOCS):117$(OFFLINE_DOCS):
118 $(MAKE) -C src/maas-offline-docs118 $(MAKE) -C src/maas-offline-docs
119119
120go-bin-vendor:120go-bins:
121 $(MAKE) -C src/host-info vendor121 $(MAKE) -j -C src/host-info build
122.PHONY: go-bin-vendor
123
124go-bins: go-bin-vendor
125 $(MAKE) -C src/host-info build
126.PHONY: go-bins122.PHONY: go-bins
127123
128test: test-missing-migrations test-py124test: test-missing-migrations test-py
@@ -324,7 +320,7 @@ go_bins_vendor := src/host-info/vendor
324 -o $(packaging-build-area)/$(packaging-orig-tar) HEAD320 -o $(packaging-build-area)/$(packaging-orig-tar) HEAD
325 tar -rf $(packaging-build-area)/$(packaging-orig-tar) $(UI_BUILD) $(OFFLINE_DOCS) \321 tar -rf $(packaging-build-area)/$(packaging-orig-tar) $(UI_BUILD) $(OFFLINE_DOCS) \
326 --transform 's,^,$(packaging-dir)/,'322 --transform 's,^,$(packaging-dir)/,'
327 $(MAKE) go-bin-vendor323 $(MAKE) -C src/host-info vendor
328 tar -rf $(packaging-build-area)/$(packaging-orig-tar) $(go_bins_vendor) \324 tar -rf $(packaging-build-area)/$(packaging-orig-tar) $(go_bins_vendor) \
329 --transform 's,^,$(packaging-dir)/,'325 --transform 's,^,$(packaging-dir)/,'
330 gzip -f $(packaging-build-area)/$(packaging-orig-tar)326 gzip -f $(packaging-build-area)/$(packaging-orig-tar)
@@ -335,7 +331,7 @@ go_bins_vendor := src/host-info/vendor
335 xargs tar --transform 's,^,$(packaging-dir)/,' -cf $(packaging-build-area)/$(packaging-orig-tar)331 xargs tar --transform 's,^,$(packaging-dir)/,' -cf $(packaging-build-area)/$(packaging-orig-tar)
336 tar -rf $(packaging-build-area)/$(packaging-orig-tar) $(UI_BUILD) $(OFFLINE_DOCS) \332 tar -rf $(packaging-build-area)/$(packaging-orig-tar) $(UI_BUILD) $(OFFLINE_DOCS) \
337 --transform 's,^,$(packaging-dir)/,'333 --transform 's,^,$(packaging-dir)/,'
338 $(MAKE) go-bin-vendor334 $(MAKE) -C src/host-info vendor
339 tar -rf $(packaging-build-area)/$(packaging-orig-tar) $(go_bins_vendor) \335 tar -rf $(packaging-build-area)/$(packaging-orig-tar) $(go_bins_vendor) \
340 --transform 's,^,$(packaging-dir)/,'336 --transform 's,^,$(packaging-dir)/,'
341 gzip -f $(packaging-build-area)/$(packaging-orig-tar)337 gzip -f $(packaging-build-area)/$(packaging-orig-tar)
diff --git a/debian/rules b/debian/rules
index 968519a..33b52bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,8 @@ override_dh_auto_install:
3838
39 # Build and move lxd commissioning binaries39 # Build and move lxd commissioning binaries
40 install -d -m 755 $(CURDIR)/debian/tmp/usr/share/maas/machine-resources40 install -d -m 755 $(CURDIR)/debian/tmp/usr/share/maas/machine-resources
41 make -C $(CURDIR)/src/host-info build41 # dependencies are already vendored, skip vendoring
42 make -C $(CURDIR)/src/host-info build-no-vendor
42 mv $(CURDIR)/src/host-info/bin/machine-resources/* \43 mv $(CURDIR)/src/host-info/bin/machine-resources/* \
43 $(CURDIR)/debian/tmp/usr/share/maas/machine-resources/44 $(CURDIR)/debian/tmp/usr/share/maas/machine-resources/
4445
diff --git a/src/host-info/Makefile b/src/host-info/Makefile
index 167f12a..9655b27 100644
--- a/src/host-info/Makefile
+++ b/src/host-info/Makefile
@@ -32,12 +32,19 @@ GO_BUILD := CGO_ENABLED=0 go build -mod=vendor -ldflags '-s -w -extldflags "-sta
3232
33$(MACHINE_RESOURCES_BINARIES): TARGET_DIR=$(PACKAGE_DIR)33$(MACHINE_RESOURCES_BINARIES): TARGET_DIR=$(PACKAGE_DIR)
34$(HARDWARE_SYNC_BINARIES): TARGET_DIR=$(HARDWARE_SYNC_DIR)34$(HARDWARE_SYNC_BINARIES): TARGET_DIR=$(HARDWARE_SYNC_DIR)
35$(HARDWARE_SYNC_BINARIES) $(MACHINE_RESOURCES_BINARIES): vendor35$(HARDWARE_SYNC_BINARIES) $(MACHINE_RESOURCES_BINARIES):
36 GOARCH=$(DEB_GO_ARCH_$(notdir $@)) $(GO_BUILD) -o $@ $(TARGET_DIR)36 GOARCH=$(DEB_GO_ARCH_$(notdir $@)) $(GO_BUILD) -o $@ $(TARGET_DIR)
3737
38build: $(MACHINE_RESOURCES_BINARIES)38build:
39# call targets separately to work with parallel builds
40 $(MAKE) vendor/modules.txt
41 $(MAKE) $(MACHINE_RESOURCES_BINARIES) $(HARDWARE_SYNC_BINARIES)
39.PHONY: build42.PHONY: build
4043
44# don't vendor dependencies before building binaries
45build-no-vendor: $(MACHINE_RESOURCES_BINARIES) $(HARDWARE_SYNC_BINARIES)
46.PHONY: build-no-vendor
47
41clean:48clean:
42 rm -rf $(BINDIR) $(VENDOR_DIR)49 rm -rf $(BINDIR) $(VENDOR_DIR)
43.PHONY: clean50.PHONY: clean
@@ -51,6 +58,7 @@ install: $(MACHINE_RESOURCES_BINARIES)
51.PHONY: install58.PHONY: install
5259
53vendor: vendor/modules.txt60vendor: vendor/modules.txt
61.PHONY: vendor
5462
55vendor/modules.txt: go.mod63vendor/modules.txt: go.mod
56 go mod vendor64 go mod vendor

Subscribers

People subscribed via source and target branches