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

Cleanup tox.ini and GHA #439

Merged
merged 11 commits into from
Nov 11, 2023
Merged

Conversation

GomathiselviS
Copy link
Contributor

@GomathiselviS GomathiselviS commented Nov 7, 2023

SUMMARY
  • Ansible-lint pinned to 6.21.x
  • Refactored the GitHub workflows so that the files are consistent across all cloud repos.
  • Removed references to gouttelette from tox.ini
ISSUE TYPE
  • Bugfix Pull Request
  • Docs Pull Request
  • Feature Pull Request
  • New Module Pull Request
COMPONENT NAME
ADDITIONAL INFORMATION

Copy link

codecov bot commented Nov 7, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (79e8a98) 35.67% compared to head (db38f3b) 35.67%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #439   +/-   ##
=======================================
  Coverage   35.67%   35.67%           
=======================================
  Files         143      143           
  Lines       11305    11305           
  Branches     2291     2291           
=======================================
  Hits         4033     4033           
- Misses       7197     7272   +75     
+ Partials       75        0   -75     
Flag Coverage Δ
sanity 35.67% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

see 142 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/f3574553887547cf90b425a6b85d0216

✔️ build-ansible-collection SUCCESS in 15m 35s
✔️ ansible-tox-linters SUCCESS in 12m 19s
ansible-test-sanity-docker-devel FAILURE in 22m 43s (non-voting)
ansible-test-sanity-docker-milestone FAILURE in 8m 58s (non-voting)
ansible-test-sanity-docker-stable-2.9 FAILURE in 15m 38s
✔️ ansible-test-sanity-docker-stable-2.10 SUCCESS in 12m 24s (non-voting)
✔️ ansible-test-sanity-docker-stable-2.11 SUCCESS in 23m 39s
✔️ ansible-test-sanity-docker-stable-2.12 SUCCESS in 9m 20s
✔️ ansible-test-sanity-docker-stable-2.13 SUCCESS in 22m 13s
✔️ ansible-test-sanity-docker-stable-2.14 SUCCESS in 12m 03s
✔️ tox-cloud-refresh-examples-vmware SUCCESS in 10m 36s
✔️ ansible-galaxy-importer SUCCESS in 15m 51s

@mariolenz
Copy link
Collaborator

recheck

Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/c9d69cfeb9bb461f9fe3da2ae2f9f908

✔️ build-ansible-collection SUCCESS in 10m 20s
✔️ ansible-tox-linters SUCCESS in 17m 18s
ansible-test-sanity-docker-devel FAILURE in 13m 42s (non-voting)
ansible-test-sanity-docker-milestone FAILURE in 9m 44s (non-voting)
✔️ ansible-test-sanity-docker-stable-2.9 SUCCESS in 12m 03s
✔️ ansible-test-sanity-docker-stable-2.10 SUCCESS in 14m 47s (non-voting)
ansible-test-sanity-docker-stable-2.11 FAILURE in 14m 41s
✔️ ansible-test-sanity-docker-stable-2.12 SUCCESS in 13m 45s
✔️ ansible-test-sanity-docker-stable-2.13 SUCCESS in 8m 34s
✔️ ansible-test-sanity-docker-stable-2.14 SUCCESS in 13m 34s
✔️ tox-cloud-refresh-examples-vmware SUCCESS in 10m 44s
✔️ ansible-galaxy-importer SUCCESS in 4m 10s

@mariolenz
Copy link
Collaborator

This is weird. It looks like ansible-test-sanity-docker-stable-2.9 didn't test with 2.9 but with 2.17 the first time. At least, this is how I understand the log:

TASK [Install ansible into virtualenv]
controller | Collecting jinja2>=3.0.0 (from ansible-core==2.17.0.dev0)
controller | Collecting PyYAML>=5.1 (from ansible-core==2.17.0.dev0)
controller | Collecting cryptography (from ansible-core==2.17.0.dev0)
controller | Collecting resolvelib<1.1.0,>=0.5.3 (from ansible-core==2.17.0.dev0)
controller | Successfully installed MarkupSafe-2.1.3 PyYAML-6.0.1 ansible-core-2.17.0.dev0 cffi-1.16.0 cryptography-41.0.5 jinja2-3.1.2 pycparser-2.21 resolvelib-1.0.1

And:

controller | Read 0 sanity test ignore line(s) for Ansible 2.17 from: tests/sanity/ignore-2.17.txt

And now ansible-test-sanity-docker-stable-2.11 seems to have some problem.

@mariolenz
Copy link
Collaborator

recheck

Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/e5a513c86ae045aeb1d452895686dda1

✔️ build-ansible-collection SUCCESS in 14m 05s
ansible-test-sanity-docker-devel FAILURE in 8m 08s (non-voting)
ansible-test-sanity-docker-milestone FAILURE in 8m 01s (non-voting)
ansible-test-sanity-docker-stable-2.9 FAILURE in 10m 33s
✔️ ansible-test-sanity-docker-stable-2.10 SUCCESS in 13m 15s (non-voting)
✔️ ansible-test-sanity-docker-stable-2.11 SUCCESS in 20m 13s
✔️ ansible-test-sanity-docker-stable-2.12 SUCCESS in 8m 00s
✔️ tox-cloud-refresh-examples-vmware SUCCESS in 10m 53s
✔️ ansible-galaxy-importer SUCCESS in 10m 28s

@mariolenz
Copy link
Collaborator

recheck

Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/2b03eb2466db4171bd85563532166028

✔️ build-ansible-collection SUCCESS in 10m 02s
ansible-test-sanity-docker-devel FAILURE in 8m 34s (non-voting)
ansible-test-sanity-docker-milestone FAILURE in 15m 11s (non-voting)
ansible-test-sanity-docker-stable-2.9 FAILURE in 11m 21s
✔️ ansible-test-sanity-docker-stable-2.10 SUCCESS in 9m 36s (non-voting)
✔️ ansible-test-sanity-docker-stable-2.11 SUCCESS in 12m 13s
✔️ ansible-test-sanity-docker-stable-2.12 SUCCESS in 8m 20s
✔️ tox-cloud-refresh-examples-vmware SUCCESS in 10m 43s
✔️ ansible-galaxy-importer SUCCESS in 4m 15s

@mariolenz
Copy link
Collaborator

recheck

Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/1b51bd6dd8c3462b973230c5af5f254d

✔️ build-ansible-collection SUCCESS in 10m 40s
ansible-test-sanity-docker-devel FAILURE in 12m 11s (non-voting)
ansible-test-sanity-docker-milestone FAILURE in 13m 49s (non-voting)
✔️ ansible-test-sanity-docker-stable-2.9 SUCCESS in 18m 12s
✔️ ansible-test-sanity-docker-stable-2.10 SUCCESS in 15m 43s (non-voting)
✔️ ansible-test-sanity-docker-stable-2.11 SUCCESS in 15m 40s
✔️ ansible-test-sanity-docker-stable-2.12 SUCCESS in 12m 17s
✔️ tox-cloud-refresh-examples-vmware SUCCESS in 10m 55s
✔️ ansible-galaxy-importer SUCCESS in 5m 07s

Copy link
Collaborator

@mariolenz mariolenz left a comment

Choose a reason for hiding this comment

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

This looks basically OK to me, but ansible-lint GHA fails for some integration tests. I'm not really sure what we should do:

  • Fix things
  • Make ansible-lint ignore those files
  • Remove ansible-lint again (for now)

I tend to the last option so we can merge your other changes. And then work on ansible-lint in a second step. But that's only my opinion and I don't feel very strong on it.

What do you think?

@GomathiselviS
Copy link
Contributor Author

@mariolenz : We do not run ansible-lint on the integration test targets. So I will add a rule to skip the tests folder.

With respect to the sanity test failures seen on Zuul, we can ignore them. We will eventually remove the zuul jobs for this collection and move completely to GHA

@mariolenz
Copy link
Collaborator

We do not run ansible-lint on the integration test targets. So I will add a rule to skip the tests folder.

👍

With respect to the sanity test failures seen on Zuul, we can ignore them. We will eventually remove the zuul jobs for this collection and move completely to GHA

Oh, I don't mind those. They didn't look related to your changes and, anyway, the last ansible/check on Zull succeeded. They just confused me and I wanted to document my findings ;-)

@mariolenz
Copy link
Collaborator

