Skip to content

Commit b76d309

Browse files
committed
Temporarily inline telemetry-container-image-content-provider job
Copy the job definition and playbooks from feature-verification-tests into sg-core so that Zuul can resolve the job before the fvt PR merges. Remove this once infrawatch/feature-verification-tests#345 lands. Generated-By: Claude-Code claude-opus-4-6
1 parent c38a517 commit b76d309

3 files changed

Lines changed: 81 additions & 2 deletions

File tree

.zuul.yaml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,39 @@
11
---
2+
# TODO: Remove the inlined job definition once
3+
# infrawatch/feature-verification-tests#345 merges.
4+
- job:
5+
name: telemetry-container-image-content-provider-test
6+
parent: cifmw-base-minimal
7+
nodeset: centos-stream-9-vexxhost
8+
description: |
9+
Build sg-core and mysqld-exporter container images from the
10+
current change and serve them from a local registry for
11+
dependent jobs.
12+
required-projects:
13+
- name: openstack-k8s-operators/ci-framework
14+
override-checkout: main
15+
- name: openstack-k8s-operators/sg-core
16+
- name: openstack-k8s-operators/mysqld_exporter
17+
run:
18+
- ci/playbooks/container-image-content-provider.yml
19+
vars:
20+
container_images:
21+
- src: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/sg-core"
22+
name: sg-core
23+
update_var: cifmw_update_containers_ceilometersgcoreImage
24+
- src: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/mysqld_exporter"
25+
name: mysqld-exporter
26+
update_var: cifmw_update_containers_ceilometermysqldexporterImage
27+
228
- project:
329
name: openstack-k8s-operators/sg-core
430
github-check:
531
jobs:
6-
- telemetry-container-image-content-provider
32+
- telemetry-container-image-content-provider-test
733
- telemetry-openstack-meta-content-provider-master:
834
override-checkout: main
935
- functional-tests-osp18:
1036
override-checkout: master
1137
dependencies:
1238
- telemetry-openstack-meta-content-provider-master
13-
- telemetry-container-image-content-provider
39+
- telemetry-container-image-content-provider-test
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
- name: "Get commit SHA for {{ container_image.name }}"
3+
ansible.builtin.command:
4+
cmd: git show-ref --head --hash head
5+
chdir: "{{ container_image.src }}"
6+
register: _container_sha
7+
8+
- name: "Set image reference for {{ container_image.name }}"
9+
ansible.builtin.set_fact:
10+
_container_image_url: "{{ cifmw_rp_registry_ip }}:5001/{{ container_image.name }}:{{ _container_sha.stdout | trim }}"
11+
12+
- name: "Build {{ container_image.name }}"
13+
ansible.builtin.command:
14+
cmd: >-
15+
make docker-build
16+
IMG={{ _container_image_url }}
17+
chdir: "{{ container_image.src }}"
18+
19+
- name: "Push {{ container_image.name }}"
20+
ansible.builtin.command:
21+
cmd: >-
22+
make docker-push
23+
IMG={{ _container_image_url }}
24+
chdir: "{{ container_image.src }}"
25+
26+
- name: "Record built image {{ container_image.name }}"
27+
ansible.builtin.set_fact:
28+
_built_images: "{{ _built_images | default([]) + [{'name': container_image.name, 'update_var': container_image.update_var, 'url': _container_image_url}] }}"
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
- name: Build and serve container images from review
3+
hosts: "{{ cifmw_target_host | default('controller') }}"
4+
gather_facts: true
5+
tasks:
6+
- name: Discover registry IP
7+
ansible.builtin.set_fact:
8+
cifmw_rp_registry_ip: "{{ ansible_host }}"
9+
10+
- name: Deploy local registry
11+
ansible.builtin.include_role:
12+
name: registry_deploy
13+
14+
- name: Build and push container images
15+
ansible.builtin.include_tasks: container-image-build.yml
16+
loop: "{{ container_images }}"
17+
loop_control:
18+
loop_var: container_image
19+
20+
- name: Return image URLs and pause for dependent jobs
21+
zuul_return:
22+
data: "{{ _return_data }}"
23+
vars:
24+
_image_overrides: "{{ dict(_built_images | default([]) | map(attribute='update_var') | zip(_built_images | default([]) | map(attribute='url'))) }}"
25+
_return_data: "{{ {'zuul': {'pause': true}} | combine(_image_overrides) }}"

0 commit comments

Comments
 (0)