sts-sponsors team mailing list archive

Thread
Date

[Merge] ~ack/maas:no-setup-cfg-data-files into maas:master

To: mp+439798@xxxxxxxxxxxxxxxxxx
From: Alberto Donato <mp+439798@xxxxxxxxxxxxxxxxxx>
Date: Tue, 28 Mar 2023 08:05:24 -0000
In-reply-to: <167999070850.14853.15475961260313211820.launchpad@juju-4112d9-prod-launchpad-manual-servers-36.openstack.prodstack5.lan>
Reply-to: mp+439798@xxxxxxxxxxxxxxxxxx
Sender: noreply@xxxxxxxxxxxxx

Alberto Donato has proposed merging ~ack/maas:no-setup-cfg-data-files into maas:master.

Commit message:
drop use of data_files in setup.cfg, adjust deb and snap builds

This also moves the scripts/, etc/ and contrib/ dirs content to a single
package-files/ dir, with the same structure as the resulting tree.


Requested reviews:
  MAAS Lander (maas-lander): unittests
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~ack/maas/+git/maas/+merge/439798
-- 
Your team MAAS Committers is subscribed to branch maas:master.

diff --git a/MANIFEST.in b/MANIFEST.in
index c84a004..243a160 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,6 +2,7 @@ graft src/maasserver/templates
 graft src/metadataserver/templates
 graft src/metadataserver/user_data/templates
 graft src/provisioningserver/templates
