openstack/loci
Code Issues Proposed changes

Temporarily run two promote jobs for docker.io and quay.io

Browse Source 
After this https://review.opendev.org/c/zuul/zuul-jobs/+/881524
is merged we will be able to run a single promotion job that
loops over two registries docker.io and quay.io

Change-Id: I2b43835541faf9c193cd5daff45bf7fca11304f2
This commit is contained in:
Vladimir Kozhukalov 2025-01-14 15:32:07 -06:00
parent ddc70da7d5
commit 455c06b78f
7 changed files with 104 additions and 3 deletions

9
playbooks/promote.yaml

@ -14,6 +14,9 @@
name: promote-container-image
vars:
container_images: "{{ openstack_images + [requirements_image] }}"
loop_control:
loop_var: image_registry
loop: "{{ image_registries }}"
# NOTE(kozhukalov): Use loop over image registries once
# this https://review.opendev.org/c/zuul/zuul-jobs/+/881524 is merged.
image_registry: "{{ image_registries[0] }}"
# loop_control:
# loop_var: image_registry
# loop: "{{ image_registries }}"

22
playbooks/promote_quay.yaml Normal file

@ -0,0 +1,22 @@
- hosts: localhost
tasks:
- name: Vars
include_vars:
file: "vars.yaml"
- name: Job vars
include_vars:
file: "{{ item }}"
loop: "{{ vars_files }}"
- name: Promote images
include_role:
name: promote-container-image
vars:
container_images: "{{ openstack_images + [requirements_image] }}"
# NOTE(kozhukalov): Use loop over image registries once
# this https://review.opendev.org/c/zuul/zuul-jobs/+/881524 is merged.
image_registry: "{{ image_registries[1] }}"
# loop_control:
# loop_var: image_registry
# loop: "{{ image_registries }}"

13
zuul.d/2023.2-ubuntu_jammy.yaml

@ -40,6 +40,19 @@
nodeset:
nodes: []
# NOTE(kozhukalov): Use loop over image registries once
# this https://review.opendev.org/c/zuul/zuul-jobs/+/881524 is merged.
- job:
name: loci-promote-2023-2-ubuntu_jammy-quay
run:
- playbooks/promote_quay.yaml
vars: *vars
secrets:
name: container_registry_credentials
secret: loci_registry_credentials
nodeset:
nodes: []
- job:
name: loci-compute-kit-2023-2-ubuntu_jammy
parent: openstack-helm-compute-kit-2023-2-ubuntu_jammy

13
zuul.d/2024.1-ubuntu_jammy.yaml

@ -40,6 +40,19 @@
nodeset:
nodes: []
# NOTE(kozhukalov): Use loop over image registries once
# this https://review.opendev.org/c/zuul/zuul-jobs/+/881524 is merged.
- job:
name: loci-promote-2024-1-ubuntu_jammy-quay
run:
- playbooks/promote_quay.yaml
vars: *vars
secrets:
name: container_registry_credentials
secret: loci_registry_credentials
nodeset:
nodes: []
- job:
name: loci-compute-kit-2024-1-ubuntu_jammy
parent: openstack-helm-compute-kit-2024-1-ubuntu_jammy

13
zuul.d/2024.2-ubuntu_jammy.yaml

@ -40,6 +40,19 @@
nodeset:
nodes: []
# NOTE(kozhukalov): Use loop over image registries once
# this https://review.opendev.org/c/zuul/zuul-jobs/+/881524 is merged.
- job:
name: loci-promote-2024-2-ubuntu_jammy-quay
run:
- playbooks/promote_quay.yaml
vars: *vars
secrets:
name: container_registry_credentials
secret: loci_registry_credentials
nodeset:
nodes: []
- job:
name: loci-compute-kit-2024-2-ubuntu_jammy
parent: openstack-helm-compute-kit-2024-2-ubuntu_jammy

13
zuul.d/master-ubuntu_jammy.yaml

@ -39,3 +39,16 @@
secret: loci_registry_credentials
nodeset:
nodes: []
# NOTE(kozhukalov): Use loop over image registries once
# this https://review.opendev.org/c/zuul/zuul-jobs/+/881524 is merged.
- job:
name: loci-promote-master-ubuntu_jammy-quay
run:
- playbooks/promote_quay.yaml
vars: *vars
secrets:
name: container_registry_credentials
secret: loci_registry_credentials
nodeset:
nodes: []

24
zuul.d/project.yaml

@ -29,6 +29,15 @@
- loci-promote-2024-1-ubuntu_jammy
- loci-promote-2024-2-ubuntu_jammy
- loci-promote-master-ubuntu_jammy
# NOTE(kozhukalov): These are temporary jobs
# until this https://review.opendev.org/c/zuul/zuul-jobs/+/881524
# is merged. At the moment we can not include promote-container-image
# role in a loop because there is registry type variable that is set during the first
# loop iteration and then never redefined.
- loci-promote-2023-2-ubuntu_jammy-quay
- loci-promote-2024-1-ubuntu_jammy-quay
- loci-promote-2024-2-ubuntu_jammy-quay
- loci-promote-master-ubuntu_jammy-quay
periodic:
jobs:
- loci-buildset-registry
@ -40,6 +49,10 @@
dependencies:
- name: loci-compute-kit-2023-2-ubuntu_jammy
- name: loci-cinder-2023-2-ubuntu_jammy
- loci-promote-2023-2-ubuntu_jammy-quay:
dependencies:
- name: loci-compute-kit-2023-2-ubuntu_jammy
- name: loci-cinder-2023-2-ubuntu_jammy
# 2024.1 Ubuntu Jammy
- loci-upload-2024-1-ubuntu_jammy
- loci-compute-kit-2024-1-ubuntu_jammy
@ -48,6 +61,10 @@
dependencies:
- name: loci-compute-kit-2024-1-ubuntu_jammy
- name: loci-cinder-2024-1-ubuntu_jammy
- loci-promote-2024-1-ubuntu_jammy-quay:
dependencies:
- name: loci-compute-kit-2024-1-ubuntu_jammy
- name: loci-cinder-2024-1-ubuntu_jammy
# 2024.2 Ubuntu Jammy
- loci-upload-2024-2-ubuntu_jammy
- loci-compute-kit-2024-2-ubuntu_jammy
@ -56,10 +73,17 @@
dependencies:
- name: loci-compute-kit-2024-2-ubuntu_jammy
- name: loci-cinder-2024-2-ubuntu_jammy
- loci-promote-2024-2-ubuntu_jammy-quay:
dependencies:
- name: loci-compute-kit-2024-2-ubuntu_jammy
- name: loci-cinder-2024-2-ubuntu_jammy
# Master Ubuntu Jammy
- loci-upload-master-ubuntu_jammy
- loci-promote-master-ubuntu_jammy:
dependencies:
- name: loci-upload-master-ubuntu_jammy
- loci-promote-master-ubuntu_jammy-quay:
dependencies:
- name: loci-upload-master-ubuntu_jammy