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

Use cifmw_architecture_scenario to set proper automation file #2267

Merged
merged 1 commit into from
Sep 3, 2024

Conversation

raukadah
Copy link
Contributor

@raukadah raukadah commented Aug 27, 2024

openstack-k8s-operators/architecture#375 splits the default vars into different scenario files. We need to fix the reproducer to adapt this change.

This pull-request uses cifmw_architecture_scenario to set proper automation file.
It drops cifmw_arch_automation_file params from scenario files.

Depends-On: openstack-k8s-operators/architecture#375

[VA HCI test results](VA HCI test results: https://review.rdoproject.org/r/c/tripleo-downstream-trigger-nested-virt/+/54197/1#message-8ff37ab5d3092b1dedde50f1c39440965673c825)

Copy link
Contributor

openshift-ci bot commented Aug 27, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

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/582e9425af4a460c9e9088e5ad156d37

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 30m 47s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 13m 45s
cifmw-crc-podified-edpm-baremetal RETRY_LIMIT in 21m 24s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 07s
✔️ cifmw-pod-pre-commit SUCCESS in 6m 56s
✔️ cifmw-pod-zuul-files SUCCESS in 4m 25s
✔️ cifmw-architecture-validate-hci SUCCESS in 3m 52s
✔️ cifmw-molecule-reproducer SUCCESS in 14m 21s

@raukadah raukadah force-pushed the split_default_automation branch from 7bad0da to a1d4dd5 Compare August 28, 2024 00:26
@raukadah raukadah marked this pull request as ready for review August 28, 2024 08:06
@raukadah
Copy link
Contributor Author

/trigger github-experimental

@raukadah
Copy link
Contributor Author

/trigger github-experimental

Copy link
Collaborator

@cjeanner cjeanner left a comment

Choose a reason for hiding this comment

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

On the right track, but some git grep would help tracking down unwanted dangling content.

zuul.d/architecture-jobs.yaml Show resolved Hide resolved
openstack-k8s-operators/architecture#375 splits
the default vars into different scenario files. We need to fix the
reproducer to adapt this change.

This pull-request uses cifmw_architecture_scenario to set proper automation file.
It drops cifmw_arch_automation_file params from scenario files.

Depends-On: openstack-k8s-operators/architecture#375

Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
@raukadah raukadah force-pushed the split_default_automation branch from c3a0c54 to 3273071 Compare August 30, 2024 06:27
raukadah added a commit to raukadah/architecture that referenced this pull request Sep 3, 2024
openstack-k8s-operators#375 splits the default vars into different scenario files.
openstack-k8s-operators/ci-framework#2267
suggests to use Use cifmw_architecture_scenario to set proper automation
file.

So we are no longer needing default.yaml file.

Depends-On: openstack-k8s-operators/ci-framework#2267

Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
@raukadah raukadah changed the title Use cifmw_arch_automation_file instead of default automation file Use cifmw_architecture_scenario to set proper automation file Sep 3, 2024
raukadah added a commit to raukadah/architecture that referenced this pull request Sep 3, 2024
openstack-k8s-operators#375 splits the default vars into different scenario files.
We need to follow similar pattern for bgp_dt01 also.

Depends-On: openstack-k8s-operators/ci-framework#2267

Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
raukadah added a commit to raukadah/architecture that referenced this pull request Sep 3, 2024
openstack-k8s-operators#375 splits the default vars into different scenario files.
We need to follow similar pattern for bgp_dt01 also.

Depends-On: openstack-k8s-operators/ci-framework#2267

Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
cjeanner pushed a commit to openstack-k8s-operators/architecture that referenced this pull request Sep 3, 2024
#375 splits the default vars into different scenario files.
openstack-k8s-operators/ci-framework#2267
suggests to use Use cifmw_architecture_scenario to set proper automation
file.

So we are no longer needing default.yaml file.

Depends-On: openstack-k8s-operators/ci-framework#2267

Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
@cjeanner
Copy link
Collaborator

cjeanner commented Sep 3, 2024

/approve
We're running some testing to ensure everything's fine.

Copy link
Contributor

openshift-ci bot commented Sep 3, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cjeanner

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

@openshift-ci openshift-ci bot added the approved label Sep 3, 2024
@eshulman2
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Sep 3, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 7557d20 into main Sep 3, 2024
5 checks passed
@openshift-merge-bot openshift-merge-bot bot deleted the split_default_automation branch September 3, 2024 06:38
softwarefactory-project-zuul bot added a commit to openstack-k8s-operators/architecture that referenced this pull request Sep 4, 2024
Move bgp_dt01 into its own automation file

#375 splits the default vars into different scenario files. We need to follow similar pattern for bgp_dt01 also.
Depends-On: openstack-k8s-operators/ci-framework#2267

Reviewed-by: Marios Andreou
cjeanner pushed a commit to raukadah/architecture that referenced this pull request Sep 4, 2024
openstack-k8s-operators#375 splits the default vars into different scenario files.
openstack-k8s-operators/ci-framework#2267
suggests to use Use cifmw_architecture_scenario to set proper automation
file.

So we are no longer needing default.yaml file.

Depends-On: openstack-k8s-operators/ci-framework#2267

Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
cjeanner pushed a commit to openstack-k8s-operators/architecture that referenced this pull request Sep 4, 2024
#375 splits the default vars into different scenario files.
openstack-k8s-operators/ci-framework#2267
suggests to use Use cifmw_architecture_scenario to set proper automation
file.

So we are no longer needing default.yaml file.

Depends-On: openstack-k8s-operators/ci-framework#2267

Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
softwarefactory-project-zuul bot added a commit to openstack-k8s-operators/architecture that referenced this pull request Sep 4, 2024
Drop default.yaml file

#375 splits the default vars into different scenario files. openstack-k8s-operators/ci-framework#2267 suggests to use Use cifmw_architecture_scenario to set proper automation file.
So we are no longer needing default.yaml file.
Depends-On: openstack-k8s-operators/ci-framework#2292

Reviewed-by: Cédric Jeanneret
eduolivares pushed a commit to eduolivares/architecture that referenced this pull request Sep 9, 2024
openstack-k8s-operators#375 splits the default vars into different scenario files.
We need to follow similar pattern for bgp_dt01 also.

Depends-On: openstack-k8s-operators/ci-framework#2267

Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
(cherry picked from commit 116ab90)
@raukadah
Copy link
Contributor Author

/cherrypick 18.0.0-proposed

@openshift-cherrypick-robot

@raukadah: #2267 failed to apply on top of branch "18.0.0-proposed":

Applying: Use cifmw_architecture_scenario to set proper automation file
Using index info to reconstruct a base tree...
M	docs/source/usage/01_usage.md
M	roles/reproducer/tasks/configure_controller.yml
M	zuul.d/architecture-jobs.yaml
Falling back to patching base and 3-way merge...
Auto-merging zuul.d/architecture-jobs.yaml
CONFLICT (content): Merge conflict in zuul.d/architecture-jobs.yaml
Auto-merging roles/reproducer/tasks/configure_controller.yml
Auto-merging docs/source/usage/01_usage.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use cifmw_architecture_scenario to set proper automation file
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick 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.

raukadah added a commit that referenced this pull request Sep 12, 2024
openstack-k8s-operators/architecture#383 drops
defaults.yaml scenario file in favor of
openstack-k8s-operators/architecture#375.

#2267
suggests to use  Use cifmw_architecture_scenario to set proper
automation file.

Whereever default.yaml is used, the job broke. This pr fixes the
same using cifmw_architecture_scenario file.

Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
raukadah added a commit that referenced this pull request Sep 12, 2024
openstack-k8s-operators/architecture#383 drops
defaults.yaml scenario file in favor of
openstack-k8s-operators/architecture#375.

#2267
suggests to use  Use cifmw_architecture_scenario to set proper
automation file.

Whereever default.yaml is used, the job broke. This pr fixes the
same using cifmw_architecture_scenario file.

Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
openshift-merge-bot bot pushed a commit that referenced this pull request Sep 12, 2024
openstack-k8s-operators/architecture#383 drops
defaults.yaml scenario file in favor of
openstack-k8s-operators/architecture#375.

#2267
suggests to use  Use cifmw_architecture_scenario to set proper
automation file.

Whereever default.yaml is used, the job broke. This pr fixes the
same using cifmw_architecture_scenario file.

Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/ci-framework that referenced this pull request Sep 12, 2024
openstack-k8s-operators/architecture#383 drops
defaults.yaml scenario file in favor of
openstack-k8s-operators/architecture#375.

openstack-k8s-operators#2267
suggests to use  Use cifmw_architecture_scenario to set proper
automation file.

Whereever default.yaml is used, the job broke. This pr fixes the
same using cifmw_architecture_scenario file.

Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
openshift-merge-bot bot pushed a commit that referenced this pull request Sep 12, 2024
openstack-k8s-operators/architecture#383 drops
defaults.yaml scenario file in favor of
openstack-k8s-operators/architecture#375.

#2267
suggests to use  Use cifmw_architecture_scenario to set proper
automation file.

Whereever default.yaml is used, the job broke. This pr fixes the
same using cifmw_architecture_scenario file.

Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants