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

Update to F34 and U2104 #886

Merged
merged 2 commits into from
May 11, 2021
Merged

Update to F34 and U2104 #886

merged 2 commits into from
May 11, 2021

Conversation

cevich
Copy link
Member

@cevich cevich commented Apr 29, 2021

Also modernize main library to resemble what's used in other
containers-org repositories. Lastly, update hack/get_ci_vm.sh to use
the new shared container image.

Signed-off-by: Chris Evich [email protected]

Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

Hm, looks like that there are still build issues:

[+0140s] pkg/archive/archive_ffjson.go:13:2: imported and not used: "io/fs"
[+0140s] pkg/archive/archive_ffjson.go:1652:17: fs.FileMode undefined (type *v1.FFLexer has no field or method FileMode)

@cevich
Copy link
Member Author

cevich commented May 3, 2021

Hm, looks like that there are still build issues:

Ya, and specific to F34 (somehow...maybe since it's go 1.16?). I have no idea how to fix 😢

@cevich
Copy link
Member Author

cevich commented May 3, 2021

(rebased / force-pushed)

@cevich
Copy link
Member Author

cevich commented May 3, 2021

@rhatdan do you know what's breaking / needs fixing? Vendoring problem in Fedora? Did aufs "go away" in Ubuntu 2104?

@cevich
Copy link
Member Author

cevich commented May 5, 2021

[+0127s] GO111MODULE=on go build -mod=vendor -compiler gc -tags "  "  ./cmd/containers-storage
[+0133s] # github.com/containers/storage/pkg/archive
[+0133s] pkg/archive/archive_ffjson.go:13:2: imported and not used: "io/fs"
[+0133s] pkg/archive/archive_ffjson.go:1652:17: fs.FileMode undefined (type *v1.FFLexer has no field or method FileMode)
[+0136s] make: *** [Makefile:54: containers-storage] Error 2

@cevich
Copy link
Member Author

cevich commented May 5, 2021

Oof. I tried re-vendoring ffjson to the latest available, but still get the error. This only happens on F34 (golang 1.16) and not Ubuntu 2104 (golang 1.15.11). So I suspect it's a problem with the newwer golang version. I will attempt to report this problem upstream, but the project doesn't appear to be very active 😢

@cevich
Copy link
Member Author

cevich commented May 5, 2021

Opened pquerna/ffjson#262

@cevich
Copy link
Member Author

cevich commented May 6, 2021

Team discussion notes:

  • Other containers-org projects switched to json-iter a number of years ago
  • ffjson violates some golang tenements / idoms WRT marshling structs.
  • json-iter does not require generating code
  • Switching would likely be difficult
  • There is time-pressure on this given it's blocking upgrades

@cevich
Copy link
Member Author

cevich commented May 6, 2021

Force-pushed after rebasing onto #889

@cevich
Copy link
Member Author

cevich commented May 7, 2021

rebased onto master

@rhatdan
Copy link
Member

rhatdan commented May 8, 2021

Looks like this needs @nalind PR for pattern matching.

@cevich
Copy link
Member Author

cevich commented May 11, 2021

rebased onto master

@cevich
Copy link
Member Author

cevich commented May 11, 2021

Oh okay it's passing now. Seems like maybe I simply need to disable aufs testing on U2104 (not supported).

cevich added 2 commits May 11, 2021 14:25
Also modernize main library to resemble what's used in other
containers-org repositories.  Lastly, update hack/get_ci_vm.sh to use
the new shared container image.

Signed-off-by: Chris Evich <[email protected]>
@cevich
Copy link
Member Author

cevich commented May 11, 2021

rebased + dropped testing of AUFS in the latest Ubuntu.

@rhatdan
Copy link
Member

rhatdan commented May 11, 2021

LGTM
@cevich Has Ubuntu dropped support for AUFS?

@cevich
Copy link
Member Author

cevich commented May 11, 2021

@rhatdan that's my guess. In the prior run, that's the error message given.

@rhatdan
Copy link
Member

rhatdan commented May 11, 2021

@nalind @vrothberg @saschagrunert We should consider dropping support for AUFS if ubuntu has dropped it.

@rhatdan rhatdan merged commit 64027f4 into containers:master May 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants