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

skip failing test, use gotestsum #1820

Merged
merged 1 commit into from
Jun 19, 2023
Merged

Conversation

helsaawy
Copy link
Contributor

Windows image layers are no longer ocispec.MediaTypeImageLayerNonDistributable.
Skip containerd integration test TestConvert, until it is updated in the release/1.6 branch.

See: containerd/containerd#8691

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
@helsaawy helsaawy requested a review from a team as a code owner June 19, 2023 19:03
@helsaawy helsaawy merged commit 4ede1fd into microsoft:main Jun 19, 2023
@helsaawy helsaawy deleted the ci-integration branch June 19, 2023 20:01
kiashok pushed a commit to kiashok/hcsshim that referenced this pull request Aug 31, 2023
Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
(cherry picked from commit 4ede1fd)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
kiashok pushed a commit to kiashok/hcsshim that referenced this pull request Sep 1, 2023
Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
(cherry picked from commit 4ede1fd)
Signed-off-by: Kirtana Ashok <kiashok@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>
kiashok pushed a commit to kiashok/hcsshim that referenced this pull request Sep 18, 2023
Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
(cherry picked from commit 4ede1fd)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
kiashok pushed a commit to kiashok/hcsshim that referenced this pull request Sep 18, 2023
Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
(cherry picked from commit 4ede1fd)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
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>
helsaawy added a commit that referenced this pull request Sep 20, 2023
… containerd version used (#1881)

* update to latest containerd/1.6 tag v1.6.23

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>

* fix integration test failure (#1799)

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
(cherry picked from commit f5c5797)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>

* Checkout appropriate containerd ref

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>

* skip failing test, use gotestsum (#1820)

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
(cherry picked from commit 4ede1fd)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>

* Cleanup tests that are skipped in CI:
Removes TestConvert() from being skipped as corresponding fix made to v1.6.22
Skip TestContainerSymlinkVolumes() tests as it seems to pass only with containerd/1.7

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>

---------

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
Co-authored-by: Hamza El-Saawy <84944216+helsaawy@users.noreply.github.com>
kiashok pushed a commit that referenced this pull request Sep 20, 2023
Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
(cherry picked from commit 4ede1fd)
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
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.

2 participants