diff --git a/playbooks/roles/bifrost-configdrives-dynamic/meta/main.yml b/playbooks/roles/bifrost-configdrives-dynamic/meta/main.yml index e9778a7d1..ce6a2cff6 100644 --- 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 index fbe5f3f95..f8f263cf6 100644 --- 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 index ab67dba85..781b5f474 100644 --- 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 index c9a3dd3d6..d5caf0b1a 100644 --- 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 index 9d6ef3070..b7a20bef0 100644 --- 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 index 9e762a081..bf1537224 100644 --- 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 index 07ca385e2..1935d3a96 100644 --- 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 index 9d6ef3070..b7a20bef0 100644 --- 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 index bb92b8b40..d79bd7811 100644 --- 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 index 55de139f2..d6c17904d 100644 --- 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 index ac14db2bc..60f8aa81a 100644 --- 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 index 79be0f786..270243c74 100644 --- 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 index 81ee44643..25492cd04 100644 --- 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 index 1786b97cc..3bfcb6050 100644 --- 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 index 66584409c..3b44e86e8 100644 --- 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 index 8fe4c6345..d2514bc5e 100644 --- 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 index 7a482ee13..d9d8da5a9 100644 --- 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