Merge "Remove last traces of ubuntu focal"

Zuul · openstack-gerrit · commit 38ac4344f153 · 2024-05-13T16:03:54.000Z
diff --git a/playbooks/roles/bifrost-configdrives-dynamic/meta/main.yml b/playbooks/roles/bifrost-configdrives-dynamic/meta/main.yml
@@ -14,7 +14,6 @@ galaxy_info:
     - "9"
   - name: Ubuntu
     versions:
-    - focal
     - jammy
   galaxy_tags:
   - cloud
diff --git a/playbooks/roles/bifrost-create-dib-image/meta/main.yml b/playbooks/roles/bifrost-create-dib-image/meta/main.yml
@@ -14,7 +14,6 @@ galaxy_info:
     - "9"
   - name: Ubuntu
     versions:
-    - focal
     - jammy
   galaxy_tags:
   - cloud
diff --git a/playbooks/roles/bifrost-create-vm-nodes/meta/main.yml b/playbooks/roles/bifrost-create-vm-nodes/meta/main.yml
@@ -14,7 +14,6 @@ galaxy_info:
     - "9"
   - name: Ubuntu
     versions:
-    - focal
     - jammy
   galaxy_tags:
   - cloud
diff --git a/playbooks/roles/bifrost-deploy-nodes-dynamic/meta/main.yml b/playbooks/roles/bifrost-deploy-nodes-dynamic/meta/main.yml
@@ -14,7 +14,6 @@ galaxy_info:
     - "9"
   - name: Ubuntu
     versions:
-    - focal
     - jammy
   galaxy_tags:
   - cloud
diff --git a/playbooks/roles/bifrost-ironic-install/meta/main.yml b/playbooks/roles/bifrost-ironic-install/meta/main.yml
@@ -14,7 +14,6 @@ galaxy_info:
     - "9"
   - name: Ubuntu
     versions:
-    - focal
     - jammy
   galaxy_tags:
   - cloud
diff --git a/playbooks/roles/bifrost-keystone-client-config/meta/main.yml b/playbooks/roles/bifrost-keystone-client-config/meta/main.yml
@@ -14,7 +14,6 @@ galaxy_info:
     - "9"
   - name: Ubuntu
     versions:
-    - focal
     - jammy
   galaxy_tags:
   - cloud
diff --git a/playbooks/roles/bifrost-keystone-install/meta/main.yml b/playbooks/roles/bifrost-keystone-install/meta/main.yml
@@ -14,7 +14,6 @@ galaxy_info:
     - "9"
   - name: Ubuntu
     versions:
-    - focal
     - jammy
   galaxy_tags:
   - cloud
diff --git a/playbooks/roles/bifrost-prep-for-install/meta/main.yml b/playbooks/roles/bifrost-prep-for-install/meta/main.yml
@@ -14,7 +14,6 @@ galaxy_info:
     - "9"
   - name: Ubuntu
     versions:
-    - focal
     - jammy
   galaxy_tags:
   - cloud
diff --git a/playbooks/roles/bifrost-prepare-for-test-dynamic/meta/main.yml b/playbooks/roles/bifrost-prepare-for-test-dynamic/meta/main.yml
@@ -14,7 +14,6 @@ galaxy_info:
     - "9"
   - name: Ubuntu
     versions:
-    - focal
     - jammy
   galaxy_tags:
   - cloud
diff --git a/playbooks/roles/bifrost-test-dhcp/meta/main.yml b/playbooks/roles/bifrost-test-dhcp/meta/main.yml
@@ -8,7 +8,6 @@ galaxy_info:
   platforms:
   - name: Ubuntu
     versions:
-    - focal
     - jammy
   galaxy_tags:
   - cloud
diff --git a/playbooks/roles/bifrost-test-inspection/meta/main.yml b/playbooks/roles/bifrost-test-inspection/meta/main.yml
@@ -8,7 +8,6 @@ galaxy_info:
   platforms:
   - name: Ubuntu
     versions:
-    - focal
     - jammy
   galaxy_tags:
   - cloud
diff --git a/playbooks/roles/bifrost-test-vm/meta/main.yml b/playbooks/roles/bifrost-test-vm/meta/main.yml
@@ -8,7 +8,6 @@ galaxy_info:
   platforms:
   - name: Ubuntu
     versions:
-    - focal
     - jammy
   galaxy_tags:
   - cloud
diff --git a/playbooks/roles/bifrost-unprovision-node-dynamic/meta/main.yml b/playbooks/roles/bifrost-unprovision-node-dynamic/meta/main.yml
@@ -14,7 +14,6 @@ galaxy_info:
     - "9"
   - name: Ubuntu
     versions:
-    - focal
     - jammy
   galaxy_tags:
   - cloud
diff --git a/playbooks/roles/ironic-delete-dynamic/meta/main.yml b/playbooks/roles/ironic-delete-dynamic/meta/main.yml
@@ -14,7 +14,6 @@ galaxy_info:
     - "9"
   - name: Ubuntu
     versions:
-    - focal
     - jammy
   galaxy_tags:
   - cloud
diff --git a/playbooks/roles/ironic-enroll-dynamic/meta/main.yml b/playbooks/roles/ironic-enroll-dynamic/meta/main.yml
@@ -14,7 +14,6 @@ galaxy_info:
     - "9"
   - name: Ubuntu
     versions:
-    - focal
     - jammy
   galaxy_tags:
   - cloud
diff --git a/playbooks/roles/ironic-inspect-node/meta/main.yml b/playbooks/roles/ironic-inspect-node/meta/main.yml
@@ -18,7 +18,6 @@ galaxy_info:
     - "37"
   - name: Ubuntu
     versions:
-    - focal
     - jammy
   galaxy_tags:
   - cloud
diff --git a/zuul.d/bifrost-jobs.yaml b/zuul.d/bifrost-jobs.yaml
@@ -81,34 +81,11 @@
     parent: bifrost-integration-tinyipa
     nodeset: ubuntu-bionic
 
-# NOTE(rpittau): used by openstack/ansible-collections-openstack, openstack/openstacksdk
-# https://review.opendev.org/c/openstack/ansible-collections-openstack/+/903956
-# https://review.opendev.org/c/openstack/openstacksdk/+/903973
-- job:
-    name: bifrost-integration-tinyipa-ubuntu-focal
-    parent: bifrost-integration-tinyipa
-    nodeset: ubuntu-focal
-
 - job:
     name: bifrost-integration-tinyipa-ubuntu-jammy
     parent: bifrost-integration-tinyipa
     nodeset: ubuntu-jammy
 
-# NOTE(rpittau): used by openstack/ansible-collections-openstack
-# https://review.opendev.org/c/openstack/ansible-collections-openstack/+/903956
-- job:
-    name: bifrost-integration-tinyipa-keystone-ubuntu-focal
-    parent: bifrost-integration-tinyipa
-    nodeset: ubuntu-focal
-    required-projects:
-      - openstack/keystone
-      - openstack/ironic-prometheus-exporter
-    vars:
-      enable_keystone: true
-      enable_tls: true
-      test_driver: redfish
-      enable_prometheus_exporter: true
-
 - job:
     name: bifrost-integration-tinyipa-keystone-ubuntu-jammy
     parent: bifrost-integration-tinyipa
