Issue 1441 (#1460)

* Fix jsonval test to work with JSONSchema 3 and 4 * Clean out unused Debian versions of PostgreSQL #1441 * Remove iperf3 change that shouldn't be there yet. #1441 * Build iperf3 on u24. 1441 * Enable s3-benchmark for u24+ #1441 * Add iperf3 for u22 #1441 * Build iperf3 on d11; remove conditions in build order. #1441 * Restore conditional iperf3 build; enable force-build on Debuntu #1441 * unibuild-order changes: - Clarifying comments on iperf3 and py-amqp builds. - Simplifying python-jsonschema condition. * Forcing jq version 1.6.something to avoid 1.7.1 from U24, pending #1445 Incrementing package release number and adding changelog entries where needed. * Make all Python regexps raw strings. #1441 * Fix escaping in raw regexp strings. #1441 * Potential TODO for Golan stuff. #1441 * Bump Debian compat files 9 -> 10. #1441 --------- Co-authored-by: Lætitia Delvaux <[email protected]>
perfsonar · Jul 22, 2024 · 5e12ddd · 5e12ddd
1 parent da5b242
commit 5e12ddd
Show file tree

Hide file tree

Showing 43 changed files with 401 additions and 102 deletions.
diff --git a/drop-in/unibuild-packaging/deb/compat b/drop-in/unibuild-packaging/deb/compat
@@ -1 +1 @@
-9
+10
diff --git a/ethr/unibuild-packaging/deb/rules b/ethr/unibuild-packaging/deb/rules
@@ -7,6 +7,10 @@ export GOPATH=$(CURDIR)/GOPATH
 export GOBIN=$(GOPATH)/bin
 export GOCACHE=$(GOPATH)/.cache
 
+# TODO: May need these for U24+
+#export GO111MODULE=on
+#export GOPROXY=direct
+
 # main packaging script based on dh7 syntax
 %:
 	dh $@

diff --git a/iperf3/unibuild-packaging/deb/changelog b/iperf3/unibuild-packaging/deb/changelog
@@ -1,3 +1,10 @@
+iperf3 (3.17.1-2) perfsonar-5.1-staging; urgency=low
+
+  * Building on Ubuntu 20 and Debian 12
+  * Port to Debian 11 and 12, Ubuntu 22 and 24
+
+ -- Lætitia Delvaux <[email protected]>  Mon, 24 Jun 2024 18:37:14 +0200 
+
 iperf3 (3.17.1-1) perfsonar-5.1-staging; urgency=low
 
   * New upstream version

diff --git a/iperf3/unibuild-packaging/deb/compat-Debian-11 b/iperf3/unibuild-packaging/deb/compat-Debian-11
@@ -0,0 +1 @@
+11
diff --git a/iperf3/unibuild-packaging/deb/compat-Ubuntu-22 b/iperf3/unibuild-packaging/deb/compat-Ubuntu-22
@@ -0,0 +1 @@
+10
diff --git a/iperf3/unibuild-packaging/deb/compat-Ubuntu-24 b/iperf3/unibuild-packaging/deb/compat-Ubuntu-24
@@ -0,0 +1 @@
+10
diff --git a/iperf3/unibuild-packaging/deb/control-Debian-11 b/iperf3/unibuild-packaging/deb/control-Debian-11
@@ -0,0 +1,57 @@
+Source: iperf3
+Section: net
+Priority: optional
+Maintainer: perfSONAR developers <[email protected]>
+Uploaders: Antoine Delvaux <[email protected]>
+Build-Depends: debhelper (>= 10), libssl-dev, libsctp-dev [linux-any]
+Standards-Version: 3.9.8
+Homepage: http://software.es.net/iperf/
+
+Package: iperf3-ssl3
+Provides: iperf3
+Conflicts: iperf3
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Internet Protocol bandwidth measuring tool
+ Iperf3 is a tool for performing network throughput measurements. It can
+ test either TCP or UDP throughput.
+ .
+ This is a new implementation that shares no code with the original
+ iperf from NLANR/DAST and also is not backwards compatible.
+ .
+ This package contains the command line utility.
+
+Package: libiperf0-ssl3
+Provides: libiperf0
+Conflicts: libiperf0
+Architecture: any
+Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Internet Protocol bandwidth measuring tool (runtime files)
+ Iperf3 is a tool for performing network throughput measurements. It can
+ test either TCP or UDP throughput.
+ .
+ This is a new implementation that shares no code with the original
+ iperf from NLANR/DAST and also is not backwards compatible.
+ .
+ This is the runtime package for programs that use the shared iperf
+ library.
+
+Package: libiperf-dev-ssl3
+Provides: libiperf-dev
+Conflicts: libiperf-dev
+Architecture: any
+Section: libdevel
+Multi-Arch: same
+Depends: libiperf0-ssl3 (= ${binary:Version}), ${misc:Depends}
+Description: Internet Protocol bandwidth measuring tool (development files)
+ Iperf3 is a tool for performing network throughput measurements. It can
+ test either TCP or UDP throughput.
+ .
+ This is a new implementation that shares no code with the original
+ iperf from NLANR/DAST and also is not backwards compatible.
+ .
+ This is the development package which contains headers files and the
+ static iperf library.
diff --git a/iperf3/unibuild-packaging/deb/control-Ubuntu-22 b/iperf3/unibuild-packaging/deb/control-Ubuntu-22
@@ -0,0 +1,51 @@
+Source: iperf3
+Section: net
+Priority: optional
+Maintainer: perfSONAR developers <[email protected]>
+Uploaders: Antoine Delvaux <[email protected]>
+Build-Depends: debhelper (>= 10), libssl-dev, libsctp-dev [linux-any]
+Standards-Version: 3.9.8
+Homepage: http://software.es.net/iperf/
+
+Package: iperf3
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Internet Protocol bandwidth measuring tool
+ Iperf3 is a tool for performing network throughput measurements. It can
+ test either TCP or UDP throughput.
+ .
+ This is a new implementation that shares no code with the original
+ iperf from NLANR/DAST and also is not backwards compatible.
+ .
+ This package contains the command line utility.
+
+Package: libiperf0
+Architecture: any
+Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Internet Protocol bandwidth measuring tool (runtime files)
+ Iperf3 is a tool for performing network throughput measurements. It can
+ test either TCP or UDP throughput.
+ .
+ This is a new implementation that shares no code with the original
+ iperf from NLANR/DAST and also is not backwards compatible.
+ .
+ This is the runtime package for programs that use the shared iperf
+ library.
+
+Package: libiperf-dev
+Architecture: any
+Section: libdevel
+Multi-Arch: same
+Depends: libiperf0 (= ${binary:Version}), ${misc:Depends}
+Description: Internet Protocol bandwidth measuring tool (development files)
+ Iperf3 is a tool for performing network throughput measurements. It can
+ test either TCP or UDP throughput.
+ .
+ This is a new implementation that shares no code with the original
+ iperf from NLANR/DAST and also is not backwards compatible.
+ .
+ This is the development package which contains headers files and the
+ static iperf library.
diff --git a/iperf3/unibuild-packaging/deb/control-Ubuntu-24 b/iperf3/unibuild-packaging/deb/control-Ubuntu-24
@@ -0,0 +1,51 @@
+Source: iperf3
+Section: net
+Priority: optional
+Maintainer: perfSONAR developers <[email protected]>
+Uploaders: Antoine Delvaux <[email protected]>
+Build-Depends: debhelper (>= 10), libssl-dev, libsctp-dev [linux-any]
+Standards-Version: 3.9.8
+Homepage: http://software.es.net/iperf/
+
+Package: iperf3
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Internet Protocol bandwidth measuring tool
+ Iperf3 is a tool for performing network throughput measurements. It can
+ test either TCP or UDP throughput.
+ .
+ This is a new implementation that shares no code with the original
+ iperf from NLANR/DAST and also is not backwards compatible.
+ .
+ This package contains the command line utility.
+
+Package: libiperf0
+Architecture: any
+Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Internet Protocol bandwidth measuring tool (runtime files)
+ Iperf3 is a tool for performing network throughput measurements. It can
+ test either TCP or UDP throughput.
+ .
+ This is a new implementation that shares no code with the original
+ iperf from NLANR/DAST and also is not backwards compatible.
+ .
+ This is the runtime package for programs that use the shared iperf
+ library.
+
+Package: libiperf-dev
+Architecture: any
+Section: libdevel
+Multi-Arch: same
+Depends: libiperf0 (= ${binary:Version}), ${misc:Depends}
+Description: Internet Protocol bandwidth measuring tool (development files)
+ Iperf3 is a tool for performing network throughput measurements. It can
+ test either TCP or UDP throughput.
+ .
+ This is a new implementation that shares no code with the original
+ iperf from NLANR/DAST and also is not backwards compatible.
+ .
+ This is the development package which contains headers files and the
+ static iperf library.
diff --git a/iperf3/unibuild-packaging/deb/rules-Debian-11 b/iperf3/unibuild-packaging/deb/rules-Debian-11
@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+
+export DH_OPTIONS
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+override_dh_installchangelogs:
+	dh_installchangelogs RELNOTES.md
+
+%:
+	dh $@
+
+# Ubuntu dbgsym.ddeb are currently not supported by reprepro
+override_dh_strip:
+	dh_strip --no-automatic-dbgsym
diff --git a/iperf3/unibuild-packaging/deb/rules-Ubuntu-22 b/iperf3/unibuild-packaging/deb/rules-Ubuntu-22
@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+
+export DH_OPTIONS
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+override_dh_installchangelogs:
+	dh_installchangelogs RELNOTES.md
+
+%:
+	dh $@
+
+# Ubuntu dbgsym.ddeb are currently not supported by reprepro
+override_dh_strip:
+	dh_strip --no-automatic-dbgsym
diff --git a/iperf3/unibuild-packaging/deb/rules-Ubuntu-24 b/iperf3/unibuild-packaging/deb/rules-Ubuntu-24
@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+
+export DH_OPTIONS
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+override_dh_installchangelogs:
+	dh_installchangelogs RELNOTES.md
+
+%:
+	dh $@
+
+# Ubuntu dbgsym.ddeb are currently not supported by reprepro
+override_dh_strip:
+	dh_strip --no-automatic-dbgsym
diff --git a/jq/unibuild-packaging/deb/changelog b/jq/unibuild-packaging/deb/changelog
@@ -3,6 +3,13 @@ jq (1.7.1-1~bpo8+3) perfsonar-5.2-staging; urgency=medium
   * New upstream version
 
  -- Lætitia Delvaux <[email protected]>  Tue, 23 Apr 2024 01:02:58 +0200 
+	>>>>>>> 5.2.0
+
+jq (1.6.0-1~bpo8+4) perfsonar-5.1-staging; urgency=medium
+
+  * Port to Ubuntu 24
+
+ -- Lætitia Delvaux <[email protected]>  Mon, 24 Jun 2024 18:31:02 +0200 
 
 jq (1.6.0-1~bpo8+3) perfsonar-5.1-staging; urgency=medium
 

diff --git a/nuttcp/unibuild-packaging/deb/compat b/nuttcp/unibuild-packaging/deb/compat
@@ -1 +1 @@
-9
+10
diff --git a/pscheduler-account/unibuild-packaging/deb/compat b/pscheduler-account/unibuild-packaging/deb/compat
@@ -1 +1 @@
-9
+10
diff --git a/pscheduler-jq-library/pscheduler-jq-library/unibuild-packaging/deb/changelog b/pscheduler-jq-library/pscheduler-jq-library/unibuild-packaging/deb/changelog
@@ -1,6 +1,7 @@
 pscheduler-jq-library (5.2.0~a1.0-1) perfsonar-5.2-snapshot; urgency=low
 
   * New upstream version.
+  * Forcing jq version 1.6.something only.
 
  -- perfSONAR developers <[email protected]>  Tue, 11 Jun 2024 18:29:36 +0200
 

diff --git a/pscheduler-jq-library/pscheduler-jq-library/unibuild-packaging/deb/control b/pscheduler-jq-library/pscheduler-jq-library/unibuild-packaging/deb/control
@@ -10,6 +10,6 @@ Vcs-Browser: https://github.com/perfsonar/pscheduler
 
 Package: pscheduler-jq-library
 Architecture: all
-Depends: ${misc:Depends}, jq
+Depends: ${misc:Depends}, jq (>=1.6~), jq (<<1.7),
 Description: Library of JQ functions for pScheduler
  A library of JQ functions to use pScheduler internals.
diff --git a/pscheduler-server/pscheduler-server/unibuild-packaging/deb/changelog b/pscheduler-server/pscheduler-server/unibuild-packaging/deb/changelog
@@ -1,6 +1,7 @@
 pscheduler-server (5.2.0~a1.0-1) perfsonar-5.2-snapshot; urgency=low
 
   * New upstream version.
+  * Depends on PostgreSQL 16 for Ubuntu 24.
 
  -- perfSONAR developers <[email protected]>  Tue, 11 Jun 2024 18:29:36 +0200
 

diff --git a/pscheduler-server/pscheduler-server/unibuild-packaging/deb/control b/pscheduler-server/pscheduler-server/unibuild-packaging/deb/control
@@ -16,8 +16,16 @@ Depends: ${misc:Depends}, python3, curl,
  python3-pscheduler (>= 5.1.0~), pscheduler-core, pscheduler-account,
  apache2, libapache2-mod-wsgi-py3, logrotate, psmisc,
  dbconfig-common, postgresql (>= 10),
- postgresql-15 | postgresql-14 | postgresql-13 | postgresql-12 | postgresql-11 | postgresql-10,
- postgresql-plpython3-15 | postgresql-plpython3-14 | postgresql-plpython3-13 | postgresql-plpython3-12 | postgresql-plpython3-11 | postgresql-plpython3-10,
+ postgresql-16
+   | postgresql-15
+   | postgresql-14
+   | postgresql-13
+   | postgresql-12,
+ postgresql-plpython3-16
+   | postgresql-plpython3-15
+   | postgresql-plpython3-14
+   | postgresql-plpython3-13
+   | postgresql-plpython3-12,
  postgresql-contrib
 Description: pScheduler server components
  The pScheduler database, daemons and API web server
diff --git a/pscheduler-tool-ethr/ethr/run b/pscheduler-tool-ethr/ethr/run
@@ -167,7 +167,7 @@ def run_client():
 
     # Make the result and return it
 
-    matcher = re.compile('^\[([^]]+)\]\s+(TCP|UDP)\s+([^\s]+)-([^\s]+)\s+[^\s]+\s*([^\s]+)$')
+    matcher = re.compile(r'^\[([^]]+)\]\s+(TCP|UDP)\s+([^\s]+)-([^\s]+)\s+[^\s]+\s*([^\s]+)$')
 
 
     def group_block(stream, start, end, bps):

diff --git a/pscheduler-tool-globus/globus/run b/pscheduler-tool-globus/globus/run
@@ -78,7 +78,7 @@ if True:
   for line in lines:
       logger.debug("searching line: {0}".format(line))
       #make sure you grab the last one because each screen update its own line
-      test = re.search('\s*(\d+) bytes\s+(\S+) ([A-za-z])B/sec avg\s+\S+ [A-za-z]B/sec inst$', line)
+      test = re.search(r'\s*(\d+) bytes\s+(\S+) ([A-za-z])B/sec avg\s+\S+ [A-za-z]B/sec inst$', line)
       if test:
           logger.debug("looks like a performance metric line")
           bytes_sent = int(test.group(1))