Merge pull request #90 from mineralsfree/CFE-4407

CFE-4407: added ubuntu-24 name pattern for aws image criteria
cfengine · Jun 24, 2024 · 49f5a05 · 49f5a05
2 parents 615195e + b8a8ff8
commit 49f5a05
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
@@ -12,6 +12,9 @@ on:
 jobs:
   test:
     runs-on: ubuntu-20.04
+    env:
+      # Temporary workaround for Python 3.5 failures - May 2024, see CFE-4395
+      PIP_TRUSTED_HOST: "pypi.python.org pypi.org files.pythonhosted.org"
     strategy:
       fail-fast: false
       matrix:

diff --git a/cf_remote/cloud_data.py b/cf_remote/cloud_data.py
@@ -28,6 +28,11 @@
         "name_pattern": "ubuntu-pro-server/images/hvm-ssd/ubuntu-xenial-16.04-amd64-pro-server*",
         "user": "ubuntu",
     },
+    "ubuntu-24": {
+        "owner_id": "099720109477",
+        "name_pattern": "ubuntu/images/hvm-ssd-gp3/ubuntu-*-{version}*",
+        "user": "ubuntu",
+    },
     "ubuntu": {
         "owner_id": "099720109477",
         "name_pattern": "ubuntu/images/hvm-ssd/ubuntu-*-{version}*",