Checkout appropriate containerd ref #1752
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
helsaawy
force-pushed
the
containerd-ref
branch
2 times, most recently
from
9552f33 to
b86e257
Compare
|
hm. looks like we have a nil pointer deref |
I was wondering why the tests started failing; it worked when it wasn't rebased on the latest main (https://github.com/helsaawy/hcsshim/actions/runs/4886588595/jobs/8722219496) -- aside from the symlink tests |
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
May 4, 2023
Caching is enabled by default in `actions/setup-go@v4` (https://github.com/actions/setup-go#caching-dependency-files-and-build-outputs) so update the `go.sum` path when checking out hcsshim to a non-default path. Additionally, disable for linting, since that often causes errors. Without caching, wont need to explicitly delete the module cache. Relies on: microsoft#1752 Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
May 4, 2023
Caching is enabled by default in `actions/setup-go@v4` (https://github.com/actions/setup-go#caching-dependency-files-and-build-outputs) so update the `go.sum` path when checking out hcsshim to a non-default path. Additionally, disable for linting, since that often causes errors. Without caching, wont need to explicitly delete the module cache. Relies on: microsoft#1752 Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
Use containerd version from go.mod when checking out and building upstream containerd for testing. containerd integration tests updated in 1.6.20 to work on windows. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
anmaxvl
approved these changes
May 8, 2023
katiewasnothere
approved these changes
May 8, 2023
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
May 8, 2023
Caching is enabled by default in `actions/setup-go@v4` (https://github.com/actions/setup-go#caching-dependency-files-and-build-outputs) so update the `go.sum` path when checking out hcsshim to a non-default path. Additionally, disable for linting, since that often causes errors. Without caching, wont need to explicitly delete the module cache. Relies on: microsoft#1752 Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
May 30, 2023
Caching is enabled by default in `actions/setup-go@v4` (https://githut b.com/actions/setup-go#caching-dependency-files-and-build-outputs) so update the `go.sum` path when checking out hcsshim to a non-default path. Additionally, disable for linting, since that often causes errors. Without caching, wont need to explicitly delete the module cache. Relies on: microsoft#1752 Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
May 30, 2023
Caching is enabled by default in `actions/setup-go@v4` (https://githut b.com/actions/setup-go#caching-dependency-files-and-build-outputs) so update the `go.sum` path when checking out hcsshim to a non-default path. Additionally, disable for linting, since that often causes errors. Without caching, wont need to explicitly delete the module cache. Relies on: microsoft#1752 Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
that referenced
this pull request
Jun 2, 2023
Caching is enabled by default in `actions/setup-go@v4` (https://githut b.com/actions/setup-go#caching-dependency-files-and-build-outputs) so update the `go.sum` path when checking out hcsshim to a non-default path. Additionally, disable for linting, since that often causes errors. Without caching, wont need to explicitly delete the module cache. Relies on: #1752 Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
Sep 7, 2023
Incorporate several CI changes from multiple PRs: - microsoft#1632 - microsoft#1752 - microsoft#1755 - microsoft#1799 - microsoft#1820 - microsoft#1836 - microsoft#1853 - microsoft#1854 It is easier to checkout the changes directly rather than cherry-pick commits and undo any changes that affect code not backported to this release. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
Sep 7, 2023
Incorporate several CI changes from multiple PRs: - microsoft#1632 - microsoft#1752 - microsoft#1755 - microsoft#1799 - microsoft#1820 - microsoft#1836 - microsoft#1853 - microsoft#1854 It is easier to checkout the changes directly rather than cherry-pick commits and undo any changes that affect code not backported to this release. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
Sep 7, 2023
Incorporate several CI changes from multiple PRs: - microsoft#1632 - microsoft#1752 - microsoft#1755 - microsoft#1799 - microsoft#1820 - microsoft#1836 - microsoft#1853 - microsoft#1854 It is easier to checkout the changes directly rather than cherry-pick commits and undo any changes that affect code not backported to this release. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
Sep 7, 2023
Incorporate several CI changes from multiple PRs: - microsoft#1632 - microsoft#1752 - microsoft#1755 - microsoft#1799 - microsoft#1820 - microsoft#1836 - microsoft#1853 - microsoft#1854 It is easier to checkout the changes directly rather than cherry-pick commits and undo any changes that affect code not backported to this release. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
Sep 7, 2023
Incorporate several CI changes from multiple PRs: - microsoft#1632 - microsoft#1752 - microsoft#1755 - microsoft#1799 - microsoft#1820 - microsoft#1836 - microsoft#1853 - microsoft#1854 It is easier to checkout the changes directly rather than cherry-pick commits and undo any changes that affect code not backported to this release. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
Sep 7, 2023
Incorporate several CI changes from multiple PRs: - microsoft#1632 - microsoft#1752 - microsoft#1755 - microsoft#1799 - microsoft#1820 - microsoft#1836 - microsoft#1853 - microsoft#1854 It is easier to checkout the changes directly rather than cherry-pick commits and undo any changes that affect code not backported to this release. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
Sep 7, 2023
Incorporate several CI changes from multiple PRs: - microsoft#1632 - microsoft#1752 - microsoft#1755 - microsoft#1799 - microsoft#1820 - microsoft#1836 - microsoft#1853 - microsoft#1854 It is easier to checkout the changes directly rather than cherry-pick commits and undo any changes that affect code not backported to this release. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
Sep 7, 2023
Incorporate several CI changes from multiple PRs: - microsoft#1632 - microsoft#1752 - microsoft#1755 - microsoft#1799 - microsoft#1820 - microsoft#1836 - microsoft#1853 - microsoft#1854 It is easier to checkout the changes directly rather than cherry-pick commits and undo any changes that affect code not backported to this release. Fix bug in `internal\winapi\winapi.go` where `user.go` is referenced but does not exist. Remove `/usr/local/include` from `Protobuild.toml`, since it does not exist on Windows, and our CI build logic does not rely on it. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
Sep 7, 2023
Incorporate several CI changes from multiple PRs: - microsoft#1632 - microsoft#1752 - microsoft#1755 - microsoft#1799 - microsoft#1820 - microsoft#1836 - microsoft#1853 - microsoft#1854 It is easier to checkout the changes directly rather than cherry-pick commits and undo any changes that affect code not backported to this release. Remove `/usr/local/include` from `Protobuild.toml`, since it does not exist on Windows, and our CI build logic does not rely on it. Update `.gitignore` and `.gitattributes` to match main. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
Sep 8, 2023
Incorporate several CI changes from multiple PRs: - microsoft#1632 - microsoft#1752 - microsoft#1755 - microsoft#1799 - microsoft#1820 - microsoft#1836 - microsoft#1853 - microsoft#1854 It is easier to checkout the changes directly rather than cherry-pick commits and undo any changes that affect code not backported to this release. Remove `/usr/local/include` from `Protobuild.toml`, since it does not exist on Windows, and our CI build logic does not rely on it. Update `.gitignore` and `.gitattributes` to match main. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
Sep 8, 2023
Incorporate several CI changes from multiple PRs: - microsoft#1632 - microsoft#1752 - microsoft#1755 - microsoft#1799 - microsoft#1820 - microsoft#1836 - microsoft#1853 - microsoft#1854 It is easier to checkout the changes directly rather than cherry-pick commits and undo any changes that affect code not backported to this release. Remove `/usr/local/include` from `Protobuild.toml`, since it does not exist on Windows, and our CI build logic does not rely on it. Update `.gitignore` and `.gitattributes` to match main. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
Sep 8, 2023
Incorporate several CI changes from multiple PRs: - microsoft#1632 - microsoft#1752 - microsoft#1755 - microsoft#1799 - microsoft#1820 - microsoft#1836 - microsoft#1853 - microsoft#1854 It is easier to checkout the changes directly rather than cherry-pick commits and undo any changes that affect code not backported to this release. Remove `/usr/local/include` from `Protobuild.toml`, since it does not exist on Windows, and our CI build logic does not rely on it. Update `.gitignore` and `.gitattributes` to match main. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
Sep 8, 2023
Incorporate several CI changes from multiple PRs: - microsoft#1632 - microsoft#1752 - microsoft#1755 - microsoft#1799 - microsoft#1820 - microsoft#1836 - microsoft#1853 - microsoft#1854 It is easier to checkout the changes directly rather than cherry-pick commits and undo any changes that affect code not backported to this release. Remove `/usr/local/include` from `Protobuild.toml`, since it does not exist on Windows, and our CI build logic does not rely on it. Update `.gitignore` and `.gitattributes` to match main. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
Sep 8, 2023
Incorporate several CI changes from multiple PRs: - microsoft#1632 - microsoft#1752 - microsoft#1755 - microsoft#1799 - microsoft#1820 - microsoft#1836 - microsoft#1853 - microsoft#1854 It is easier to checkout the changes directly rather than cherry-pick commits and undo any changes that affect code not backported to this release. Remove `/usr/local/include` from `Protobuild.toml`, since it does not exist on Windows, and our CI build logic does not rely on it. Update `.gitignore` and `.gitattributes` to match main. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
added a commit
to helsaawy/hcsshim
that referenced
this pull request
Sep 8, 2023
Incorporate several CI changes from multiple PRs: - microsoft#1632 - microsoft#1752 - microsoft#1755 - microsoft#1799 - microsoft#1820 - microsoft#1836 - microsoft#1853 - microsoft#1854 It is easier to checkout the changes directly rather than cherry-pick commits and undo any changes that affect code not backported to this release. Remove `/usr/local/include` from `Protobuild.toml`, since it does not exist on Windows, and our CI build logic does not rely on it. Update `.gitignore` and `.gitattributes` to match main. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
thaJeztah
pushed a commit
to thaJeztah/hcsshim
that referenced
this pull request
Sep 18, 2023
Use containerd version from go.mod when checking out and building upstream containerd for testing. containerd integration tests updated in 1.6.20 to work on windows. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> (cherry picked from commit de0e116) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
helsaawy
added a commit
that referenced
this pull request
Sep 19, 2023
* [release/0.9] Update CI Incorporate several CI changes from multiple PRs: - #1632 - #1752 - #1755 - #1799 - #1820 - #1836 - #1853 - #1854 It is easier to checkout the changes directly rather than cherry-pick commits and undo any changes that affect code not backported to this release. Remove `/usr/local/include` from `Protobuild.toml`, since it does not exist on Windows, and our CI build logic does not rely on it. Update `.gitignore` and `.gitattributes` to match main. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> * [release/0.9] Skip failaing symlink tests CRI integration tests `TestContainerSymlinkVolumes/*` are consistently failing. Skip until a fix is backported from containerd 1.7 to 1.6. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> [release/0.9] Skip failing symlink tests Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> * [release/0.9] Update proto files to v3 Many files were last updated with `github.com/gogo/protobuf@v1.2`, hence the `proto.GoGoProtoPackageIsVersion2` assertion in the `*.pb.go` files. Regenerate them using new version (v1.6.2) of `protoc-gen-gogoctrd`. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> * [release/0.9] Update generated files Run `go generate` on repo to bring all auto-generated files up to date. Fix bug in `internal\winapi\winapi.go` where `user.go` is referenced but does not exist. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> --------- Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
kiashok
pushed a commit
to kiashok/hcsshim
that referenced
this pull request
Oct 3, 2023
Caching is enabled by default in `actions/setup-go@v4` (https://githut b.com/actions/setup-go#caching-dependency-files-and-build-outputs) so update the `go.sum` path when checking out hcsshim to a non-default path. Additionally, disable for linting, since that often causes errors. Without caching, wont need to explicitly delete the module cache. Relies on: microsoft#1752 Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> (cherry picked from commit 25b6855) Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
kiashok
pushed a commit
to kiashok/hcsshim
that referenced
this pull request
Oct 3, 2023
Caching is enabled by default in `actions/setup-go@v4` (https://githut b.com/actions/setup-go#caching-dependency-files-and-build-outputs) so update the `go.sum` path when checking out hcsshim to a non-default path. Additionally, disable for linting, since that often causes errors. Without caching, wont need to explicitly delete the module cache. Relies on: microsoft#1752 Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> (cherry picked from commit 25b6855) Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
kiashok
pushed a commit
to kiashok/hcsshim
that referenced
this pull request
Oct 11, 2023
Caching is enabled by default in `actions/setup-go@v4` (https://githut b.com/actions/setup-go#caching-dependency-files-and-build-outputs) so update the `go.sum` path when checking out hcsshim to a non-default path. Additionally, disable for linting, since that often causes errors. Without caching, wont need to explicitly delete the module cache. Relies on: microsoft#1752 Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> (cherry picked from commit 25b6855) Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
kiashok
pushed a commit
to kiashok/hcsshim
that referenced
this pull request
Oct 11, 2023
Caching is enabled by default in `actions/setup-go@v4` (https://githut b.com/actions/setup-go#caching-dependency-files-and-build-outputs) so update the `go.sum` path when checking out hcsshim to a non-default path. Additionally, disable for linting, since that often causes errors. Without caching, wont need to explicitly delete the module cache. Relies on: microsoft#1752 Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> (cherry picked from commit 25b6855) Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
kiashok
pushed a commit
to kiashok/hcsshim
that referenced
this pull request
Oct 11, 2023
Caching is enabled by default in `actions/setup-go@v4` (https://githut b.com/actions/setup-go#caching-dependency-files-and-build-outputs) so update the `go.sum` path when checking out hcsshim to a non-default path. Additionally, disable for linting, since that often causes errors. Without caching, wont need to explicitly delete the module cache. Relies on: microsoft#1752 Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> (cherry picked from commit 25b6855) Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
kiashok
pushed a commit
that referenced
this pull request
Oct 13, 2023
Caching is enabled by default in `actions/setup-go@v4` (https://githut b.com/actions/setup-go#caching-dependency-files-and-build-outputs) so update the `go.sum` path when checking out hcsshim to a non-default path. Additionally, disable for linting, since that often causes errors. Without caching, wont need to explicitly delete the module cache. Relies on: #1752 Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> (cherry picked from commit 25b6855) Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
anmaxvl
pushed a commit
that referenced
this pull request
Oct 20, 2023
This PR updates our ADO fork to commits in hcsshim up to commit hash [7769a64](7769a64). This includes support for partitioned scsi devices and ensuring filesystem format for lcow scsi devices. Related work items: #1728, #1740, #1741, #1742, #1743, #1744, #1745, #1747, #1748, #1749, #1750, #1752, #1754, #1756, #1757, #1767, #1769, #1771, #1772, #1773, #1779
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use the upstream version of containerd that matches what hcsshim imports.
This resolves most of the containerd integration test failures, except for
TestContainerSymlinkVolumes