Infrastructure/ansible
5
0
Fork 0
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

Reapply fixed "Don't hardcode the branched number in Bodhi compose repo config" #2485

Merged
ryanlerch merged 1 commit from fix-bodhi-compose-branched-template into main 2025-02-23 19:20:27 +00:00
Conversation 11 Commits 1 Files changed 1 +5 -3
adamwill commented 2025-02-19 19:08:17 +00:00
Contributor
Copy link

This reverts commit 6d4c6b0be1, but
fixes the problem.

This reverts commit 6d4c6b0be13ec1365deba1d5e05674a51481ee7f, but fixes the problem.
adamwill commented 2025-02-19 19:09:57 +00:00
Author
Contributor
Copy link

So I think the problem here is that we're actually in a format string. See the handling of env_suffix.

I would like to fix this more cleanly by dropping the use of .format and using this syntax instead:

{% set repos %}
...
{% endset %}

which ought to work and let us use 'normal' templating inside the block, but I am not sure how the whitespace would work out there, and whether however the whitespace ended up would break Bodhi :/ so this is a minimal change instead.

So I think the problem here is that we're actually in a format string. See the handling of `env_suffix`. I would *like* to fix this more cleanly by dropping the use of `.format` and using this syntax instead: ``` {% set repos %} ... {% endset %} ``` which ought to work and let us use 'normal' templating inside the block, but I am not sure how the whitespace would work out there, and whether however the whitespace ended up would break Bodhi :/ so this is a minimal change instead.
zuul commented 2025-02-19 19:10:52 +00:00
First-time contributor
Copy link

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/da6592f6ee1f4f978be2a2059c43cef3

Build succeeded. https://fedora.softwarefactory-project.io/zuul/buildset/da6592f6ee1f4f978be2a2059c43cef3 - [fi-ansible-lint-diff ](https://fedora.softwarefactory-project.io/zuul/build/655172a974594fe78e5a0ccc459060d9) : SUCCESS in 2m 21s - [fi-yamllint-diff ](https://fedora.softwarefactory-project.io/zuul/build/7ef442aea54c4b7ca41e874cc314ca49) : SUCCESS in 2m 14s
kevin commented 2025-02-19 19:12:16 +00:00
Contributor
Copy link

+1 looks reasonable to me.

+1 looks reasonable to me.
zlopez commented 2025-02-20 11:48:31 +00:00
Contributor
Copy link

+1 from me

+1 from me
kevin commented 2025-02-23 19:19:23 +00:00
Contributor
Copy link

rebased onto d63afb09d8

rebased onto d63afb09d8f491b4b89bd5bc2db5d70d01b66675
kevin commented 2025-02-23 19:19:31 +00:00
Contributor
Copy link

rebased onto d63afb09d8

rebased onto d63afb09d8f491b4b89bd5bc2db5d70d01b66675
kevin commented 2025-02-23 19:20:10 +00:00
Contributor
Copy link

ok, thats +2, lets go.

ok, thats +2, lets go.
kevin commented 2025-02-23 19:20:29 +00:00
Contributor
Copy link

Pull-Request has been merged by kevin

Pull-Request has been merged by kevin
zuul commented 2025-02-23 19:22:14 +00:00
First-time contributor
Copy link

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/e3f7448351d8473da2de1a359d3ecaa0

Build succeeded. https://fedora.softwarefactory-project.io/zuul/buildset/e3f7448351d8473da2de1a359d3ecaa0 - [fi-ansible-lint-diff ](https://fedora.softwarefactory-project.io/zuul/build/60643d3e2a1b4c0ea909ef80235a584d) : SUCCESS in 2m 31s - [fi-yamllint-diff ](https://fedora.softwarefactory-project.io/zuul/build/3b7a93dce9e842f28ab235536c623cdb) : SUCCESS in 2m 05s
adamwill commented 2025-02-24 03:46:06 +00:00
Author
Contributor
Copy link

did you run the check on it? was it ok?

did you run the check on it? was it ok?
kevin commented 2025-02-24 04:03:04 +00:00
Contributor
Copy link

Yeah, ran check then for real, Seemed ok.

Yeah, ran check then for real, Seemed ok.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
freeze-break-request

   
post-freeze
No labels
freeze-break-request
post-freeze
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
4 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Infrastructure/ansible#2485
No description provided.
Delete branch "fix-bodhi-compose-branched-template"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?