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.

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

Make sure set_openstack_container is less depedent on instal_yamls #2389

Conversation

ciecierski
Copy link
Contributor

@ciecierski ciecierski commented Sep 26, 2024

Cleanup set_openstack_container role by setting default values and omitting
setting fact if install_yamls was not used during deployment.

This is first atempt of reducing dependency in set_openstack_container role
from install_yamls. The work that is left for later is for updating
ENVs in operators other than openstack-operator. Task that waits
for an operator(other than openstack-operator) update to complete will only work in install_yaml deployed environments and is skipped in architecture_scenario context.

Jira: https://issues.redhat.com/browse/OSPRH-10285

@github-actions github-actions bot marked this pull request as draft September 26, 2024 08:36
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.

@ciecierski ciecierski added the minor update Changes for minor update automation label Sep 26, 2024
@ciecierski ciecierski force-pushed the set_openstack_container_refactor branch from f77c00f to 28d3947 Compare September 27, 2024 08:01
Copy link
Contributor

@sathlan sathlan left a comment

Choose a reason for hiding this comment

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

LGTM, just a note about the extra conditional for operator_name, as I'm not sure we really need this. But not a blocker.

Copy link
Contributor

@sathlan sathlan left a comment

Choose a reason for hiding this comment

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

LGTM

roles/set_openstack_containers/tasks/main.yml Outdated Show resolved Hide resolved
@@ -105,14 +109,17 @@
ansible.builtin.include_role:
name: 'install_yamls_makes'
tasks_from: 'make_wait'
when:
- operator_name != 'openstack'
- not cifmw_architecture_scenario is defined
Copy link
Collaborator

Choose a reason for hiding this comment

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

The fact we need to check against the presence of cifmw_architecture_scenario in this role is a big red flag. But it's out of the scope of your change.

Cleanup set_openstack_container role by setting default values and omitting
setting fact if install_yamls was not used during deployment.

This is first atempt of reducing dependency of set_openstack_container role
from install_yamls. The work that is left for later is for updating
envs in operators other than openstack-operator. Task that waits
for an operator update to complete will only work in install_yaml deployed
enviroments and is skipped in architecture_scenario context.
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/9535705faf7044239d0f4f2300ae2992

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 49m 21s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 18m 24s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 26m 00s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 7m 27s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 25s
build-push-container-cifmw-client FAILURE in 15m 49s
✔️ cifmw-molecule-set_openstack_containers SUCCESS in 21m 23s

@pablintino
Copy link
Collaborator

recheck

@pablintino
Copy link
Collaborator

/approve

Copy link
Contributor

openshift-ci bot commented Oct 17, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pablintino

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

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.

/lgtm

+1 for being less dependent on install_yamls.

@openshift-merge-bot openshift-merge-bot bot merged commit bff7cfb into openstack-k8s-operators:main Oct 18, 2024
4 checks passed
@ciecierski
Copy link
Contributor Author

/cherry-pick 18.0.0-proposed

@openshift-cherrypick-robot

@ciecierski: #2389 failed to apply on top of branch "18.0.0-proposed":

Applying: Make sure set_openstack_container is less depedent on instal_yamls
Using index info to reconstruct a base tree...
M	playbooks/update.yml
M	roles/set_openstack_containers/tasks/main.yml
M	roles/set_openstack_containers/templates/update_env_vars.sh.j2
Falling back to patching base and 3-way merge...
Auto-merging roles/set_openstack_containers/templates/update_env_vars.sh.j2
Auto-merging roles/set_openstack_containers/tasks/main.yml
CONFLICT (content): Merge conflict in roles/set_openstack_containers/tasks/main.yml
Auto-merging playbooks/update.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Make sure set_openstack_container is less depedent on instal_yamls

In response to this:

/cherry-pick 18.0.0-proposed

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@ciecierski
Copy link
Contributor Author

/cherry-pick 18.0.0-proposed

@openshift-cherrypick-robot

@ciecierski: new pull request created: #2470

In response to this:

/cherry-pick 18.0.0-proposed

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm minor update Changes for minor update automation Ready For Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants