From b1bd2bf27bb34382e94c47556622046425e23e20 Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Wed, 6 Nov 2024 12:38:12 -0600 Subject: [PATCH] Test images before publishing them Also build job for 2023.2 Ubuntu Jammy Change-Id: If391d17f14f054afca061036487574805c393634 --- .zuul.d/2023.2-ubuntu_jammy.yaml | 61 ++++++++++++++++++++++++++++++++ .zuul.d/2024.1-ubuntu_jammy.yaml | 20 +++++++++++ .zuul.d/2024.2-ubuntu_jammy.yaml | 20 +++++++++++ .zuul.d/project.yaml | 13 +++++++ playbooks/build.yaml | 3 +- playbooks/vars_2023.2.yaml | 22 ++++++++++++ playbooks/vars_2024.1.yaml | 2 +- playbooks/vars_2024.2.yaml | 2 +- 8 files changed, 139 insertions(+), 4 deletions(-) create mode 100644 .zuul.d/2023.2-ubuntu_jammy.yaml create mode 100644 playbooks/vars_2023.2.yaml diff --git a/.zuul.d/2023.2-ubuntu_jammy.yaml b/.zuul.d/2023.2-ubuntu_jammy.yaml new file mode 100644 index 00000000..b726e7e0 --- /dev/null +++ b/.zuul.d/2023.2-ubuntu_jammy.yaml @@ -0,0 +1,61 @@ +- job: + name: loci-build-2023-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_2023.2.yaml + +- job: + name: loci-upload-2023-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: docker_credentials + secret: loci_docker_login + +- job: + name: loci-promote-2023-2-ubuntu_jammy + run: + - playbooks/promote.yaml + vars: *vars + secrets: + name: docker_credentials + secret: loci_docker_login + nodeset: + nodes: [] + +- job: + name: loci-compute-kit-2023-2-ubuntu_jammy + parent: openstack-helm-compute-kit-2023-2-ubuntu_jammy + required-projects: + - openstack/openstack-helm + - openstack/openstack-helm-infra + dependencies: + - name: loci-build-2023-2-ubuntu_jammy + soft: true + +- job: + name: loci-cinder-2023-2-ubuntu_jammy + parent: openstack-helm-cinder-2023-2-ubuntu_jammy + required-projects: + - openstack/openstack-helm + - openstack/openstack-helm-infra + dependencies: + - name: loci-build-2023-2-ubuntu_jammy + soft: true diff --git a/.zuul.d/2024.1-ubuntu_jammy.yaml b/.zuul.d/2024.1-ubuntu_jammy.yaml index 66ec7363..ce2678df 100644 --- a/.zuul.d/2024.1-ubuntu_jammy.yaml +++ b/.zuul.d/2024.1-ubuntu_jammy.yaml @@ -39,3 +39,23 @@ secret: loci_docker_login nodeset: nodes: [] + +- job: + name: loci-compute-kit-2024-1-ubuntu_jammy + parent: openstack-helm-compute-kit-2024-1-ubuntu_jammy + required-projects: + - openstack/openstack-helm + - openstack/openstack-helm-infra + dependencies: + - name: loci-build-2024-1-ubuntu_jammy + soft: true + +- job: + name: loci-cinder-2024-1-ubuntu_jammy + parent: openstack-helm-cinder-2024-1-ubuntu_jammy + required-projects: + - openstack/openstack-helm + - openstack/openstack-helm-infra + dependencies: + - name: loci-build-2024-1-ubuntu_jammy + soft: true diff --git a/.zuul.d/2024.2-ubuntu_jammy.yaml b/.zuul.d/2024.2-ubuntu_jammy.yaml index 11bc37d6..d3e1ba8d 100644 --- a/.zuul.d/2024.2-ubuntu_jammy.yaml +++ b/.zuul.d/2024.2-ubuntu_jammy.yaml @@ -39,3 +39,23 @@ secret: loci_docker_login nodeset: nodes: [] + +- job: + name: loci-compute-kit-2024-2-ubuntu_jammy + parent: openstack-helm-compute-kit-2024-2-ubuntu_jammy + required-projects: + - openstack/openstack-helm + - openstack/openstack-helm-infra + dependencies: + - name: loci-build-2024-2-ubuntu_jammy + soft: true + +- job: + name: loci-cinder-2024-2-ubuntu_jammy + parent: openstack-helm-cinder-2024-2-ubuntu_jammy + required-projects: + - openstack/openstack-helm + - openstack/openstack-helm-infra + dependencies: + - name: loci-build-2024-2-ubuntu_jammy + soft: true diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 73318cf2..b2bc5880 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -2,17 +2,30 @@ check: jobs: - loci-buildset-registry + # 2023.2 Ubuntu Jammy + - loci-build-2023-2-ubuntu_jammy + - loci-compute-kit-2023-2-ubuntu_jammy + - loci-cinder-2023-2-ubuntu_jammy + # 2024.1 Ubuntu Jammy - loci-build-2024-1-ubuntu_jammy + - loci-compute-kit-2024-1-ubuntu_jammy + - loci-cinder-2024-1-ubuntu_jammy + # 2024.2 Ubuntu Jammy - loci-build-2024-2-ubuntu_jammy + - loci-compute-kit-2024-2-ubuntu_jammy + - loci-cinder-2024-2-ubuntu_jammy + # Master Ubuntu Jammy - loci-build-master-ubuntu_jammy gate: jobs: - loci-buildset-registry + - loci-upload-2023-2-ubuntu_jammy - loci-upload-2024-1-ubuntu_jammy - loci-upload-2024-2-ubuntu_jammy - loci-upload-master-ubuntu_jammy promote: jobs: + - loci-promote-2023-2-ubuntu_jammy - loci-promote-2024-1-ubuntu_jammy - loci-promote-2024-2-ubuntu_jammy - loci-promote-master-ubuntu_jammy diff --git a/playbooks/build.yaml b/playbooks/build.yaml index c7805ca9..a1a36623 100644 --- a/playbooks/build.yaml +++ b/playbooks/build.yaml @@ -64,7 +64,6 @@ - name: Return images to zuul include_tasks: _return-image.yml - loop: - - "{{ keystone_image }}" + loop: "{{ openstack_images }}" loop_control: loop_var: zj_image diff --git a/playbooks/vars_2023.2.yaml b/playbooks/vars_2023.2.yaml new file mode 100644 index 00000000..0301c38d --- /dev/null +++ b/playbooks/vars_2023.2.yaml @@ -0,0 +1,22 @@ +image_tag: "2023.2-ubuntu_jammy" +distro_image: "ubuntu:jammy" +openstack_release: "stable/2023.2" +ceph_repo: "deb https://download.ceph.com/debian-reef/ jammy main" +openstack_images: + - "{{ barbican_image }}" + - "{{ cinder_image }}" + - "{{ cyborg_image }}" + - "{{ designate_image }}" + - "{{ glance_image }}" + - "{{ heat_image }}" + - "{{ horizon_image }}" + - "{{ ironic_image }}" + - "{{ keystone_image }}" + - "{{ manila_image }}" + - "{{ monasca_api_image }}" + - "{{ neutron_image }}" + - "{{ nova_image }}" + - "{{ octavia_image }}" + - "{{ placement_image }}" + - "{{ tacker_image}}" + - "{{ watcher_image }}" diff --git a/playbooks/vars_2024.1.yaml b/playbooks/vars_2024.1.yaml index d3671563..15a348b4 100644 --- a/playbooks/vars_2024.1.yaml +++ b/playbooks/vars_2024.1.yaml @@ -1,4 +1,4 @@ -image_tag: "2024.1-ubunu_jammy" +image_tag: "2024.1-ubuntu_jammy" distro_image: "ubuntu:jammy" openstack_release: "stable/2024.1" ceph_repo: "deb https://download.ceph.com/debian-reef/ jammy main" diff --git a/playbooks/vars_2024.2.yaml b/playbooks/vars_2024.2.yaml index 9d84c9bd..c384941a 100644 --- a/playbooks/vars_2024.2.yaml +++ b/playbooks/vars_2024.2.yaml @@ -1,4 +1,4 @@ -image_tag: "2024.2-ubunu_jammy" +image_tag: "2024.2-ubuntu_jammy" distro_image: "ubuntu:jammy" openstack_release: "stable/2024.2" ceph_repo: "deb https://download.ceph.com/debian-reef/ jammy main"