Merge pull request #1500 from bersace/peaufinage

Build noble packages

.circleci/config.yml

@@ -42,7 +42,7 @@ workflows:
           <<: *enable-for-tags
         matrix:
           parameters:
-            codename: [bookworm, bullseye, jammy]
+            codename: [bookworm, bullseye, noble, jammy]
         requires: [stage0-dist]
     - e2e: &e2e
         name: stage2-e2e-pg<< matrix.pgversion >>-<< matrix.dist >>
@@ -82,6 +82,7 @@ workflows:
         - stage1-pkg-rockylinux8
         - stage1-pkg-bookworm
         - stage1-pkg-bullseye
+        - stage1-pkg-noble
         - stage1-pkg-jammy
         filters:
           <<: *enable-for-tags
@@ -273,7 +274,7 @@ jobs:
       codename:
         description: "Debian version"
         type: enum
-        enum: [bookworm, bullseye, jammy]
+        enum: [bookworm, bullseye, noble, jammy]
     docker: [{image: "dalibo/buildpack-pkg:<< parameters.codename >>"}]
     working_directory: *working_directory
     steps:

CHANGELOG.md

@@ -21,6 +21,7 @@ Ensure you use consistent title format.
 - ui: Accept editing an offline instance.
 - ui: Search for .config/temboard.conf.
 - agent: Recover admin shutdown, backend terminated, etc.
+- Packages for Ubuntu 24.04 Noble.
 - Remove python 2.7 support.
 - Remove daemonization. Use nohup or systemd.
 - Dropped pluging hotplug.

CONTRIBUTING.md

@@ -463,7 +463,8 @@ build packages. Use `build-<codename>` target like this:
 make -C ui/packaging/deb build-bullseye
 ```
 
-`codename` is one of `bookworm`, `bullseye` or `buster`.
+`codename` is one of `bookworm` or `bullseye` for Debian
+and `noble` or `jammy` for Ubuntu.
 `agent/packaging/deb/Makefile` provides the same targets.
 
 The builder script search for wheels in `ui/dist/`

Makefile

@@ -189,7 +189,7 @@ CURL=curl --fail --create-dirs --location --silent --show-error
 GH_DOWNLOAD=https://github.com/dalibo/temboard/releases/download/v$(VERSION)
 AGENT_DIST_BASE=agent/dist/temboard-agent
 UI_DIST_BASE=ui/dist/temboard
-download-packages: download-rhel9 download-rhel8  download-deb-bookworm download-deb-bullseye download-deb-jammy #: Download packages from GitHub release
+download-packages: download-rhel9 download-rhel8  download-deb-bookworm download-deb-bullseye download-deb-noble download-deb-jammy #: Download packages from GitHub release
 download-rhel%:
 	$(CURL) --output-dir agent/dist/ --remote-name $(GH_DOWNLOAD)/temboard-agent-$(VERSION)-1.el$*.noarch.rpm
 	$(CURL) --output-dir ui/dist/ --remote-name $(GH_DOWNLOAD)/temboard-$(VERSION)-1.el$*.noarch.rpm
@@ -201,7 +201,7 @@ download-deb-%:
 	$(CURL) --output $(AGENT_DIST_BASE)_$(DEBIANVERSION)-0dlb1$*1_all.deb -LO $(GH_DOWNLOAD)/temboard-agent_$(GH_DEBIANVERSION)-0dlb1$*1_all.deb
 	$(CURL) --output $(UI_DIST_BASE)_$(DEBIANVERSION)-0dlb1$*1_amd64.deb -LO $(GH_DOWNLOAD)/temboard_$(GH_DEBIANVERSION)-0dlb1$*1_amd64.deb
 
-publish-packages: publish-rhel publish-deb-bookworm publish-deb-bullseye publish-deb-jammy  #: Upload packages to Dalibo Labs repositories.
+publish-packages: publish-rhel publish-deb-bookworm publish-deb-bullseye publish-deb-noble publish-deb-jammy  #: Upload packages to Dalibo Labs repositories.
 publish-rhel: copy-rhel9 copy-rhel8
 	@if expr match "$(VERSION)" ".*[a-z]\+" >/dev/null; then echo 'Refusing tu publish prerelease in YUM repository.'; false ; fi
 	@make -C $(YUM_LABS) push createrepos clean

agent/packaging/deb/docker-compose.yml

@@ -19,3 +19,7 @@ services:
   jammy:
     <<: *mkdeb
     image: dalibo/buildpack-pkg:jammy
+
+  noble:
+    <<: *mkdeb
+    image: dalibo/buildpack-pkg:noble

agent/packaging/deb/nfpm.yaml

@@ -12,7 +12,6 @@ depends:
 - python3-pkg-resources
 - python3-psycopg2 (>= 2.7)
 - python3-setuptools
-- python3-distutils
 - ssl-cert
 maintainer: ${DEBFULLNAME} <${DEBEMAIL}>
 description: PostgreSQL Remote Control Agent

docs/compatibility_guide.md

@@ -12,7 +12,7 @@ components:
 
 |                |                                |
 |----------------|--------------------------------|
-| Linux          | Debian 11 and 12, RHEL 8 and 9 |
+| Linux          | Debian 11 and 12, Ubuntu 22.04 and 24.04, RHEL 8 and 9 |
 | Python         | 3.6+                           |
 | Postgres       | 10 to 16                       |
 | Temboard Agent | 8.2 and 9.X                    |

ui/packaging/deb/docker-compose.yml

@@ -19,3 +19,7 @@ services:
   jammy:
     <<: *mkdeb
     image: dalibo/buildpack-pkg:jammy
+
+  noble:
+    <<: *mkdeb
+    image: dalibo/buildpack-pkg:noble