Skip to content

2023.1: zed merge #1286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 14 commits into from
Sep 12, 2024
Merged

2023.1: zed merge #1286

merged 14 commits into from
Sep 12, 2024

Conversation

markgoddard
Copy link
Contributor

  • Add merge.py
  • kolla-images.py: Add a check-image-map command
  • kolla-images.py: Fix image to container exceptions using check-image-map
  • kolla-images.py: Misc fixes
  • CI: Add check-image-map and check-hierarchy to check-tags workflow
  • CI: Trigger build-kayobe-image for check-tags job
  • kolla-images.py: Add image map exception for neutron_eswitchd
  • Fix growroot when using software raid (Fix growroot when using software raid #818)

markgoddard and others added 13 commits September 6, 2024 12:40
@markgoddard
Merge pull request #1264 from stackhpc/zed-yoga-merge
97c5743 
zed: yoga merge
@markgoddard
Add merge.py
49a4b06 
This script can be used for merging from one release branch of SKC into
the next.
@Alex-Welsh
Merge pull request #1267 from stackhpc/merge-py
95fbf7a 
Add merge.py
@markgoddard
kolla-images.py: Add a check-image-map command
6181e80 
This command checks the image mapping against Kolla Ansible variables.

The *_image variables in Kolla Ansible define the mapping between
containers and images. Ensure that the mapping defined in this script
matches the one in Kolla Ansible.
@markgoddard
kolla-images.py: Fix image to container exceptions using check-image-map
6f15763 
We recently had an issue where images were built for ironic, but this
did not include dnsmasq due to not matching the regex. The 'ironic' tag
was updated in kolla-image-tags.yml, which matches ironic_dnsmasq
container, but no such dnsmasq image existed. This issue would have been
caught the check-tags workflow with the correct mapping added in this
change.
@markgoddard
kolla-images.py: Misc fixes
1caf4a3
@markgoddard
CI: Add check-image-map and check-hierarchy to check-tags workflow
9241b3a 
These commands ensure that the image map and hierarchy defined in
kolla-images.py matches Kolla Ansible.

Also update the path filter to run the check-tags workflow when pulp.yml
or kolla-images.py is modified.
@markgoddard
CI: Trigger build-kayobe-image for check-tags job
1edb38b
@markgoddard
kolla-images.py: Add image map exception for neutron_eswitchd
a4f03d4 
This was not caught because neutron-mlnx-agent is not in the list of
supported images in pulp.yml.
@jovial @Alex-Welsh @mnasiadka
Fix growroot when using software raid (#818)
7d98067 
* Fix growroot when using software raid

Using @markgoddard's suggestion from: #770 (comment)

* Add a release note

* Update releasenotes/notes/fixes-growroot-for-software-raid-3852bdea5415a0be.yaml

Co-authored-by: Alex-Welsh <[email protected]>
Co-authored-by: Michał Nasiadka <[email protected]>
@markgoddard
Merge pull request #1284 from stackhpc/check-image-map
6bec4ba 
zed: Fix image mapping in kolla-images.py, add tests and CI
@markgoddard
Merge stackhpc/yoga into stackhpc/zed
fa3a4e1
@markgoddard
Merge stackhpc/zed into stackhpc/2023.1
40afa6d
@markgoddard markgoddard requested a review from a team as a code owner September 12, 2024 11:38
@markgoddard markgoddard self-assigned this Sep 12, 2024
@markgoddard
Copy link
Contributor Author

Caught the dnsmasq image issue :)

failed: [localhost] (item={'allow_missing': False, 'is_push': True, 'repository': 'stackhpc-dev/dnsmasq', 'state': 'read', 'tags': ['2023.1-rocky-9-20240906T144646', '2023.1-ubuntu-jammy-20240906T144646']}) => changed=false 
  ansible_loop_var: item
  item:
    allow_missing: false
    is_push: true
    repository: stackhpc-dev/dnsmasq
    state: read
    tags:
    - 2023.1-rocky-9-20240906T144646
    - 2023.1-ubuntu-jammy-20240906T144646
  msg: 'Some tags not found in source repository: 2023.1-rocky-9-20240906T144646, 2023.1-ubuntu-jammy-20240906T144646'

@markgoddard
2023.1: Fix tag for ironic_dnsmasq container
acc31e9 
The dnsmasq image was not rebuilt at the same time as the ironic images
in 3a97322. Set the tag for
ironic_dnsmasq to what it was before that change.
@markgoddard markgoddard merged commit 20c34c9 into stackhpc/2023.1 Sep 12, 2024
12 checks passed
@markgoddard markgoddard deleted the 2023.1-zed-merge branch September 12, 2024 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackhodgkiss jackhodgkiss jackhodgkiss approved these changes

@Alex-Welsh Alex-Welsh Alex-Welsh approved these changes

Assignees

@markgoddard markgoddard

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@markgoddard @jackhodgkiss @Alex-Welsh @jovial