Updated base image docker repo url

Also fixed some code deprecation warnings Change-Id: I01d924c82677213251547a677c10d5d963765b94
airshipit · Dec 19, 2024 · 2fb6265 · 2fb6265
1 parent 3da73aa
commit 2fb6265
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 172 deletions.
diff --git a/images/airflow/Dockerfile.ubuntu_jammy b/images/airflow/Dockerfile.ubuntu_jammy
@@ -19,7 +19,7 @@
 # 429 Too Many Requests - Server message: too many requests:
 #   You have reached your pull rate limit.
 #   You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit
-ARG FROM=public.ecr.aws/ubuntu/ubuntu:jammy
+ARG FROM=public.ecr.aws/docker/library/ubuntu:jammy
 FROM ${FROM}
 
 LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \

diff --git a/src/bin/shipyard_airflow/requirements-direct.txt b/src/bin/shipyard_airflow/requirements-direct.txt
@@ -59,7 +59,7 @@ oslo.versionedobjects==3.3.0
 
 
 # Airship dependencies
-git+https://opendev.org/airship/deckhand.git@dacedae17b71acd249dc01ad0540e58136245fe1#egg=deckhand
-git+https://opendev.org/airship/drydock.git@683b03dfe11101586ed9e37bd8a667cd59a4f2f3#egg=drydock_provisioner&subdirectory=python
-git+https://opendev.org/airship/armada.git@54c3ebd63efbe21ed964cd8ee11274a5c2d95390#egg=armada
-git+https://opendev.org/airship/promenade.git@4283b05cbee451007edde96951d31ee6b243a642#egg=promenade
+git+https://opendev.org/airship/deckhand.git@4d500e48e880ea7f9a3582324c55c61373a855ea#egg=deckhand
+git+https://opendev.org/airship/drydock.git@ffcd51e00249198f1e2d40f3e83c8c1c338df3ad#egg=drydock_provisioner&subdirectory=python
+git+https://opendev.org/airship/armada.git@af4bf814f3a44e9ccee7c9fd8e4be34d943e013d#egg=armada
+git+https://opendev.org/airship/promenade.git@817ead27e991ff3fbed99ea1cb08aad5674d7167#egg=promenade
diff --git a/src/bin/shipyard_airflow/requirements-frozen.txt b/src/bin/shipyard_airflow/requirements-frozen.txt
@@ -21,7 +21,7 @@ apache-airflow-providers-smtp==1.8.1
 apache-airflow-providers-sqlite==3.9.1
 apispec==6.8.0
 argcomplete==3.5.2
-Armada @ git+https://opendev.org/airship/armada.git@54c3ebd63efbe21ed964cd8ee11274a5c2d95390
+Armada @ git+https://opendev.org/airship/armada.git@af4bf814f3a44e9ccee7c9fd8e4be34d943e013d
 arrow==1.3.0
 asgiref==3.8.1
 async-timeout==5.0.1
@@ -55,15 +55,15 @@ cron-descriptor==1.4.5
 croniter==5.0.1
 cryptography==42.0.8
 debtcollector==3.0.0
-Deckhand @ git+https://opendev.org/airship/deckhand.git@dacedae17b71acd249dc01ad0540e58136245fe1
+Deckhand @ git+https://opendev.org/airship/deckhand.git@4d500e48e880ea7f9a3582324c55c61373a855ea
 decorator==5.1.1
 deepdiff==8.1.1
 Deprecated==1.2.15
 dill==0.3.1.1
 dnspython==2.7.0
 docopt==0.6.2
 dogpile.cache==1.3.3
-drydock_provisioner @ git+https://opendev.org/airship/drydock.git@683b03dfe11101586ed9e37bd8a667cd59a4f2f3#subdirectory=python
+drydock_provisioner @ git+https://opendev.org/airship/drydock.git@ffcd51e00249198f1e2d40f3e83c8c1c338df3ad#subdirectory=python
 email_validator==2.2.0
 eventlet==0.38.1
 exceptiongroup==1.2.2
@@ -188,7 +188,7 @@ pluggy==1.5.0
 ply==3.11
 prettytable==3.12.0
 prison==0.2.1
-promenade @ git+https://opendev.org/airship/promenade.git@4283b05cbee451007edde96951d31ee6b243a642
+promenade @ git+https://opendev.org/airship/promenade.git@817ead27e991ff3fbed99ea1cb08aad5674d7167
 prometheus_client==0.21.1
 prompt_toolkit==3.0.48
 propcache==0.2.1

diff --git a/src/bin/shipyard_airflow/shipyard_airflow/errors.py b/src/bin/shipyard_airflow/shipyard_airflow/errors.py
@@ -125,7 +125,7 @@ def default_error_serializer(req, resp, exception):
     )
 
 
-def default_exception_handler(ex, req, resp, params):
+def default_exception_handler(req, resp, ex, params):
     """
     Catch-all exception handler for standardized output.
     If this is a standard falcon HTTPError, rethrow it for handling
@@ -197,7 +197,7 @@ def _gen_ex_message(title, description):
         return '{} : {}'.format(ttl, dsc)
 
     @staticmethod
-    def handle(ex, req, resp, params):
+    def handle(req, resp, ex, params):
         """
         The handler used for app errors and child classes
         """

diff --git a/src/bin/shipyard_client/shipyard_client/cli/format_utils.py b/src/bin/shipyard_client/shipyard_client/cli/format_utils.py
@@ -14,8 +14,7 @@
 import json
 import yaml
 
-from prettytable import PrettyTable
-from prettytable.prettytable import PLAIN_COLUMNS
+from prettytable import PrettyTable, TableStyle
 
 _INDENT = ' ' * 8
 
@@ -229,7 +228,7 @@ def table_factory(field_names=None, rows=None, style=None):
     """
     p = PrettyTable()
     if style is None:
-        p.set_style(PLAIN_COLUMNS)
+        p.set_style(TableStyle.PLAIN_COLUMNS)
     else:
         p.set_style(style)
     if field_names:

diff --git a/src/bin/shipyard_client/tests/unit/cli/test_format_utils.py b/src/bin/shipyard_client/tests/unit/cli/test_format_utils.py
@@ -14,7 +14,7 @@
 import json
 from unittest.mock import MagicMock
 
-from prettytable.prettytable import DEFAULT
+from prettytable import PrettyTable, TableStyle
 
 import shipyard_client.cli.format_utils as format_utils
 
@@ -295,7 +295,7 @@ def test_table_factory_fields():
 
 
 def test_table_factory_fields_data():
-    t = format_utils.table_factory(style=DEFAULT,
+    t = format_utils.table_factory(style=TableStyle.DEFAULT,
                                    field_names=['a', 'b', 'c'],
                                    rows=[['1', '2', '3'], ['4', '5', '6']])
     assert 'a' in t.get_string()

diff --git a/tools/gate/playbooks/airskiff-deploy.yaml b/tools/gate/playbooks/airskiff-deploy.yaml