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.

Sign up for GitHub

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

Jump to bottom

[2.13] Backport CI fix #7119

Merged
merged 3 commits into from
Jan 21, 2021
Merged

[2.13] Backport CI fix #7119

merged 3 commits into from
Jan 21, 2021

Conversation

RickHaan
Copy link
Contributor

@RickHaan RickHaan commented Jan 8, 2021 •
edited
Loading

What type of PR is this?

/kind failing-test

What this PR does / why we need it:

I am running into two issues with the Kubespray CI with PR-7110.
These issues were fixed in master and backported in 2.14 by @champtar in PR-7021 This PR is meant to backport these fixes into 2.13.

I have cherry-picked these PR's:

* PR-6910
* PR-7048
* PR-6992

Which issue(s) this PR fixes:

Issue with Kubespray CI in PR-7110.

Does this PR introduce a user-facing change?:

NONE

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 8, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @RickHaan. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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.

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.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 8, 2021
@floryut
Copy link
Member

floryut commented Jan 8, 2021 •
edited
Loading

You will need #6957 #6955 #6910 #6962 otherwise you'll stuck the CI every time by reaching dockerhub limit

@floryut
Copy link
Member

floryut commented Jan 8, 2021

Btw you can check #7021 to see what was required for 2.14

@RickHaan
Copy link
Contributor Author

RickHaan commented Jan 8, 2021 •
edited
Loading

Thanks for your feedback. This is my first time doing a backport. What I will do is discard all my changes locally and then start the cherry-pick from #7021. And force-push my changes to my remote branch so I don't overload your CI (dockerhub limit) with every small change. And then check if I still need stuff from #6957 #6955 #6910 #6962.

@floryut
Copy link
Member

floryut commented Jan 8, 2021

Thanks for your feedback. This is my first time doing a backport. What I will do is discard all my changes locally and then start the cherry-pick from #7021. And force-push my changes to my remote branch so I don't overload your CI (dockerhub limit) with every small change. And then check if I still need stuff from #6957 #6955 #6910 #6962.

Nice :) I think you can take #6955 at least, it remove about 3 call to dockerhub per jobs (that's ~30 calls per pipeline)

champtar and others added 2 commits January 8, 2021 18:02
@champtar @hafe
@LuckySB @RickHaan
[2.14] fix ci (#7021)
d149df4 
* fix flake8 errors in Kubespray CI - tox-inventory-builder

* fix flake8 errors in Kubespray CI - tox-inventory-builder

* Invalidate CRI-O kubic repo's cache

Signed-off-by: Victor Morales <v.morales@samsung.com>

* add support to configure pkg install retries

and use in CI job tf-ovh_ubuntu18-calico (due to it failing often)

* Switch Calico and Cilium image repos to Quay.io

Co-authored-by: Victor Morales <v.morales@samsung.com>
Co-authored-by: Barry Melbourne <9964974+bmelbourne@users.noreply.github.com>

Conflicts:
	roles/download/defaults/main.yml

* up vagrant box to fedora/33-cloud-base in cri-o molecule tests

(cherry picked from commit 06ec539)

* add Google proxy-mirror-cache for docker hub to CI tests

(cherry picked from commit d739a6b)

* containerd docker hub registry mirror support

* containerd docker hub registry mirror support

* add docs

* fix typo

* fix yamllint

* fix indent in sample
and ansible-playbook param in testcases_run

* fix md

* mv common vars to tests/common/_docker_hub_registry_mirror.yml

* checkout vars to upgrade tests

(cherry picked from commit 4a8a52b)

* Exclude .git/ from shellcheck

If a branch name contains '.sh', current shellcheck checks the branch
file under .git/ and outputs error because the format is not shell
script one.
This makes shellcheck exclude files under .git/ to avoid this issue.

(cherry picked from commit e2467d8)

Co-authored-by: Hans Feldt <2808287+hafe@users.noreply.github.com>
Co-authored-by: Sergey <s.bondarev@southbridge.ru>
Co-authored-by: Kenichi Omichi <ken-oomichi@wx.jp.nec.com>
@floryut @RickHaan
Switch some image from dockerhub to k8s.gcr (also increase pkg retrie…
bc32bbc 
…s) (#6955)
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 8, 2021
@RickHaan RickHaan changed the title [WIP][2.13] Backport CI fix [2.13] Backport CI fix Jan 11, 2021
@RickHaan RickHaan marked this pull request as ready for review January 11, 2021 10:11
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 11, 2021
@RickHaan
Copy link
Contributor Author

I am noticing timeouts on 'packet_centos7-flannel-containerd-addons-ha', 'packet_centos8-calico' and 'packet_centos8-kube-ovn'. Would it be advisable to backport #6997 and #6998 as well? To further decrease container downloads.

@floryut
Copy link
Member

floryut commented Jan 11, 2021

I am noticing timeouts on 'packet_centos7-flannel-containerd-addons-ha', 'packet_centos8-calico' and 'packet_centos8-kube-ovn'. Would it be advisable to backport #6997 and #6998 as well? To further decrease container downloads.

There is too much gap with 2.13 :( you now have an issue with Kube-ovn repository.. Simple way would be to deactivate this test.

@RickHaan
Copy link
Contributor Author

RickHaan commented Jan 11, 2021 •
edited
Loading

:( I have checked if I could 'fix' it by cherry-picking #6223. But that would require upgrading kube-ovn, which is not a good plan. ( docker.io/kubeovn/kube-ovn:v1.1.0 is not available.) So I should just delete tests/files/packet_centos8-kube-ovn.yml or should I configure packet_centos8-kube-ovn.when to manual in .gitlab-ci/packet.yml?

@floryut
Copy link
Member

floryut commented Jan 11, 2021

:( I have checked if I could 'fix' it by cherry-picking #6223. But that would require upgrading kube-ovn, which is not a good plan. ( docker.io/kubeovn/kube-ovn:v1.1.0 is not available.) So I should just delete tests/files/packet_centos8-kube-ovn.yml or should I configure packet_centos8-kube-ovn.when to manual in .gitlab-ci/packet.yml?

You can configure to manual it's enough 👍

@k8s-ci-robot k8s-ci-robot added the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Jan 11, 2021
@RickHaan
Set packet_centos8-kube-ovn test to manual
fb906c6 
Signed-off-by: Rick Haan <rickhaan94@gmail.com>
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Jan 11, 2021
@floryut
Copy link
Member

floryut commented Jan 12, 2021

/lgtm
/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 12, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 12, 2021
@RickHaan
Copy link
Contributor Author

Thanks for the help with the CI floryut 👍

/assign @Miouge1

@RickHaan RickHaan mentioned this pull request Jan 19, 2021
Closed
@Miouge1
Copy link
Contributor

Miouge1 commented Jan 21, 2021

OK, I guess it doesn't hurt to fix CI in 2.13, but we usually backports only security patches and major bugs.

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Miouge1, RickHaan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 21, 2021
@k8s-ci-robot k8s-ci-robot merged commit cd832ea into kubernetes-sigs:release-2.13 Jan 21, 2021
@RickHaan
Copy link
Contributor Author

Thanks for your approval. I created the PR since I was running into a CI issue with #7110 . Now that this is merged I will rebase that PR on release-2.13 so that that can be tested as well 😃

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@floryut floryut Awaiting requested review from floryut

@holmsten holmsten Awaiting requested review from holmsten

Assignees

@Miouge1 Miouge1

@floryut floryut

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@RickHaan @k8s-ci-robot @floryut @Miouge1 @champtar