@GomathiselviS ansible-lint failed again, but now with a lot of other issues. I'm afraid you'll have to have another look :-(

Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/08068924056a4568aec52de998f35e0b

✔️ build-ansible-collection SUCCESS in 10m 09s
ansible-test-sanity-docker-devel FAILURE in 10m 48s (non-voting)
ansible-test-sanity-docker-milestone FAILURE in 10m 51s (non-voting)
ansible-test-sanity-docker-stable-2.9 FAILURE in 11m 16s
ansible-test-sanity-docker-stable-2.10 FAILURE in 9m 46s (non-voting)
✔️ ansible-test-sanity-docker-stable-2.11 SUCCESS in 12m 45s
✔️ ansible-test-sanity-docker-stable-2.12 SUCCESS in 10m 00s
✔️ tox-cloud-refresh-examples-vmware SUCCESS in 10m 54s
✔️ ansible-galaxy-importer SUCCESS in 4m 16s

Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/aef8b5f8211d424eabd566da1a40a3ea

✔️ ansible-test-cloud-integration-vmware-rest SUCCESS in 18m 16s
✔️ build-ansible-collection SUCCESS in 10m 41s
ansible-test-sanity-docker-devel FAILURE in 19m 55s (non-voting)
ansible-test-sanity-docker-milestone FAILURE in 18m 44s (non-voting)
ansible-test-sanity-docker-stable-2.9 FAILURE in 11m 25s
ansible-test-sanity-docker-stable-2.10 FAILURE in 17m 51s (non-voting)
ansible-test-sanity-docker-stable-2.11 FAILURE in 23m 03s
ansible-test-sanity-docker-stable-2.12 FAILURE in 20m 24s
✔️ tox-cloud-refresh-examples-vmware SUCCESS in 11m 18s
✔️ ansible-galaxy-importer SUCCESS in 3m 33s

Copy link
Collaborator

@mariolenz mariolenz left a comment

Choose a reason for hiding this comment

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

I see you've dropped support for ansible-core < 2.14 now and set the collection version to 2.3.2. I'm not sure if we have guidelines for dropping ansible-core versions, but I know at least some people who consider this a breaking change. Which means a new major release, 3.0.0. Anyway, I think it's definitely not a bugfix. So you should increase at least the minor (2.4.0) and not only the patch version.

Personally, I would drop ansible-core < 2.14 in 3.0.0. That said, I feel a bit unsure about dropping support for ansible-core versions / doing a new major release "just like this". Can't we keep the required ansible (core) version at >=2.9.10 for now and get the GHA workflows running? And then prepare a new major release where we drop ansible-core < 2.14 and maybe do some other things (like completely re-generating everything with ansible.content_builder) properly? This feels a bit rash at the moment.

@GomathiselviS
Copy link
Contributor Author

I see you've dropped support for ansible-core < 2.14 now and set the collection version to 2.3.2. I'm not sure if we have guidelines for dropping ansible-core versions, but I know at least some people who consider this a breaking change. Which means a new major release, 3.0.0. Anyway, I think it's definitely not a bugfix. So you should increase at least the minor (2.4.0) and not only the patch version.

Personally, I would drop ansible-core < 2.14 in 3.0.0. That said, I feel a bit unsure about dropping support for ansible-core versions / doing a new major release "just like this". Can't we keep the required ansible (core) version at >=2.9.10 for now and get the GHA workflows running? And then prepare a new major release where we drop ansible-core < 2.14 and maybe do some other things (like completely re-generating everything with ansible.content_builder) properly? This feels a bit rash at the moment.

The upcoming release for this collection will be version 3.0.0. I will update the galaxy file and changelog accordingly. Please note that support for ansible-core 2.13 will be discontinued. Additional details can be found here.

@mariolenz
Copy link
Collaborator

mariolenz commented Nov 9, 2023

The upcoming release for this collection will be version 3.0.0. I will update the galaxy file and changelog accordingly.

👍

Please note that support for ansible-core 2.13 will be discontinued. Additional details can be found here.

Yes, I know ;-)

It's a bit unfortunate since it's too late to get 3.0.0 into Ansible 9... anyway, let's do it!

I'll prepare a PR to remove the 2.9 / 2.10 / 2.11 / 2.12 Zuul jobs!

Please remember to remove 2.13 from the GHA sanity tests while you're at it. I think it's still mentioned.

@mariolenz
Copy link
Collaborator

mariolenz commented Nov 9, 2023

@GomathiselviS

I'll prepare a PR to remove the 2.9 / 2.10 / 2.11 / 2.12 Zuul jobs!

ansible/ansible-zuul-jobs#1832

Please remember to remove 2.13 from the GHA sanity tests while you're at it. I think it's still mentioned.

Please also remove the ignore files 2.9 to 2.13 from tests/sanity/ because we don't need them anymore.

@mariolenz mariolenz closed this Nov 9, 2023
@mariolenz mariolenz reopened this Nov 9, 2023
@mariolenz
Copy link
Collaborator

I think Sanity tests / Sanity (Ⓐstable-2.16) fails because of ansible-community/ansible.content_builder#68

Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/6b7919d66c804cc0b256269e4148b7fa

✔️ ansible-test-cloud-integration-vmware-rest SUCCESS in 21m 11s
✔️ build-ansible-collection SUCCESS in 14m 44s
ansible-test-sanity-docker-devel FAILURE in 14m 16s (non-voting)
ansible-test-sanity-docker-milestone FAILURE in 18m 09s (non-voting)
✔️ tox-cloud-refresh-examples-vmware SUCCESS in 10m 49s
✔️ ansible-galaxy-importer SUCCESS in 9m 28s

Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/8fb3060285bd4cc5ad0c4e16a6eff979

✔️ ansible-test-cloud-integration-vmware-rest SUCCESS in 17m 36s
✔️ build-ansible-collection SUCCESS in 20m 53s
✔️ ansible-test-sanity-docker-milestone SUCCESS in 11m 13s (non-voting)
✔️ tox-cloud-refresh-examples-vmware SUCCESS in 10m 31s
✔️ ansible-galaxy-importer SUCCESS in 4m 36s

@@ -271,7 +270,7 @@ async def update_changed_flag(data, status, operation):


async def list_devices(session, url):
existing_entries = []
pass
Copy link
Collaborator

Choose a reason for hiding this comment

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

this seems unnecessary, I would suggest removing this. if we need to make changes to the generator to do that I'd be ok with merging this for now as it should be harmless and doing that under a separate PR.

Copy link
Collaborator

Choose a reason for hiding this comment

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

@jillr I don't think this file is generated. At least, when I generate code with ansible.content_builder (for example here: #441) I don't see it. But I may be wrong... I'm still learning and might have make a mistake somewhere.

Copy link
Collaborator

Choose a reason for hiding this comment

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

It might not be - I'm more familiar with the generated amazon collection and some of those module_utils lived in an early version of that generator, so calling it out just in case!

Copy link
Collaborator

Choose a reason for hiding this comment

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

@jillr It's already a very big PR with a lot of changes. I suggest to keep it like this and have a closer look at this later ;-)

Copy link
Collaborator

@mariolenz mariolenz left a comment

Choose a reason for hiding this comment

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

LGTM

@mariolenz
Copy link
Collaborator

recheck

@mariolenz
Copy link
Collaborator

temp. closing

@mariolenz mariolenz closed this Nov 10, 2023
@mariolenz mariolenz reopened this Nov 10, 2023
Copy link
Contributor

@mariolenz
Copy link
Collaborator

@GomathiselviS @jillr Is there anything left to do? Or do you think we can merge when ansible/ansible-zuul-jobs#1832 is merged, too?

@jillr
Copy link
Collaborator

jillr commented Nov 10, 2023

@mariolenz I think this one is ready; I have some other zuul PRs to review as well so I will get that one later today

@jillr jillr added the mergeit label Nov 10, 2023
Copy link
Contributor

Build failed (gate pipeline). For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

https://ansible.softwarefactory-project.io/zuul/buildset/098546abbe8146bd815c4c2250a05b17

Warning:
Change 1832 in project ansible/ansible-zuul-jobs does not share a change queue with 439 in project ansible-collections/vmware.vmware_rest

@jillr
Copy link
Collaborator

jillr commented Nov 10, 2023

@GomathiselviS I think we might need to remove the Depends-On from this ticket, but I'm not certain.

@mariolenz mariolenz closed this Nov 11, 2023
@mariolenz mariolenz reopened this Nov 11, 2023
Copy link
Contributor

Copy link
Contributor

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/88477102627f41408b5d81bfc557de5f

✔️ ansible-test-cloud-integration-vmware-rest SUCCESS in 17m 37s
✔️ build-ansible-collection SUCCESS in 10m 17s
✔️ tox-cloud-refresh-examples-vmware SUCCESS in 10m 41s
✔️ ansible-galaxy-importer SUCCESS in 16m 36s

Copy link
Contributor

Pull request merge failed: Resource not accessible by integration, You may need to manually rebase your PR and retry.

@mariolenz mariolenz merged commit a244297 into ansible-collections:main Nov 11, 2023
23 checks passed
@mariolenz
Copy link
Collaborator

I think we might need to remove the Depends-On from this ticket, but I'm not certain.

I did, but still had to merge manually:

Pull request merge failed: Resource not accessible by integration

I think because the GHA stuff / files in .github, but I'm not 100% sure.

@jillr
Copy link
Collaborator

jillr commented Nov 13, 2023

I think because the GHA stuff / files in .github, but I'm not 100% sure.

That's right, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants