Merge pull request #1371 from garberg/ci_22.04

Bumped Ubuntu version in CI to 22.04
SpriteLink · Apr 11, 2024 · 97c0aa9 · 97c0aa9
2 parents 6bc0259 + 22648ae
commit 97c0aa9
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 40 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ env:
 jobs:
   test:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         install: [ pip, apt ]
@@ -52,12 +52,11 @@ jobs:
           default-jdk \
           gradle \
           rename \
-          postgresql-12 \
-          postgresql-12-ip4r
+          postgresql-14-ip4r
+
+        sudo service postgresql start
+        pg_isready
 
-        # Drop and re-create cluster to be bound to default port
-        for version in `pg_lsclusters | tail -n-2 | awk '{ print $1 }'`; do sudo pg_dropcluster $version main; done
-        sudo pg_createcluster --start 12 main
         sed -e 's/username = guest/username = unittest/' -e 's/password = guest/password = gottatest/' nipap-cli/nipaprc > ~/.nipaprc
         chmod 0600 ~/.nipaprc
 
@@ -162,6 +161,7 @@ jobs:
     - name: "Accident analysis"
       if: failure()
       run: |
-        sudo cat /etc/nipap/nipap.conf
-        sudo cat /var/log/syslog
+        sudo cat /etc/nipap/nipap.conf || true
+        sudo cat /var/log/syslog || true
+        sudo cat /var/log/postgresql/postgresql-*-main.log || true
         sudo cat /tmp/nipap.log || true
diff --git a/nipap-cli/debian/compat b/nipap-cli/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/nipap-www/debian/compat b/nipap-www/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/nipap-www/debian/rules b/nipap-www/debian/rules
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python3 --buildsystem=python_distutils
-
-
+	dh $@ --with python3 --buildsystem=pybuild
diff --git a/nipap-www/setup.py b/nipap-www/setup.py
@@ -17,7 +17,6 @@
     license=nipapwww.__license__,
     packages=find_packages(exclude=['ez_setup']),
     include_package_data=True,
-    test_suite='nose.collector',
     package_data={'nipapwww': ['i18n/*/LC_MESSAGES/*.mo']},
     data_files=[
         ('/etc/nipap/www', ['nipap-www.wsgi', ]),

diff --git a/nipap/debian/compat b/nipap/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/nipap/debian/rules b/nipap/debian/rules
@@ -4,6 +4,4 @@
 # Tue, 18 Oct 2011 21:55:07 +0200
 
 %:
-	dh $@ --with python3 --buildsystem=python_distutils
-
-
+	dh $@ --with python3 --buildsystem=pybuild
diff --git a/nipap/requirements.txt b/nipap/requirements.txt
@@ -1,20 +1,20 @@
 zipp==1.2.0
-importlib_metadata==2.1.3
+importlib_metadata==6.11.0
 Flask==1.1.2
 Flask-Compress==1.9.0
 flask-xml-rpc-re==0.1.4
 Flask-RESTful==0.3.8
 requests==2.31.0
 IPy==1.01
-Jinja2==2.11.3
+Jinja2==3.0.3
 MarkupSafe==1.1.1
 Werkzeug==1.0.1
 backports.ssl-match-hostname==3.7.0.1
 certifi==2023.7.22
 itsdangerous==1.1.0
 parsedatetime==2.6
 psutil==5.7.2
-psycopg2==2.8.6 --no-binary psycopg2
+psycopg2==2.9.9
 pyparsing==2.4.7
 python-dateutil==2.8.1
 pytz==2021.1
@@ -23,18 +23,18 @@ tornado==6.3.3
 docutils==0.16
 # optional dependencies below
 python-ldap==3.4.0
-opentelemetry-api==1.20.0
-opentelemetry-exporter-otlp==1.20.0
-opentelemetry-exporter-otlp-proto-common==1.20.0
-opentelemetry-exporter-otlp-proto-grpc==1.20.0
-opentelemetry-exporter-otlp-proto-http==1.20.0
-opentelemetry-instrumentation==0.41b0
-opentelemetry-instrumentation-dbapi==0.41b0
-opentelemetry-instrumentation-flask==0.41b0
-opentelemetry-instrumentation-psycopg2==0.41b0
-opentelemetry-instrumentation-wsgi==0.41b0
-opentelemetry-proto==1.20.0
-opentelemetry-sdk==1.20.0
-opentelemetry-semantic-conventions==0.41b0
-opentelemetry-util-http==0.41b0
+opentelemetry-api==1.24.0
+opentelemetry-exporter-otlp==1.24.0
+opentelemetry-exporter-otlp-proto-common==1.24.0
+opentelemetry-exporter-otlp-proto-grpc==1.24.0
+opentelemetry-exporter-otlp-proto-http==1.24.0
+opentelemetry-instrumentation==0.45b0
+opentelemetry-instrumentation-dbapi==0.45b0
+opentelemetry-instrumentation-flask==0.45b0
+opentelemetry-instrumentation-psycopg2==0.45b0
+opentelemetry-instrumentation-wsgi==0.45b0
+opentelemetry-proto==1.24.0
+opentelemetry-sdk==1.24.0
+opentelemetry-semantic-conventions==0.45b0
+opentelemetry-util-http==0.45b0
 
diff --git a/pynipap/debian/compat b/pynipap/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/whoisd/debian/compat b/whoisd/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/whoisd/debian/rules b/whoisd/debian/rules
@@ -4,6 +4,4 @@
 # Wed, 29 Feb 2012 09:03:22 +0100
 
 %:
-	dh $@ --with python3 --buildsystem=python_distutils
-
-
+	dh $@ --with python3 --buildsystem=pybuild