+graft package-files
 include src/provisioningserver/drivers/power/*.xml
 include src/provisioningserver/refresh/*maas-*
 include src/maasserver/storage_custom_schema.yaml
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/maas-common.install b/debian/maas-common.install
index c9a522e..dd8be51 100644
--- a/debian/maas-common.install
+++ b/debian/maas-common.install
@@ -1,30 +1,24 @@
 debian/extras/99-maas-common-sudoers etc/sudoers.d
 debian/extras/nginx.conf var/lib/maas/http
-debian/tmp/usr/lib/maas/maas-delete-file
-debian/tmp/usr/lib/maas/maas-write-file
+package-files/usr/lib/maas/maas-delete-file usr/lib/maas
+package-files/usr/lib/maas/maas-write-file usr/lib/maas
 
 # Install network monitoring scripts
-debian/tmp/usr/lib/maas/network-monitor
-debian/tmp/usr/lib/maas/beacon-monitor
-debian/tmp/usr/lib/maas/dhcp-monitor
+package-files/usr/lib/maas/network-monitor usr/lib/maas
+package-files/usr/lib/maas/beacon-monitor usr/lib/maas
+package-files/usr/lib/maas/dhcp-monitor usr/lib/maas
 
 # Install unverified-ssh
 # This is used for KVM host communication:
 # https://bugs.launchpad.net/maas/+bug/1807231
-debian/tmp/usr/lib/maas/unverified-ssh
+package-files/usr/lib/maas/unverified-ssh usr/lib/maas
 
 # Install commissioning binaries
-debian/tmp/usr/share/maas/machine-resources/amd64 usr/share/maas/machine-resources
-debian/tmp/usr/share/maas/machine-resources/arm64 usr/share/maas/machine-resources
-debian/tmp/usr/share/maas/machine-resources/armhf usr/share/maas/machine-resources
-debian/tmp/usr/share/maas/machine-resources/i386 usr/share/maas/machine-resources
-debian/tmp/usr/share/maas/machine-resources/ppc64el usr/share/maas/machine-resources
-debian/tmp/usr/share/maas/machine-resources/s390x usr/share/maas/machine-resources
+debian/tmp/usr/share/maas/machine-resources usr/share/maas
 
 usr/bin/maas-common /usr/lib/maas
 etc/maas/certificates
 
 # Install MAAS observability sample configs
-debian/tmp/usr/share/maas/grafana_agent/agent.yaml.example usr/share/maas/grafana_agent
-debian/tmp/usr/share/maas/grafana_agent/env usr/share/maas/grafana_agent
-debian/tmp/usr/share/maas/promtail/promtail.yaml.example usr/share/maas/promtail
+package-files/usr/share/maas/grafana_agent usr/share/maas
+package-files/usr/share/maas/promtail usr/share/maas
diff --git a/debian/maas-rack-controller.install b/debian/maas-rack-controller.install
index 46a3abe..d3c6b4f 100644
--- a/debian/maas-rack-controller.install
+++ b/debian/maas-rack-controller.install
@@ -1,8 +1,8 @@
 # Install maas-dhcp-helper
-debian/tmp/usr/sbin/maas-dhcp-helper
+package-files/usr/sbin/maas-dhcp-helper usr/sbin
 
 # Install test scripts
-debian/tmp/usr/lib/maas/maas-test-enlistment
+package-files/usr/lib/maas/maas-test-enlistment usr/lib/maas
 
 # Install all other stuff
 debian/extras/99-maas-sudoers etc/sudoers.d
diff --git a/debian/maas-region-api.install b/debian/maas-region-api.install
index 18fcc61..113d5bb 100644
--- a/debian/maas-region-api.install
+++ b/debian/maas-region-api.install
@@ -2,13 +2,13 @@
 debian/tmp/usr/share/maas/web/static
 
 # Install Apache Config
-debian/tmp/usr/share/maas/maas-http.conf
+package-files/usr/share/maas/maas-http.conf usr/share/maas/
 
 # Install new preseed files
-debian/tmp/etc/maas/preseeds
+package-files/etc/maas/preseeds /etc/maas
 
 # Install driver configuration file
-debian/tmp/etc/maas/drivers.yaml
+package-files/etc/maas/drivers.yaml etc/maas
 
 # Install all other stuff
 usr/bin/maas-region usr/sbin
diff --git a/debian/rules b/debian/rules
index 51c077b..82abdd2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ override_dh_auto_install:
 	install -d -m 755 $(CURDIR)/debian/tmp/etc/maas/certificates
 
 	mv $(CURDIR)/debian/tmp/usr/bin/maas-power $(CURDIR)/debian/tmp/usr/bin/maas.power
-	dh_install --list-missing
+	dh_missing
 
 override_dh_auto_clean:
 	dh_auto_clean
diff --git a/etc/maas/drivers.yaml b/package-files/etc/maas/drivers.yaml
similarity index 100%
rename from etc/maas/drivers.yaml
rename to package-files/etc/maas/drivers.yaml
diff --git a/contrib/preseeds_v2/commissioning b/package-files/etc/maas/preseeds/commissioning
similarity index 100%
rename from contrib/preseeds_v2/commissioning
rename to package-files/etc/maas/preseeds/commissioning
diff --git a/contrib/preseeds_v2/curtin b/package-files/etc/maas/preseeds/curtin
similarity index 100%
rename from contrib/preseeds_v2/curtin
rename to package-files/etc/maas/preseeds/curtin
diff --git a/contrib/preseeds_v2/curtin_userdata b/package-files/etc/maas/preseeds/curtin_userdata
similarity index 100%
rename from contrib/preseeds_v2/curtin_userdata
rename to package-files/etc/maas/preseeds/curtin_userdata
diff --git a/contrib/preseeds_v2/curtin_userdata_centos b/package-files/etc/maas/preseeds/curtin_userdata_centos
similarity index 100%
rename from contrib/preseeds_v2/curtin_userdata_centos
rename to package-files/etc/maas/preseeds/curtin_userdata_centos
diff --git a/contrib/preseeds_v2/curtin_userdata_custom b/package-files/etc/maas/preseeds/curtin_userdata_custom
similarity index 100%
rename from contrib/preseeds_v2/curtin_userdata_custom
rename to package-files/etc/maas/preseeds/curtin_userdata_custom
diff --git a/contrib/preseeds_v2/curtin_userdata_suse b/package-files/etc/maas/preseeds/curtin_userdata_suse
similarity index 100%
rename from contrib/preseeds_v2/curtin_userdata_suse
rename to package-files/etc/maas/preseeds/curtin_userdata_suse
diff --git a/contrib/preseeds_v2/curtin_userdata_windows b/package-files/etc/maas/preseeds/curtin_userdata_windows
similarity index 100%
rename from contrib/preseeds_v2/curtin_userdata_windows
rename to package-files/etc/maas/preseeds/curtin_userdata_windows
diff --git a/contrib/preseeds_v2/enlist b/package-files/etc/maas/preseeds/enlist
similarity index 100%
rename from contrib/preseeds_v2/enlist
rename to package-files/etc/maas/preseeds/enlist
diff --git a/scripts/beacon-monitor b/package-files/usr/lib/maas/beacon-monitor
similarity index 100%
rename from scripts/beacon-monitor
rename to package-files/usr/lib/maas/beacon-monitor
diff --git a/scripts/dhcp-monitor b/package-files/usr/lib/maas/dhcp-monitor
similarity index 100%
rename from scripts/dhcp-monitor
rename to package-files/usr/lib/maas/dhcp-monitor
diff --git a/scripts/maas-delete-file b/package-files/usr/lib/maas/maas-delete-file
similarity index 100%
rename from scripts/maas-delete-file
rename to package-files/usr/lib/maas/maas-delete-file
diff --git a/scripts/maas-test-enlistment b/package-files/usr/lib/maas/maas-test-enlistment
similarity index 100%
rename from scripts/maas-test-enlistment
rename to package-files/usr/lib/maas/maas-test-enlistment
diff --git a/scripts/maas-write-file b/package-files/usr/lib/maas/maas-write-file
similarity index 100%
rename from scripts/maas-write-file
rename to package-files/usr/lib/maas/maas-write-file
diff --git a/scripts/network-monitor b/package-files/usr/lib/maas/network-monitor
similarity index 100%
rename from scripts/network-monitor
rename to package-files/usr/lib/maas/network-monitor
diff --git a/scripts/unverified-ssh b/package-files/usr/lib/maas/unverified-ssh
similarity index 100%
rename from scripts/unverified-ssh
rename to package-files/usr/lib/maas/unverified-ssh
diff --git a/scripts/maas-dhcp-helper b/package-files/usr/sbin/maas-dhcp-helper
similarity index 100%
rename from scripts/maas-dhcp-helper
rename to package-files/usr/sbin/maas-dhcp-helper
diff --git a/contrib/grafana_agent/agent.yaml.example b/package-files/usr/share/maas/grafana_agent/agent.yaml.example
similarity index 100%
rename from contrib/grafana_agent/agent.yaml.example
rename to package-files/usr/share/maas/grafana_agent/agent.yaml.example
diff --git a/contrib/grafana_agent/env b/package-files/usr/share/maas/grafana_agent/env
similarity index 100%
rename from contrib/grafana_agent/env
rename to package-files/usr/share/maas/grafana_agent/env
diff --git a/contrib/maas-http.conf b/package-files/usr/share/maas/maas-http.conf
similarity index 100%
rename from contrib/maas-http.conf
rename to package-files/usr/share/maas/maas-http.conf
diff --git a/contrib/promtail/promtail.yaml.example b/package-files/usr/share/maas/promtail/promtail.yaml.example
similarity index 100%
rename from contrib/promtail/promtail.yaml.example
rename to package-files/usr/share/maas/promtail/promtail.yaml.example
diff --git a/setup.cfg b/setup.cfg
index 0cd6143..4b9efd6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -52,33 +52,3 @@ pytest11 =
     maas-django = maastesting.pytest.django
     maas-seeds = maastesting.pytest.seeds
     maas-perftest = maastesting.pytest.perftest
-
-[options.data_files]
-/etc/maas =
-    etc/maas/drivers.yaml
-/usr/share/maas =
-    contrib/maas-http.conf
-/usr/share/maas/promtail =
-    contrib/promtail/promtail.yaml.example
-/usr/share/maas/grafana_agent =
-    contrib/grafana_agent/agent.yaml.example
-    contrib/grafana_agent/env
-/etc/maas/preseeds =
-    contrib/preseeds_v2/commissioning
-    contrib/preseeds_v2/enlist
-    contrib/preseeds_v2/curtin
-    contrib/preseeds_v2/curtin_userdata
-    contrib/preseeds_v2/curtin_userdata_centos
-    contrib/preseeds_v2/curtin_userdata_custom
-    contrib/preseeds_v2/curtin_userdata_suse
-    contrib/preseeds_v2/curtin_userdata_windows
-/usr/sbin =
-    scripts/maas-dhcp-helper
-/usr/lib/maas =
-    scripts/dhcp-monitor
-    scripts/beacon-monitor
-    scripts/network-monitor
-    scripts/maas-delete-file
-    scripts/maas-test-enlistment
-    scripts/maas-write-file
-    scripts/unverified-ssh
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 932c2e7..a6e9919 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -174,6 +174,8 @@ parts:
       usr/lib/curtin/helpers: usr/lib/python3/dist-packages/helpers/
     stage:
       - bin
+      - -bin/activate*
+      - -bin/Activate*
       - etc/bind
       - etc/chrony
       - etc/freeipmi
@@ -202,6 +204,7 @@ parts:
       - var/lib/ieee-data
     override-build: |
       craftctl default
+      cp -a package-files/* $CRAFT_PART_INSTALL
       # If python3-netaddr contains absolute symlinks.
       # See https://bugs.launchpad.net/snapcraft/+bug/1774410
       ln -sf ../../../../../../var/lib/ieee-data/oui.txt $CRAFT_PART_INSTALL/usr/lib/python3/dist-packages/netaddr/eui/oui.txt
diff --git a/tox.ini b/tox.ini
index 012e3a9..9f07e65 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [files]
 lint =
-    scripts/maas-delete-file \
-    scripts/maas-dhcp-helper \
+    package-files/usr/lib/maas/maas-delete-file \
+    package-files/usr/sbin/maas-dhcp-helper \
     setup.py \
     src/apiclient \
     src/maascli \