Reduce python APIv2 test net dependency

[cevich]

Previously these tests pulled some test images from quay, opening them up to networking-flake induced failures. As has already been done for other tests, update to utilize the locally running registry server.

Also: Add test/python/** into the apiv2 task conditions as referenced
by the Makefile localapiv2-python target.

---

This is a guess at fixing flakes like https://api.cirrus-ci.com/v1/artifact/task/6485548934627328/html/apiv2-podman-fedora-40-root-host-sqlite.log.html

But also an update these tests should receive regardless.

Does this PR introduce a user-facing change?

None

[cevich]

Note to me: .cirrus.yml is broken, the apiv2_test_task doesn't match changes in test/python.

[Luap99]

Note to me: .cirrus.yml is broken, the apiv2_test_task doesn't match changes in test/python.

It looks to me we are running the docker-py tests (test/python/docker) twice. Once as separate task docker-py compat
make run-docker-py-tests and it also part of apiv2 test via make localapiv2-python.
As such let's just drop the docker-py tasks and fix the cirrus source skip conditions on the apiv2 task to include test/python

[Luap99]

if you feel like it below there is a bunch of CNI references that are not used at all anymore and could be dropped

[cevich]

Okay, ya I was scratching my head on that. Maybe it's best done as a followup PR.

[Luap99]

agree, I found some other cni references as well so if I find some free time I might get around to nuke that stuff finally.

[cevich]

Oh okay, thanks. I started on #23552 but it can't move forward until this merges (b/c of changesInclude() updates). I have no close attachment to that PR if you have a mind to take on this effort, otherwise I'll continue as best I can after this merges.

[Luap99]

LGTM

It looks to me we are running the docker-py tests (test/python/docker) twice. Once as separate task docker-py compat
make run-docker-py-tests and it also part of apiv2 test via make localapiv2-python.

This point is still open, I think we should just drop the docker-py task but that can happen in a another PR.

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cevich, Luap99

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:

• OWNERS [Luap99]

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

[cevich]

It looks to me we are running the docker-py tests (test/python/docker) twice.

I think they're different:

.PHONY: localapiv2-python
localapiv2-python:
	env CONTAINERS_CONF=$(CURDIR)/test/apiv2/containers.conf PODMAN=./bin/podman \
		pytest --verbose --disable-warnings ./test/apiv2/python
	touch test/__init__.py
	env CONTAINERS_CONF=$(CURDIR)/test/apiv2/containers.conf PODMAN=./bin/podman \
		pytest --verbose --disable-warnings ./test/python/docker
	rm -f test/__init__.py

One is testing the REST API the other is testing the interface used by docker-py IIRC. It's been a really long time since I worked on this setup w/ Jhon. Maybe he remembers better?

[rhatdan]

/lgtm

[Luap99]

It looks to me we are running the docker-py tests (test/python/docker) twice.

I think they're different:

.PHONY: localapiv2-python
localapiv2-python:
	env CONTAINERS_CONF=$(CURDIR)/test/apiv2/containers.conf PODMAN=./bin/podman \
		pytest --verbose --disable-warnings ./test/apiv2/python
	touch test/__init__.py
	env CONTAINERS_CONF=$(CURDIR)/test/apiv2/containers.conf PODMAN=./bin/podman \
		pytest --verbose --disable-warnings ./test/python/docker
	rm -f test/__init__.py

One is testing the REST API the other is testing the interface used by docker-py IIRC. It's been a really long time since I worked on this setup w/ Jhon. Maybe he remembers better?

They are identical calls other than the versbose option which should not make difference

.PHONY: run-docker-py-tests
run-docker-py-tests:
	touch test/__init__.py
	env CONTAINERS_CONF=$(CURDIR)/test/apiv2/containers.conf pytest --disable-warnings test/python/docker/
	rm -f test/__init__.py

[cevich]

run-docker-py-tests:

Ooohhhh, that's the one you were referring to. I thought it was the two items under localapiv2-python. My eyes glazed over seeing docker-py so much 🤣 Ya, we should delete that one, I'll open a PR.

[cevich]

#23562