Skip to content

[release/1.6] Reverts removal of parallel run from critest#6942

Merged
fuweid merged 1 commit intocontainerd:release/1.6from
psschwei:release/1.6
May 13, 2022
Merged

[release/1.6] Reverts removal of parallel run from critest#6942
fuweid merged 1 commit intocontainerd:release/1.6from
psschwei:release/1.6

Conversation

@psschwei
Copy link
Copy Markdown
Contributor

@psschwei psschwei commented May 12, 2022 •
edited
Loading

Signed-off-by: Paul S. Schweigert [email protected]
(cherry picked from commit 7300296)

As discussed in #6903,
running ginkgo tests in parallel while trying to skip wasn't working.
However, now that
kubernetes-sigs/cri-tools#930 has fixed the
issue upstream, we can revert back to running our tests in parallel
with the skip.

Cherry pick of #6938

Signed-off-by: Paul S. Schweigert [email protected]

@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented May 12, 2022

Hi @psschwei. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented May 12, 2022

/ok-to-test

@psschwei psschwei changed the title [release 1.6] Reverts removal of parallel run from critest [release/1.6] Reverts removal of parallel run from critest May 12, 2022
mikebrow
mikebrow approved these changes May 12, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM on green

@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented May 12, 2022 •
edited
Loading

I'll reset it again but this was an interesting error in vagrant on building the containerd binary:

+ bin/containerd
 fatal: unsafe repository ('/vagrant' is owned by someone else)
 To add an exception for this directory, call:
	git config --global --add safe.directory /vagrant

nvm fixed here: #6941 :-)

@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented May 12, 2022

@psschwei needs rebase on top of phil's pr ^ when that is merged..

@psschwei
reverts removal of parallel run from critest
82a77be 
Signed-off-by: Paul S. Schweigert <[email protected]>
(cherry picked from commit 7300296)

As discussed in containerd#6903,
running ginkgo tests in parallel while trying to skip wasn't working.
However, now that
kubernetes-sigs/cri-tools#930 has fixed the
issue upstream, we can revert back to running our tests in parallel
with the skip.

Signed-off-by: Paul S. Schweigert <[email protected]>
@fuweid fuweid merged commit 9f76550 into containerd:release/1.6 May 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mikebrow mikebrow mikebrow approved these changes

@fuweid fuweid fuweid approved these changes

Assignees

No one assigned

Labels

ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@psschwei @k8s-ci-robot @mikebrow @fuweid @dmcgowan