Skip to content
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

[ci_gen_kustomize_values] Allow reject vars patches #2608

Merged
merged 1 commit into from
Dec 19, 2024
Merged

[ci_gen_kustomize_values] Allow reject vars patches #2608

merged 1 commit into from
Dec 19, 2024
+19 −3

Conversation

pablintino
Copy link
Collaborator

No description provided.

@pablintino pablintino requested review from hjensas and a team December 16, 2024 16:16
@github-actions github-actions bot marked this pull request as draft December 16, 2024 16:16
@github-actions GitHub Actions
Copy link

Thanks for the PR! ❤️
I'm marking it as a draft, once your happy with it merging and the PR is passing CI, click the "Ready for review" button below.

@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/f13d73ed042b4108a4274d1e3ed9f242

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 44m 23s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 17m 56s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 31m 38s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 06s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 43s
❌ cifmw-architecture-validate-hci FAILURE in 3m 16s
✔️ build-push-container-cifmw-client SUCCESS in 20m 51s
❌ cifmw-molecule-ci_gen_kustomize_values FAILURE in 5m 45s

hjensas
hjensas reviewed Dec 16, 2024
View reviewed changes
roles/ci_gen_kustomize_values/tasks/generate_snippets.yml Outdated
{% set _ = _final_list.extend(entry) -%}
{% endif -%}
{% endfor -%}
{{ _final_list | unique }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can just concatenate the lists, and then | flatten | unique?

{{ 
  (_cifmw_gen_kustomize_values_reject_extra_expressions +
   cifmw_ci_gen_kustomize_values_remove_keys_expressions)
  | flatten | unique  
}}

Copy link
Collaborator Author

@pablintino pablintino Dec 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hjensas the approach I took allows the user to pass individual regexes, thus the if/else

EDIT: Give me a few to try what you said, it may work in this case, true.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hjensas Good catch man, i didn't thought about using flatten this time.

@pablintino pablintino force-pushed the ci_gen_kustomize_values-extra-reject-vars branch from 381a1a3 to 93455e4 Compare December 17, 2024 10:58
@pablintino pablintino marked this pull request as ready for review December 17, 2024 10:58
@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/21d78bbc4c794213989884792c39341c

✔️ openstack-k8s-operators-content-provider SUCCESS in 3h 28m 35s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 18m 24s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 31m 51s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 7m 55s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 32s
❌ cifmw-architecture-validate-hci FAILURE in 3m 15s
✔️ build-push-container-cifmw-client SUCCESS in 37m 40s
❌ cifmw-molecule-ci_gen_kustomize_values FAILURE in 4m 48s

@pablintino pablintino force-pushed the ci_gen_kustomize_values-extra-reject-vars branch from 93455e4 to a622355 Compare December 18, 2024 10:29
lewisdenny
lewisdenny approved these changes Dec 19, 2024
View reviewed changes
Copy link
Collaborator

@lewisdenny lewisdenny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 19, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lewisdenny

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@hjensas
Copy link
Contributor

hjensas commented Dec 19, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Dec 19, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 19910b3 into main Dec 19, 2024
5 checks passed
@openshift-merge-bot openshift-merge-bot bot deleted the ci_gen_kustomize_values-extra-reject-vars branch December 19, 2024 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hjensas hjensas hjensas left review comments

@lewisdenny lewisdenny lewisdenny approved these changes

Assignees

@hjensas hjensas

Labels
approved lgtm Ready For Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pablintino @hjensas @lewisdenny