diff --git a/playbooks/vars_2025.2_jammy.yaml b/playbooks/vars_2025.2_jammy.yaml new file mode 100644 index 00000000..1278a740 --- /dev/null +++ b/playbooks/vars_2025.2_jammy.yaml @@ -0,0 +1,27 @@ +image_tag: "2025.2-ubuntu_jammy" +distro_image: "public.ecr.aws/ubuntu/ubuntu:jammy" +openstack_release: "stable/2025.2" +ceph_repo: "deb https://download.ceph.com/debian-squid/ jammy main" +openstack_images: + - "{{ barbican_image }}" + - "{{ cinder_image }}" + - "{{ cloudkitty_image }}" + - "{{ cyborg_image }}" + - "{{ designate_image }}" + - "{{ glance_image }}" + - "{{ heat_image }}" + - "{{ horizon_image }}" + - "{{ ironic_image }}" + - "{{ keystone_image }}" + - "{{ manila_image }}" + - "{{ neutron_image }}" + - "{{ nova_image }}" + - "{{ octavia_image }}" + - "{{ openstack_client_image }}" + - "{{ placement_image }}" + - "{{ tacker_image}}" + - "{{ watcher_image }}" + - "{{ freezer_image }}" + - "{{ freezer_api_image }}" + - "{{ blazar_image }}" + - "{{ zaqar_image }}" diff --git a/playbooks/vars_2025.2_noble.yaml b/playbooks/vars_2025.2_noble.yaml new file mode 100644 index 00000000..b8949539 --- /dev/null +++ b/playbooks/vars_2025.2_noble.yaml @@ -0,0 +1,28 @@ +image_tag: "2025.2-ubuntu_noble" +distro_image: "public.ecr.aws/ubuntu/ubuntu:noble" +openstack_release: "stable/2025.2" +# NOTE: Ubuntu Noble provides Ceph Squid packages out of the box +ceph_repo: "" +openstack_images: + - "{{ barbican_image }}" + - "{{ cinder_image }}" + - "{{ cloudkitty_image }}" + - "{{ cyborg_image }}" + - "{{ designate_image }}" + - "{{ glance_image }}" + - "{{ heat_image }}" + - "{{ horizon_image }}" + - "{{ ironic_image }}" + - "{{ keystone_image }}" + - "{{ manila_image }}" + - "{{ neutron_image }}" + - "{{ nova_image }}" + - "{{ octavia_image }}" + - "{{ openstack_client_image }}" + - "{{ placement_image }}" + - "{{ tacker_image}}" + - "{{ watcher_image }}" + - "{{ freezer_image }}" + - "{{ freezer_api_image }}" + - "{{ blazar_image }}" + - "{{ zaqar_image }}" diff --git a/scripts/requirements.sh b/scripts/requirements.sh index 86a2e87d..8bc386d4 100755 --- a/scripts/requirements.sh +++ b/scripts/requirements.sh @@ -85,6 +85,12 @@ if [[ ${PROJECT_REF} == "stable/2025.1" ]]; then sed -i "s|^python-openstackclient===.*|git+https://opendev.org/openstack/python-openstackclient.git@stable/2025.1#egg=python-openstackclient|g" /upper-constraints.txt fi +# NOTE: This is to install tap-as-a-service the stable/2025.2 branch +# It has been removed from the upper-constraints.txt. +if [[ ${PROJECT_REF} == "stable/2025.2" ]]; then + echo "git+https://opendev.org/openstack/tap-as-a-service.git@stable/2025.2#egg=tap-as-a-service" >> /upper-constraints.txt +fi + mkdir /source-wheels # Pre-build wheels for unnamed constraints for entry in $(grep '^git+' /upper-constraints.txt); do diff --git a/zuul.d/2025.2-ubuntu_jammy.yaml b/zuul.d/2025.2-ubuntu_jammy.yaml new file mode 100644 index 00000000..22ba1584 --- /dev/null +++ b/zuul.d/2025.2-ubuntu_jammy.yaml @@ -0,0 +1,68 @@ +- job: + name: loci-build-2025-2-ubuntu_jammy + timeout: 10800 + dependencies: + - name: loci-buildset-registry + pre-run: + - playbooks/inject-keys.yaml + - playbooks/pre-build.yaml + run: + - playbooks/build.yaml + vars: &vars + vars_files: + - vars_2025.2_jammy.yaml + +- job: + name: loci-upload-2025-2-ubuntu_jammy + timeout: 10800 + dependencies: + - name: loci-buildset-registry + pre-run: + - playbooks/inject-keys.yaml + - playbooks/pre-build.yaml + run: + - playbooks/build.yaml + post-run: + - playbooks/upload.yaml + vars: *vars + secrets: + name: container_registry_credentials + secret: loci_registry_credentials + +- job: + name: loci-promote-2025-2-ubuntu_jammy + run: + - playbooks/promote.yaml + vars: *vars + secrets: + name: container_registry_credentials + secret: loci_registry_credentials + nodeset: + nodes: [] + +# NOTE: uncomment when 2025.2 works +# - job: +# name: loci-compute-kit-2025-2-ubuntu_jammy +# parent: openstack-helm-compute-kit-2025-2-ubuntu_jammy +# files: +# - ^.*$ +# required-projects: +# - openstack/openstack-helm +# dependencies: +# - name: loci-build-2025-2-ubuntu_jammy +# soft: true +# - name: loci-upload-2025-2-ubuntu_jammy +# soft: true + +# - job: +# name: loci-cinder-2025-2-ubuntu_jammy +# parent: openstack-helm-cinder-2025-2-ubuntu_jammy +# files: +# - ^.*$ +# required-projects: +# - openstack/openstack-helm +# dependencies: +# - name: loci-build-2025-2-ubuntu_jammy +# soft: true +# - name: loci-upload-2025-2-ubuntu_jammy +# soft: true diff --git a/zuul.d/2025.2-ubuntu_noble.yaml b/zuul.d/2025.2-ubuntu_noble.yaml new file mode 100644 index 00000000..4e5ae6b1 --- /dev/null +++ b/zuul.d/2025.2-ubuntu_noble.yaml @@ -0,0 +1,68 @@ +- job: + name: loci-build-2025-2-ubuntu_noble + timeout: 10800 + dependencies: + - name: loci-buildset-registry + pre-run: + - playbooks/inject-keys.yaml + - playbooks/pre-build.yaml + run: + - playbooks/build.yaml + vars: &vars + vars_files: + - vars_2025.2_noble.yaml + +- job: + name: loci-upload-2025-2-ubuntu_noble + timeout: 10800 + dependencies: + - name: loci-buildset-registry + pre-run: + - playbooks/inject-keys.yaml + - playbooks/pre-build.yaml + run: + - playbooks/build.yaml + post-run: + - playbooks/upload.yaml + vars: *vars + secrets: + name: container_registry_credentials + secret: loci_registry_credentials + +- job: + name: loci-promote-2025-2-ubuntu_noble + run: + - playbooks/promote.yaml + vars: *vars + secrets: + name: container_registry_credentials + secret: loci_registry_credentials + nodeset: + nodes: [] + +# NOTE: uncomment when 2025.2 works +# - job: +# name: loci-compute-kit-2025-2-ubuntu_noble +# parent: openstack-helm-compute-kit-2025-2-ubuntu_noble +# files: +# - ^.*$ +# required-projects: +# - openstack/openstack-helm +# dependencies: +# - name: loci-build-2025-2-ubuntu_noble +# soft: true +# - name: loci-upload-2025-2-ubuntu_noble +# soft: true + +# - job: +# name: loci-cinder-2025-2-ubuntu_noble +# parent: openstack-helm-cinder-2025-2-ubuntu_noble +# files: +# - ^.*$ +# required-projects: +# - openstack/openstack-helm +# dependencies: +# - name: loci-build-2025-2-ubuntu_noble +# soft: true +# - name: loci-upload-2025-2-ubuntu_noble +# soft: true diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index dac599ca..8e3d2971 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -18,6 +18,14 @@ - loci-build-2025-1-ubuntu_noble - loci-compute-kit-2025-1-ubuntu_noble - loci-cinder-2025-1-ubuntu_noble + # 2025.2 Ubuntu Jammy + - loci-build-2025-2-ubuntu_jammy + # - loci-compute-kit-2025-2-ubuntu_jammy + # - loci-cinder-2025-2-ubuntu_jammy + # 2025.2 Ubuntu Noble + - loci-build-2025-2-ubuntu_noble + # - loci-compute-kit-2025-2-ubuntu_noble + # - loci-cinder-2025-2-ubuntu_noble # Master Ubuntu Jammy - loci-build-master-ubuntu_jammy # Master Ubuntu Noble @@ -29,6 +37,8 @@ - loci-upload-2024-2-ubuntu_jammy - loci-upload-2025-1-ubuntu_jammy - loci-upload-2025-1-ubuntu_noble + - loci-upload-2025-2-ubuntu_jammy + - loci-upload-2025-2-ubuntu_noble - loci-upload-master-ubuntu_jammy - loci-upload-master-ubuntu_noble promote: @@ -37,6 +47,8 @@ - loci-promote-2024-2-ubuntu_jammy - loci-promote-2025-1-ubuntu_jammy - loci-promote-2025-1-ubuntu_noble + - loci-promote-2025-2-ubuntu_jammy + - loci-promote-2025-2-ubuntu_noble - loci-promote-master-ubuntu_jammy - loci-promote-master-ubuntu_noble periodic: @@ -74,6 +86,24 @@ dependencies: - name: loci-compute-kit-2025-1-ubuntu_noble - name: loci-cinder-2025-1-ubuntu_noble + # 2025.2 Ubuntu Jammy + - loci-upload-2025-2-ubuntu_jammy + # - loci-compute-kit-2025-2-ubuntu_jammy + # - loci-cinder-2025-2-ubuntu_jammy + - loci-promote-2025-2-ubuntu_jammy: + dependencies: + - name: loci-upload-2025-2-ubuntu_jammy + # - name: loci-compute-kit-2025-2-ubuntu_jammy + # - name: loci-cinder-2025-2-ubuntu_jammy + # 2025.2 Ubuntu Noble + - loci-upload-2025-2-ubuntu_noble + # - loci-compute-kit-2025-2-ubuntu_noble + # - loci-cinder-2025-2-ubuntu_noble + - loci-promote-2025-2-ubuntu_noble: + dependencies: + - name: loci-upload-2025-2-ubuntu_noble + # - name: loci-compute-kit-2025-2-ubuntu_noble + # - name: loci-cinder-2025-2-ubuntu_noble # Master Ubuntu Jammy - loci-upload-master-ubuntu_jammy - loci-promote-master-ubuntu_jammy: