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

ci/container.yml: build also vdsm-test containers #337

Merged
merged 3 commits into from
Dec 19, 2022

Conversation

aesteve-rh
Copy link
Member

@aesteve-rh aesteve-rh commented Oct 5, 2022

Build also vdsm test containers in the weekly
build workflow.

Add another job to the containers workflow
to build and upload test containers
in docker directory.

For test containers, build each distro
separately and push it to the same
repository with a different tag.

Final tree of Vdsm repositories:

.
└── ovirt/
    ├── ovirt-vdsm-network-tests-functional:
    │   ├── centos-8
    │   ├── centos-9
    │   └── alma-9
    ├── ovirt-vdsm-network-tests-integration:
    │   ├── centos-8
    │   ├── centos-9
    │   └── alma-9
    ├── ovirt-vdsm-network-tests-unit:
    │   ├── centos-8
    │   ├── centos-9
    │   └── alma-9
    └── ovirt-test:
        ├── centos-8
        ├── centos-9
        └── alma-9

Signed-off-by: Albert Esteve aesteve@redhat.com

@aesteve-rh aesteve-rh self-assigned this Oct 5, 2022
@aesteve-rh aesteve-rh force-pushed the aesteve/build-containers-weekly branch from ec69138 to 8723da6 Compare October 6, 2022 13:49
@aesteve-rh aesteve-rh requested a review from tinez October 6, 2022 13:50
docker/Makefile Show resolved Hide resolved
docker/Makefile Show resolved Hide resolved
docker/Dockerfile.alma-9 Show resolved Hide resolved
docker/Makefile Show resolved Hide resolved
.github/workflows/containers.yml Outdated Show resolved Hide resolved
@aesteve-rh
Copy link
Member Author

aesteve-rh commented Oct 28, 2022

I was thinking how to unify strategies, and in the end I think this may be the best option:

It follows a distro:version scheme for container names, which feels more natural. All of them can share the same targets in the makefile (i.e., [ centos-8, centos-9, alma-9 ]), it would only require a small update in the network makefile to change the target and the type variables; and would still keep the network containers grouped, so the number of repositories in quay will not explode.

This will make the workflow update easier.

What do you think? @tinez @nirs @almusil

Back one step, due to recent changes in ovirt-imageio (that already uses a single repository for tests, with distro as tag).

@aesteve-rh aesteve-rh force-pushed the aesteve/build-containers-weekly branch 2 times, most recently from e6731b1 to 86569ed Compare November 4, 2022 10:05
@aesteve-rh
Copy link
Member Author

Already created the repository: https://quay.io/repository/ovirt/vdsm-test

tinez
tinez previously approved these changes Nov 4, 2022
Change the image name format to be consistent
with network container images.
In the new format, the distro is
determined by the tag.

Before:
test-vdsm-centos-8:latest
test-vdsm-centos-9:latest

After:
test-vdsm:centos-8
test-vdsm:centos-9

Signed-off-by: Albert Esteve <aesteve@redhat.com>
Add alma-9 distro to test containers.

Signed-off-by: Albert Esteve <aesteve@redhat.com>
Build also vdsm test containers in the weekly
build workflow.

Add another job to the containers workflow
to build and upload test containers
in `docker` directory.

For test containers, build each distro
separately and push it to the same
repository with a different tag.

Final tree of Vdsm repositories:
.
└── ovirt/
    ├── ovirt-vdsm-network-tests-functional:
    │   ├── centos-8
    │   ├── centos-9
    │   └── alma-9
    ├── ovirt-vdsm-network-tests-integration:
    │   ├── centos-8
    │   ├── centos-9
    │   └── alma-9
    ├── ovirt-vdsm-network-tests-unit:
    │   ├── centos-8
    │   ├── centos-9
    │   └── alma-9
    └── ovirt-test:
        ├── centos-8
        ├── centos-9
        └── alma-9

Signed-off-by: Albert Esteve <aesteve@redhat.com>
@aesteve-rh aesteve-rh force-pushed the aesteve/build-containers-weekly branch from 848280c to 8200090 Compare December 13, 2022 10:08
@aesteve-rh aesteve-rh requested review from nirs and tinez December 13, 2022 10:10
@aesteve-rh aesteve-rh merged commit 5333221 into oVirt:master Dec 19, 2022
@aesteve-rh aesteve-rh deleted the aesteve/build-containers-weekly branch December 19, 2022 12:36
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.

5 participants