Skip to content

Fix dnf update installing netavark/aardvark-dns#149

Merged
cevich merged 2 commits intocontainers:mainfrom
cevich:never_packages
Jul 15, 2022
Merged

Fix dnf update installing netavark/aardvark-dns#149
cevich merged 2 commits intocontainers:mainfrom
cevich:never_packages

Conversation

@cevich
Copy link
Copy Markdown
Member

@cevich cevich commented Jul 14, 2022

These packages should never be pre-installed in the CI images for
testing in the netavark & aardvark-dns repositories. Ensure they aren't
brought in by a package update in addition to the install.

Signed-off-by: Chris Evich cevich@redhat.com

@cevich
Copy link
Copy Markdown
Member Author

cevich commented Jul 14, 2022

Ref: containers/netavark#308 & containers/netavark#344

This was referenced Jul 14, 2022
Merged
Merged
@cevich cevich added no_ubuntu no_skopeo_cidev Don't build the skopeo_cidev image no_build-push Don't build the build-push image no_fedora_podman Don't build the fedora_podman image no_prior-fedora_podman Don't build the prior-fedora_podman image no_fedora-podman-py Don't build the fedora-podman-py image no_image-builder Don't build the image-builder image and removed no_ubuntu no_skopeo_cidev Don't build the skopeo_cidev image no_build-push Don't build the build-push image no_fedora_podman Don't build the fedora_podman image no_prior-fedora_podman Don't build the prior-fedora_podman image no_fedora-podman-py Don't build the fedora-podman-py image no_image-builder Don't build the image-builder image labels Jul 14, 2022
cevich added 2 commits July 14, 2022 16:08
@cevich
Fix dnf update installing netavark/aardvark-dns
63d0f78 
The netavark & aardvark-dns binaries should _never_ be present in the
netavark CI images for testing.  However, the packages are needed to
ensure dependencies are properly handled.  Since CI runtime will take
care of installing or building the binaries, just remove the
on-disk files referenced by the packages.

Signed-off-by: Chris Evich <cevich@redhat.com>
@cevich
Fix get_ci_vm test ownership over-sensitivity
5a59173 
Signed-off-by: Chris Evich <cevich@redhat.com>
@cevich
Copy link
Copy Markdown
Member Author

cevich commented Jul 14, 2022

force-push: Fixed permission-denied problem.

@github-actions
Copy link
Copy Markdown

github-actions bot commented Jul 14, 2022

Cirrus CI build successful. Image ID c5353795591864320 ready for use.

flouthoc
flouthoc approved these changes Jul 15, 2022
View reviewed changes
Copy link
Copy Markdown

@flouthoc flouthoc left a comment

Choose a reason for hiding this comment

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

LGTM

flouthoc added a commit to flouthoc/netavark that referenced this pull request Jul 15, 2022
@flouthoc
.cirrus.yml: update vm image
90a94c2 
Try using VM image from containers/automation_images#149

Signed-off-by: Aditya R <arajan@redhat.com>
@flouthoc
Copy link
Copy Markdown

flouthoc commented Jul 15, 2022

I see some failures in build_cross with this image: https://cirrus-ci.com/task/6066640541450240

@lsm5
Copy link
Copy Markdown
Member

lsm5 commented Jul 15, 2022 •
edited
Loading

shouldn't we install packages from podman-next copr instead?

EDIT: s/pull/install.

@lsm5
Copy link
Copy Markdown
Member

lsm5 commented Jul 15, 2022

I'm thinking this:

  • Install netavark, aardvark, podman etc. from the podman-next COPR. Do not remove any files here.
  • In the aardvark CI env, rm /usr/libexec/podman/aardvark-dns
  • In the netavark CI env, rm /usr/libexec/podman/netavark

That way we can perhaps get rid of build_cross targets altogether and also not worry about curling zips or tarballs.

@lsm5
Copy link
Copy Markdown
Member

lsm5 commented Jul 15, 2022

hmm, installing packages here would mean the image would need to get built continuously to test with the latest commits merged upstream? Maybe any package installation from the copr should actually be done in the individual repos and not here?

@cevich cevich mentioned this pull request Jul 15, 2022
Merged
@cevich
Copy link
Copy Markdown
Member Author

cevich commented Jul 15, 2022

Maybe any package installation from the copr should actually be done in the individual repos and not here?

Yes, and good on you for observing this. Yes, we want the stuff being tested to come from builds in the PR and/or be very recent builds from podman-next (for dependencies). Otherwise, for the basic environment stuff that doesn't need to be updated constantly, it should be pre-installed in the images.

@cevich
Copy link
Copy Markdown
Member Author

cevich commented Jul 15, 2022

Ugh, I need to go manually trudging through the tasks and pull out image Id's, need to update that bot. So looks like:

  • GCE image ID is c5353795591864320
  • fedora-aws is ami-09e5978f141900855
  • fedora-netavark-aws-arm64 is ami-00d7ccde5eaacc50e
  • fedora-podman-aws-arm64 is ami-02da46d8fa51e5316

@cevich cevich merged commit 7731369 into containers:main Jul 15, 2022
@cevich cevich mentioned this pull request Jul 15, 2022
Merged
cevich added a commit to cevich/buildah that referenced this pull request Jul 15, 2022
@cevich
Cirrus: Update VM images w/ updated bats
ee94054 
Ref: containers/automation_images#140
     and
     containers/automation_images#149

Signed-off-by: Chris Evich <cevich@redhat.com>
cevich added a commit to cevich/buildah that referenced this pull request Jul 20, 2022
@cevich
Cirrus: Update VM images w/ updated bats
eac08bb 
Note: Fedora-35 is disabled due to missing golang 1.18

Ref: containers/automation_images#140
     and
     containers/automation_images#149
     and
     containers/automation_images#146

Signed-off-by: Chris Evich <cevich@redhat.com>
@cevich cevich mentioned this pull request Jul 20, 2022
Merged
cevich added a commit to cevich/buildah that referenced this pull request Jul 20, 2022
@cevich
Cirrus: Update VM images w/ updated bats
da9378c 
Note: Fedora-35 is disabled due to missing golang 1.18

Ref: containers/automation_images#140
     and
     containers/automation_images#149
     and
     containers/automation_images#146

Signed-off-by: Chris Evich <cevich@redhat.com>
cevich added a commit to cevich/buildah that referenced this pull request Jul 21, 2022
@cevich
Cirrus: Update VM images w/ updated bats
6841f92 
Note: Fedora-35 is disabled due to missing golang 1.18

Ref: containers/automation_images#140
     and
     containers/automation_images#149
     and
     containers/automation_images#146

Signed-off-by: Chris Evich <cevich@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@flouthoc flouthoc flouthoc approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@cevich @flouthoc @lsm5