Skip to content

Adds cri-integration job#1427

Merged
dcantah merged 1 commit intomicrosoft:masterfrom
gabriel-samfira:add-cri-integration-job
Jun 22, 2022
Merged

Adds cri-integration job#1427
dcantah merged 1 commit intomicrosoft:masterfrom
gabriel-samfira:add-cri-integration-job

Conversation

@gabriel-samfira
Copy link
Copy Markdown
Contributor

This PR adds an integration tests job to the CI workflow. Both the containerd cri-integration tests and the hcsshim cri-containerd tests are run as part of it. The tests run against the main branch of containerd.

Signed-off-by: Gabriel Adrian Samfira [email protected]

@gabriel-samfira gabriel-samfira requested a review from a team as a code owner June 10, 2022 14:50
@gabriel-samfira gabriel-samfira force-pushed the add-cri-integration-job branch 3 times, most recently from 2079cd5 to d7037f3 Compare June 16, 2022 05:29
Comment thread .github/workflows/ci.yml Outdated
- name: Run hcsshim integration tests
shell: powershell
run: |
cri-containerd.test.exe -cri-endpoint="npipe://./pipe/containerd-containerd" -feature="WCOWProcess" -feature="HostProcess" --test.run="[^Test_Container_CRI_Restart$|^Test_Container_CRI_Restart_State$|^Test_RunContainer_InheritUser_JobContainer_WCOW$|^Test_RunContainer_Hostname_JobContainer_WCOW$|^Test_RunContainer_Hostname_JobContainer_WCOW$|^Test_RunContainer_GroupName_JobContainer_WCOW$|^Test_RunContainer_HNS_JobContainer_WCOW$|^Test_RunContainer_VHD_JobContainer_WCOW$|^Test_RunContainer_ETW_JobContainer_WCOW$|^Test_RunContainer_HostVolumes_JobContainer_WCOW$|^Test_RunContainer_JobContainer_VolumeMount$|^Test_RunContainer_JobContainer_Environment$|^Test_RunContainer_WorkingDirectory_JobContainer_WCOW$|^Test_DoubleQuoting_JobContainer_WCOW$|^Test_BindSupport_JobContainer_WCOW$|^Test_BindSupport_MultipleContainers_JobContainer_WCOW$|^Test_RunPodSandbox_CPUCount_WCOW_Process$|^Test_RunPodSandbox_CPULimit_WCOW_Process$]"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Oh my word 😭 I'll figure out why the jobcontainer tests don't seem to be working so we can remove 90% of this

Copy link
Copy Markdown
Contributor

@dcantah dcantah Jun 17, 2022

Choose a reason for hiding this comment

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

Found it, we need to upgrade our CRI api version to one that has the hostprocess field. Containerd just takes the value of whatever is filled in for the hostprocess CRI field and sets the hpc annotation https://github.com/containerd/containerd/blob/9c6154bff15818916c851eb3a12764b018e191fb/pkg/cri/server/container_create_windows.go#L136. Our tests were authored before the hostprocess field actually got into the CRI api so the annotation we're setting is being overridden by containerd setting it as well.

Copy link
Copy Markdown
Contributor

@dcantah dcantah Jun 20, 2022

Choose a reason for hiding this comment

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

This should fix most things #1434. I'll need to fix up the images the tests use to have a manifest list with a ws2022 entry as upstream containerd through the CRI entry point matches to the hosts build..

@gabriel-samfira gabriel-samfira force-pushed the add-cri-integration-job branch from a21ef4b to 431f8e4 Compare June 17, 2022 15:09
Comment thread .github/workflows/ci.yml
Copy link
Copy Markdown
Contributor

@dcantah dcantah left a comment

Choose a reason for hiding this comment

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

LGTM!

@gabriel-samfira gabriel-samfira force-pushed the add-cri-integration-job branch from 679fb87 to 704c227 Compare June 17, 2022 15:49
@dcantah
Copy link
Copy Markdown
Contributor

dcantah commented Jun 20, 2022

@microsoft/containerplat Anyone able to give this a peek? Would add more confidence for future PRs

Copy link
Copy Markdown
Contributor

@anmaxvl anmaxvl left a comment

Choose a reason for hiding this comment

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

cool!

Comment thread .github/workflows/ci.yml
Comment thread .github/workflows/ci.yml
Comment thread .github/workflows/ci.yml
Comment thread .github/workflows/ci.yml
@gabriel-samfira gabriel-samfira force-pushed the add-cri-integration-job branch 3 times, most recently from 8952e4f to 9d1cbca Compare June 22, 2022 14:21
This change adds integration tests to hcsshim. We currently run only the
containerd tests, with tasks already written (but disabled) to run the
cri-containerd tests in this repo.

Signed-off-by: Gabriel Adrian Samfira <[email protected]>
@gabriel-samfira gabriel-samfira force-pushed the add-cri-integration-job branch from 9d1cbca to f128b60 Compare June 22, 2022 17:30
@dcantah
Copy link
Copy Markdown
Contributor

dcantah commented Jun 22, 2022

Checking this in as no more live comments. Thanks Gabriel!

@dcantah dcantah merged commit 6a19164 into microsoft:master Jun 22, 2022
anmaxvl added a commit that referenced this pull request Feb 7, 2023
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.

4 participants